Merge remote-tracking branch 'origin/master'

app/src/main/java/com/mogo/cloud/RealTimeActivity.java

@@ -32,10 +32,8 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM
 
         snapshotStartButton = findViewById(R.id.snapshotStart);
         snapshotStartButton.setOnClickListener(view -> {
-            if (MoGoAiCloudClient.getInstance().getAiCloudClientConfig().isNeedUploadCoordinatesDurationInTime()) {
-                MoGoAiCloudRealTime.startRealTime(this, "com.mogo.launcher");
-                MoGoAiCloudRealTime.registerOnMsgListener(this);
-            }
+            MoGoAiCloudRealTime.startRealTime(this, "com.mogo.launcher");
+            MoGoAiCloudRealTime.registerOnMsgListener(this);
         });
 
         snapshotStopButton = findViewById(R.id.snapshotStop);
@@ -47,7 +45,6 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM
 
     private void setConfig() {
         MoGoAiCloudClient.getInstance().getAiCloudClientConfig().setIsUseExternalLocation(false);
-        MoGoAiCloudClient.getInstance().getAiCloudClientConfig().setNeedUploadCoordinatesDurationInTime(true);
     }
 
     public void stopRealTimeService() {

foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java

@@ -61,11 +61,6 @@ public class MoGoAiCloudClientConfig {
      */
     private boolean mIsUseExternalLocation;
 
-    /**
-     * 是否上传当前位置信息
-     */
-    private boolean isNeedUploadCoordinatesDurationInTime;
-
     /**
      * 设置HttpDns的位置监听
      */
@@ -267,14 +262,6 @@ public class MoGoAiCloudClientConfig {
         mIHttpDnsCurrentLocation = IHttpDnsCurrentLocation;
     }
 
-    public boolean isNeedUploadCoordinatesDurationInTime() {
-        return isNeedUploadCoordinatesDurationInTime;
-    }
-
-    public void setNeedUploadCoordinatesDurationInTime(boolean needUploadCoordinatesDurationInTime) {
-        isNeedUploadCoordinatesDurationInTime = needUploadCoordinatesDurationInTime;
-    }
-
     @Override
     public String toString() {
         return "MoGoAiCloudClientConfig{" +
@@ -287,7 +274,6 @@ public class MoGoAiCloudClientConfig {
                 ", token='" + token + '\'' +
                 ", sn='" + sn + '\'' +
                 ", mLoopCheckDelay=" + mLoopCheckDelay +
-                ", isNeedUploadCoordinatesDurationInTime=" + isNeedUploadCoordinatesDurationInTime +
                 ", mIHttpDnsCurrentLocation=" + mIHttpDnsCurrentLocation +
                 '}';
     }

modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/MogoRoadSearchManager.java

@@ -4,15 +4,18 @@ import android.content.Context;
 import android.util.Log;
 
 import com.mogo.cloud.commons.network.BaseData;
+import com.mogo.cloud.commons.network.NetConstants;
 import com.mogo.cloud.commons.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
 import com.mogo.cloud.tanlu.bean.RoadInfoRequest;
 import com.mogo.cloud.tanlu.bean.RoadInfos;
+import com.mogo.cloud.tanlu.bean.location.Location;
 import com.mogo.cloud.tanlu.constant.HttpConstant;
 import com.mogo.cloud.tanlu.net.TanluApiService;
 import com.mogo.utils.network.utils.GsonUtil;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -48,7 +51,7 @@ public class MogoRoadSearchManager {
     }
 
     public void init () {
-        apiService = RetrofitFactory.INSTANCE.getInstance(HttpConstant.DEV_HOTS)
+        apiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.LAUNCHER_SNAPSHOT_HOST)
                 .create(TanluApiService.class);
     }
 
@@ -67,7 +70,7 @@ public class MogoRoadSearchManager {
 //        location.setLatitude(39.968139);
 //        location.setLongitude(116.411468);
 //        RoadInfoRequest request = new RoadInfoRequest(location, "", list, false, false);
-//
+
 //        Map<String, Object> map = new HashMap<>();
 //        map.put("sn", "F803EB2046PZD00228");
 //        map.put("data", GsonUtil.jsonFromObject(request));

modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/UploadManager.java

@@ -5,6 +5,7 @@ import android.util.Log;
 
 import com.google.gson.Gson;
 import com.mogo.cloud.commons.network.BaseData;
+import com.mogo.cloud.commons.network.NetConstants;
 import com.mogo.cloud.commons.network.RetrofitFactory;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.tanlu.api.ITanluUploadCallback;
@@ -46,7 +47,7 @@ public class UploadManager {
     }
 
     public void init () {
-        apiService = RetrofitFactory.INSTANCE.getInstance(HttpConstant.DEV_HOTS)
+        apiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST)
                 .create(TanluApiService.class);
     }