1 优化打点功能逻辑

杨帅
1 parent ecf90819
Showing 3 changed files with 25 additions and 13 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
@@ -347,6 +347,9 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     }
                     //更新可打点数量
                     updataCanTakePointCount();
+                    //重置相关信息
+                    followMyLocation = null;
+                    currentAddress = null;
                 }
             });
             selectDialog.setCancelable(false);
@@ -510,6 +513,8 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
         option.setIsNeedAddress(true);
         //可选，设置是否需要地址描述
         option.setIsNeedLocationDescribe(true);
+        //需要POI信息
+        option.setIsNeedLocationPoiList(true);
         //可选，设置是否需要设备方向结果
         option.setNeedDeviceDirect(false);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
@@ -610,8 +615,9 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     currentLine = MyMapUtil.drawMapLine(getContext(), baiduMap, currentWalkPoints, R.color.green_round);
                 }
             }
-            Log.e(TAG, "onReceiveLocation: 运行");
-            currentAddress = location.getLocationDescribe();
+            if (null != location.getPoiList() && null != location.getPoiList().get(0)) {
+                currentAddress = location.getPoiList().get(0).getName();
+            }
             if (TextUtils.isEmpty(currentAddress)) {
                 if (null != location.getAddress()) {
                     currentAddress = location.getAddress().address;
@@ -52,6 +52,7 @@ import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
  
 public class StartTraceFragmentView implements MvpView, SensorEventListener {
+    private final String TAG = "StartTraceFragmentView";
     private StartTraceFragment fragment;
     private BaiduMap baiduMap;
     private MapView mMapView;
@@ -119,15 +120,15 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
 //                if (!NetUtil.isNetworkConnected(getContext())) {
 //                    AlertUtil.showDeftToast(getContext(), "无法连接网络,请稍后重试");
 //                } else {
-                    //获取当前地点
-                    if (!TextUtils.isEmpty(currentAddress)) {
-                        selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
-                        selectDialog.show();
-                    } else {
-                        isShowFollowAddress = true;
-                        Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
-                    }
+                //获取当前地点
+                if (!TextUtils.isEmpty(currentAddress)) {
+                    selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
+                    selectDialog.show();
+                } else {
+                    isShowFollowAddress = true;
+                    Toast.makeText(getContext(), "正在获取当前地点信息,请稍后", Toast.LENGTH_SHORT).show();
                 }
+            }
 //            }
         });
  
@@ -209,7 +210,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                         //清除数据
                         CollCommonInfo.reset(getContext());
                         dialog.dismiss();
-                        Log.e("取消", "onClick: " );
+                        Log.e("取消", "onClick: ");
                     }
                 }, "上传", new SelectDialog.DialogInterface() {
                     @Override
@@ -330,6 +331,8 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
         option.setIsNeedAddress(true);
         //可选，设置是否需要地址描述
         option.setIsNeedLocationDescribe(true);
+        //需要POI信息
+        option.setIsNeedLocationPoiList(true);
         //可选，设置是否需要设备方向结果
         option.setNeedDeviceDirect(false);
         //设置打开自动回调位置模式，该开关打开后，期间只要定位SDK检测到位置变化就会主动回调给开发者
@@ -418,8 +421,9 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
                     // 此处设置开发者获取到的方向信息，顺时针0-360
                     .direction(location.getDirection()).latitude(location.getLatitude())
                     .longitude(location.getLongitude()).build();
-//            currentAddress = location.getAddrStr();
-            currentAddress = location.getLocationDescribe();
+            if (null != location.getPoiList() && null != location.getPoiList().get(0)) {
+                currentAddress = location.getPoiList().get(0).getName();
+            }
             if (isShowFollowAddress && selectDialog != null && !selectDialog.isShowing()) {
                 if (!TextUtils.isEmpty(currentAddress)) {
                     selectDialog.setTipMessage("确定将" + "\"" + currentAddress + "\"" + "设置开始地点?");
@@ -14,6 +14,7 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -27,6 +28,7 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
     private RunRaceDetailInfo runRaceDetailInfo;
  
     public static void newInstance(Context context, String eventId,RunRaceDetailInfo runRaceDetailInfo) {
+        CollCommonInfo.setStreetId(context, eventId);
         Intent intent = new Intent(context, StartCollectTraceActivity.class);
         intent.putExtra("eventId", eventId);
         intent.putExtra("runRaceDetailInfo", runRaceDetailInfo);