opt

.idea/gradle.xml

@@ -23,6 +23,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

app/src/main/AndroidManifest.xml

@@ -35,6 +35,12 @@
             android:label="实时数据测试">
 
         </activity>
+
+        <activity
+            android:name=".RoadConditionActivity"
+            android:label="路况服务">
+        </activity>
+
     </application>
 
 </manifest>

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

@@ -17,6 +17,7 @@ public class MainActivity extends AppCompatActivity {
     private Button btnJumpPassPort;
     private Button btnJumpNetWorkPort;
     private Button btnJumpRealTime;
+    private Button btnJumpRoadCondition;
 
     private TextView tvSn;
     private TextView tvToken;
@@ -50,6 +51,12 @@ public class MainActivity extends AppCompatActivity {
             startActivity(intent);
         });
 
+        btnJumpRoadCondition = findViewById(R.id.btnJumpRoadcondition);
+        btnJumpRoadCondition.setOnClickListener(v -> {
+            Intent intent = new Intent(MainActivity.this, RoadConditionActivity.class);
+            startActivity(intent);
+        });
+
         MoGoAiCloudClient.getInstance().addTokenCallbacks(new IMoGoTokenCallback() {
             @Override
             public void onTokenGot(String token, String sn) {

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

@@ -0,0 +1,142 @@
+package com.mogo.cloud;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.gson.Gson;
+import com.mogo.cloud.network.BaseData;
+import com.mogo.cloud.network.NetworkActivity;
+import com.mogo.cloud.passport.MoGoAiCloudClient;
+import com.mogo.cloud.tanlu.MogoRoadSearchManager;
+import com.mogo.cloud.tanlu.MogoUploadManager;
+import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
+import com.mogo.cloud.tanlu.api.ITanluUploadCallback;
+import com.mogo.cloud.tanlu.bean.RoadInfoRequest;
+import com.mogo.cloud.tanlu.bean.RoadInfos;
+import com.mogo.cloud.tanlu.bean.UploadInfo;
+import com.mogo.cloud.tanlu.bean.UploadResult;
+import com.mogo.cloud.tanlu.bean.location.Location;
+import com.mogo.realtime.Interface.MoGoAiCloudRealTime;
+import com.mogo.realtime.entity.MogoSnapshotSetData;
+import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
+
+import java.util.ArrayList;
+
+/**
+ * @author lixiaopeng
+ * @description 路况服务
+ * @since: 2021/1/21
+ */
+public class RoadConditionActivity extends AppCompatActivity {
+    private static final String TAG = "RoadConditionActivity";
+    private Button roadUploadButton;
+    private Button roadQueryButton;
+    private TextView roadUploadTv;
+    private TextView roadQueryTv;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_roadcondition);
+
+        roadUploadTv = findViewById(R.id.road_upload_tv);
+        roadQueryTv = findViewById(R.id.road_query_tv);
+
+        roadUploadButton = findViewById(R.id.road_upload_bt);
+        roadUploadButton.setOnClickListener(view -> {
+            uploadRoadInfo();
+        });
+
+        roadQueryButton = findViewById(R.id.road_query_bt);
+        roadQueryButton.setOnClickListener(view -> {
+            queryRoad();
+        });
+    }
+
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+
+    public void queryRoad() {
+        ArrayList list = new ArrayList();
+        list.add("10007");
+
+        //北京市朝阳区小黄庄北街2号， 经纬度和地理位置必须有一个
+        Location location = new Location();
+        location.setLatitude(39.968139);
+        location.setLongitude(116.411468);
+        RoadInfoRequest request = new RoadInfoRequest(location, "中关村", list, false, false);
+
+        MogoRoadSearchManager.getInstance(RoadConditionActivity.this).init();
+        MogoRoadSearchManager.getInstance(RoadConditionActivity.this).queryRoadInfo(request, new IRoadInfoSearchCallback() {
+            @Override
+            public void onSuccess(BaseData<RoadInfos> result) {
+                if (result != null && result.getResult() != null) {
+                    if (result != null && result.getResult() != null) {
+                        roadQueryTv.setText(new Gson().toJson(result));
+                    } else {
+                        roadQueryTv.setText("onSuccess code = " + result.getCode() + " --message = " + result.getMsg());
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(int code) {
+                roadQueryTv.setText("onFailure code = " + code);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                roadQueryTv.setText("onError e = " + e);
+            }
+        });
+    }
+
+    public void uploadRoadInfo() {
+        UploadInfo info = new UploadInfo();
+//        info.setFilePath("/storage/emulated/0/Movies/compress_video_20210127112035.mp4");
+        info.setFilePath("/storage/emulated/0/Movies/2222.png");
+
+        info.setAddr("北京市东城区小黄庄北街2号靠近中国银行");
+        info.setLongitude(116.410892);
+        info.setLatitude(39.968317);
+        info.setPoiType("10007");
+        info.setDirection(0);
+        info.setAreaCode("110101");
+        info.setCityCode("010");
+        info.setSn("F803EB2046PZD00228");
+        info.setType(0); //0为图片， 1为视频
+
+        MogoUploadManager.getInstance(RoadConditionActivity.this).uploadInfo(info, new ITanluUploadCallback() {
+            @Override
+            public void onSuccess(BaseData<UploadResult> result) {
+                if (result != null && result.getResult() != null) {
+                    roadUploadTv.setText("onSuccess id = "  + result.getResult().id + "");
+                } else {
+                    roadUploadTv.setText("onSuccess code = " + result.getCode() + " --message = " + result.getMsg());
+                }
+            }
+
+            @Override
+            public void onFailure(int code) {
+                roadUploadTv.setText("onFailure code = " + code);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                roadUploadTv.setText("onError e = " + e);
+            }
+        });
+    }
+
+
+}

app/src/main/java/com/mogo/cloud/network/NetworkActivity.java

@@ -1,7 +1,6 @@
 package com.mogo.cloud.network;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -10,13 +9,6 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.gson.Gson;
 import com.mogo.cloud.R;
-import com.mogo.cloud.tanlu.MogoRoadSearchManager;
-import com.mogo.cloud.tanlu.MogoUploadManager;
-import com.mogo.cloud.tanlu.api.IRoadInfoSearchCallback;
-import com.mogo.cloud.tanlu.api.ITanluUploadCallback;
-import com.mogo.cloud.tanlu.bean.RoadInfos;
-import com.mogo.cloud.tanlu.bean.UploadInfo;
-import com.mogo.cloud.tanlu.bean.UploadResult;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -53,76 +45,6 @@ public class NetworkActivity extends AppCompatActivity {
                 tvResult.setText("结果显示");
                 queryRoadData("ZD802C1938L10797");
 //                queryHelpSignal("F803EB2046PZD00006");
-
-                //上报路况到服务端
-                //  uploadRoadInfo();
-                //查询路况
-//                queryRoad();
-            }
-        });
-
-    }
-
-    public void queryRoad() {
-        MogoRoadSearchManager.getInstance(NetworkActivity.this).init();
-        MogoRoadSearchManager.getInstance(NetworkActivity.this).queryRoadInfo(null, new IRoadInfoSearchCallback() {
-            @Override
-            public void onSuccess(BaseData<RoadInfos> result) {
-                if (result != null && result.getResult() != null) {
-                    Log.d(TAG, "msg = " + result.getMsg() + "  --code =" + result.getCode());
-                    if (result.getResult().getData() != null) {
-                        Log.d(TAG, "NetworkActivity queryRoad size() = " + result.getResult().getData().size());
-                    }
-                    tvResult.setText(new Gson().toJson(result));
-                }
-            }
-
-            @Override
-            public void onFailure(int code) {
-                Log.d(TAG, "NetworkActivity queryRoad code = " + code);
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                Log.d(TAG, "NetworkActivity queryRoad e = " + e);
-            }
-        });
-    }
-
-    public void uploadRoadInfo() {
-        UploadInfo info = new UploadInfo();
-//        info.setFilePath("/storage/emulated/0/Movies/compress_video_20210127112035.mp4");
-//        info.setFilePath("/storage/emulated/0/Movies/2222.png");
-
-        info.setAddr("北京市东城区小黄庄北街2号靠近中国银行");
-        info.setLongitude(116.410892);
-        info.setLatitude(39.968317);
-        info.setPoiType("10007");
-        info.setDirection(0);
-        info.setAreaCode("110101");
-        info.setCityCode("010");
-        info.setSn("F803EB2046PZD00228");
-        info.setType(0); //0为图片， 1为视频
-
-        MogoUploadManager.getInstance(NetworkActivity.this).uploadInfo(info, new ITanluUploadCallback() {
-            @Override
-            public void onSuccess(BaseData<UploadResult> result) {
-                if (result != null && result.getResult() != null) {
-                    Log.d(TAG, "NetworkActivity uploadRoadInfo result.id = " + result.getResult().id);
-                    tvResult.setText(result.getResult().id + "");
-                } else {
-                   Log.e(TAG, "NetworkActivity uploadRoadInfo result == null");
-                }
-            }
-
-            @Override
-            public void onFailure(int code) {
-                Log.d(TAG, "NetworkActivity uploadRoadInfo code = " + code);
-            }
-
-            @Override
-            public void onError(Throwable e) {
-                Log.d(TAG, "NetworkActivity uploadRoadInfo onError e = " + e);
             }
         });
     }

app/src/main/res/layout/activity_main.xml

@@ -59,6 +59,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="实时数据测试" />
+
+        <Button
+            android:id="@+id/btnJumpRoadcondition"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="路况服务测试" />
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/layout/activity_roadcondition.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/road_upload_bt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:text="路况信息上报" />
+
+    <TextView
+        android:id="@+id/road_upload_tv"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <Button
+        android:id="@+id/road_query_bt"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:text="路况信息查询" />
+
+    <TextView
+        android:id="@+id/road_query_tv"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

foudations/mogo-commons/build/.transforms/259f02a75e11c80dfaf024573c1792c5.bin

@@ -0,0 +1 @@
+o/classes

foudations/mogo-commons/build/.transforms/67ee449adb97fed6472bdddfeb8b9815.bin

@@ -0,0 +1 @@
+o/classes

foudations/mogo-commons/build/.transforms/e83d455193ded0f03052df3281fdf31a.bin

@@ -0,0 +1 @@
+o/classes

foudations/mogo-commons/build/.transforms/f6828d9ed5e708f20a23d05247fd06df.bin

@@ -0,0 +1 @@
+o/classes

foudations/mogo-commons/build/generated/source/buildConfig/debug/com/mogo/cloud/commons/BuildConfig.java

@@ -0,0 +1,12 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mogo.cloud.commons;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.cloud.commons";
+  public static final String BUILD_TYPE = "debug";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "1.0";
+}

foudations/mogo-commons/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.cloud.commons"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="22" />
+    /
+
+</manifest>

foudations/mogo-commons/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "applicationId": "com.mogo.cloud.commons",
+  "variantType": "LIBRARY",
+  "elements": [
+    {
+      "outputType": {
+        "type": "AAPT_FRIENDLY_MERGED_MANIFESTS"
+      },
+      "apkData": {
+        "type": "MAIN",
+        "splits": [],
+        "versionCode": 1,
+        "versionName": "1.0",
+        "outputFile": "mogo-commons-debug.aar",
+        "fullName": "debug",
+        "baseName": "debug",
+        "dirName": ""
+      },
+      "path": "AndroidManifest.xml",
+      "properties": {
+        "packageId": "com.mogo.cloud.commons",
+        "split": ""
+      }
+    }
+  ]
+}

foudations/mogo-commons/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -0,0 +1 @@
+{}

foudations/mogo-commons/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/debug/jniLibs"/></dataSet></merger>

foudations/mogo-commons/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/debug/shaders"/></dataSet></merger>

foudations/mogo-commons/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/assets"/><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/debug/assets"/></dataSet></merger>

foudations/mogo-commons/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -0,0 +1 @@
+#Tue Jan 26 12:24:54 CST 2021

foudations/mogo-commons/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/res"/><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/res"/><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/debug/res"/></dataSet><mergedItems/></merger>

foudations/mogo-commons/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.cloud.commons"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="22" />
+    /
+
+</manifest>

foudations/mogo-commons/build/intermediates/local_only_symbol_list/debug/R-def.txt

@@ -0,0 +1,2 @@
+R_DEF: Internal format may change without notice
+local

foudations/mogo-commons/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -0,0 +1,14 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="com.mogo.cloud.commons"
+4    android:versionCode="1"
+5    android:versionName="1.0" >
+6
+7    <uses-sdk
+8        android:minSdkVersion="19"
+8-->/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/AndroidManifest.xml
+9        android:targetSdkVersion="22" />
+9-->/Users/admin/Android/ADAS/MoGoAiCloudSdk/foudations/mogo-commons/src/main/AndroidManifest.xml
+10    /
+11
+12</manifest>

foudations/mogo-commons/build/intermediates/merged_manifests/debug/output.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "applicationId": "com.mogo.cloud.commons",
+  "variantType": "LIBRARY",
+  "elements": [
+    {
+      "outputType": {
+        "type": "MERGED_MANIFESTS"
+      },
+      "apkData": {
+        "type": "MAIN",
+        "splits": [],
+        "versionCode": 1,
+        "versionName": "1.0",
+        "outputFile": "mogo-commons-debug.aar",
+        "fullName": "debug",
+        "baseName": "debug",
+        "dirName": ""
+      },
+      "path": "../../library_manifest/debug/AndroidManifest.xml",
+      "properties": {
+        "packageId": "com.mogo.cloud.commons",
+        "split": ""
+      }
+    }
+  ]
+}

foudations/mogo-commons/build/intermediates/navigation_json/debug/navigation.json

@@ -0,0 +1 @@
+[]