From e48c183a0984908c14eebd9791761d13d9baca2c Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Tue, 10 Jul 2018 11:51:21 +0800
Subject: [PATCH] 提交
---
app/src/main/java/com/moral/screen/activity/MapActivity.java | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/moral/screen/activity/MapActivity.java b/app/src/main/java/com/moral/screen/activity/MapActivity.java
index 9b48d09..656aa7f 100644
--- a/app/src/main/java/com/moral/screen/activity/MapActivity.java
+++ b/app/src/main/java/com/moral/screen/activity/MapActivity.java
@@ -31,13 +31,15 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Timer;
+import java.util.TimerTask;
/**
* Created by hjzhang on 2018/7/2.
*/
public class MapActivity extends BaseActivity {
- private TextView tv_left;
+ private TextView tv_left,tv_right;
private MapView bmapView;
private BaiduMap mBaiduMap;
BitmapDescriptor bdNormal = BitmapDescriptorFactory
@@ -57,6 +59,22 @@
private ImageView iv_close;
private LinearLayout ll_pop;
private DeviceBean curDeviceBean;
+ private Timer timer;
+ /**
+ * ���������
+ */
+ private boolean isFinish = false;
+ private void showData() {
+ timer = new Timer();
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ if(!isFinish){
+ getData(false);
+ }
+ }
+ },0,10*1000);
+ }
@Override
protected void getBundleExtras(Bundle extras) {
@@ -70,6 +88,7 @@
@Override
protected void initViews() {
tv_left = findView(R.id.tv_left);
+ tv_right = findView(R.id.tv_right);
bmapView = findView(R.id.bmapView);
popView = LayoutInflater.from(this).inflate(R.layout.pop_layout,null);
tv_name = popView.findViewById(R.id.tv_name);
@@ -102,17 +121,25 @@
startActivity(intent);
}
});
+ tv_right.setOnClickListener(this);
}
@Override
protected void initData() {
- getData();
+ getData(true);
+ showData();
}
@Override
protected void processClick(View view) {
switch (view.getId()){
case R.id.tv_left:
+ finish();
+ break;
+ case R.id.tv_right:
+ MainApp.theApp.mSharedPreferencesUtil.exitLogin();
+ Intent intent = new Intent(MapActivity.this,LoginActivity.class);
+ startActivity(intent);
finish();
break;
}
@@ -152,7 +179,7 @@
/**
* ������������
*/
- private void showMapData(){
+ private void showMapData(boolean show){
mBaiduMap.clear();
MarkerOptions mo = null;
Marker mMarker = null;
@@ -184,7 +211,7 @@
.zIndex(i);
}
// ������������
- mo.animateType(MarkerOptions.MarkerAnimateType.drop);
+ mo.animateType(MarkerOptions.MarkerAnimateType.grow);
mMarker = (Marker) (mBaiduMap.addOverlay(mo));
mkList.add(mMarker);
}
@@ -211,12 +238,16 @@
bdC.recycle();
super.onDestroy();
bmapView.onDestroy();
+ if(timer!=null){
+ timer.cancel();
+ timer =null;
+ }
}
- private void getData() {
+ private void getData(final boolean show) {
HashMap<String, String> params = new HashMap<>();
params.put("organizationId", MainApp.theApp.orgId+"");
- mHttpUtils.doGet(API.DEVICES, params, CacheMode.DEFAULT, true, new HttpCallBack() {
+ mHttpUtils.doGet(API.DEVICES, params, CacheMode.DEFAULT, show, new HttpCallBack() {
@Override
public void onSuccess(String res, String msg) {
if (progressDialog.isShowing()) {
@@ -227,15 +258,17 @@
deviceList.clear();
deviceList.addAll(temp);
}
- if(deviceList.size()>0){
- DeviceBean bean = deviceList.get(0);
- LatLng ll = new LatLng(bean.getLatitude(),
- bean.getLongitude());
- MapStatus.Builder builder = new MapStatus.Builder();
- builder.target(ll).zoom(18.0f);
- mBaiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+ if(show){
+ if(deviceList.size()>0){
+ DeviceBean bean = deviceList.get(0);
+ LatLng ll = new LatLng(bean.getLatitude(),
+ bean.getLongitude());
+ MapStatus.Builder builder = new MapStatus.Builder();
+ builder.target(ll).zoom(18.0f);
+ mBaiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+ }
}
- showMapData();
+ showMapData(show);
}
@Override
--
Gitblit v1.8.0