Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'

Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!618

app/build.gradle

@@ -1,7 +1,7 @@
-import java.text.SimpleDateFormat
-import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 
+import java.text.SimpleDateFormat
 
 apply plugin: 'com.android.application'
 apply plugin: 'com.alibaba.arouter'
@@ -310,8 +310,6 @@ aspectjx {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    //Crash日志收集
-//    implementation rootProject.ext.dependencies.crashSdk
     implementation rootProject.ext.dependencies.androidxappcompat
     implementation rootProject.ext.dependencies.arouter
     implementation rootProject.ext.dependencies.boostmultidex
@@ -321,41 +319,23 @@ dependencies {
     implementation rootProject.ext.dependencies.android_start_up
     implementation rootProject.ext.dependencies.lancetx_runtime
     implementation rootProject.ext.dependencies.mogocustommap
-    implementation project(':core:function-impl:mogo-core-function-startup')
     implementation project(':libraries:map-usbcamera')
-//    // 暂不使用Shizuku-API
-//    implementation rootProject.ext.dependencies.shizuku_provider
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.ttspad
-        implementation rootProject.ext.dependencies.mogo_core_function_hmi
-        implementation rootProject.ext.dependencies.mogocommons
-        implementation rootProject.ext.dependencies.mogo_core_utils
-        implementation rootProject.ext.dependencies.mogo_core_function_map
-        implementation rootProject.ext.dependencies.mogo_core_function_datacenter
-        implementation rootProject.ext.dependencies.mogo_core_function_devatools
-        implementation rootProject.ext.dependencies.mogo_core_function_chat
-        implementation rootProject.ext.dependencies.mogo_core_function_biz
-        implementation rootProject.ext.dependencies.mogo_core_function_call
 
-        androidTestImplementation rootProject.ext.dependencies.mogo_core_function_call
-        androidTestImplementation rootProject.ext.dependencies.mogo_core_res
-    } else {
-        implementation project(':tts:tts-pad')
-        implementation project(':core:function-impl:mogo-core-function-hmi')
-        implementation project(':core:function-impl:mogo-core-function-map')
-        implementation project(':core:function-impl:mogo-core-function-datacenter')
-        implementation project(':core:function-impl:mogo-core-function-devatools')
-        implementation project(':core:function-impl:mogo-core-function-chat')
-        implementation project(':core:function-impl:mogo-core-function-biz')
-        implementation project(':core:mogo-core-function-call')
-        implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-res')
-        implementation project(':foudations:mogo-commons')
+    implementation project(':tts:tts-pad')
+    implementation project(':core:function-impl:mogo-core-function-startup')
+    implementation project(':core:function-impl:mogo-core-function-devatools')
+    implementation project(':core:function-impl:mogo-core-function-datacenter')
+    implementation project(':core:function-impl:mogo-core-function-biz')
+    implementation project(':core:function-impl:mogo-core-function-hmi')
+    implementation project(':core:function-impl:mogo-core-function-map')
+    implementation project(':core:function-impl:mogo-core-function-chat')
+    implementation project(':foudations:mogo-commons')
+    implementation project(':core:mogo-core-function-call')
+    implementation project(':core:mogo-core-utils')
+    implementation project(':core:mogo-core-res')
 
-        androidTestImplementation project(':core:mogo-core-function-call')
-        androidTestImplementation project(':core:mogo-core-res')
-
-    }
+    androidTestImplementation project(':core:mogo-core-function-call')
+    androidTestImplementation project(':core:mogo-core-res')
 
 
     apply from: "./functions/och.gradle"

app/proguard-rules.pro

@@ -426,6 +426,6 @@
 -keep class com.squareup.haha.guava.collect.*{*;}
 -keep class **.zego.**{*;}
 
-
-
+#-----科大讯飞语音合成-----
+-keep class com.iflytek.**{*;}
 

app/src/androidTest/java/com/mogo/functions/test/RxJavaBackPressureTest.kt

@@ -1,7 +1,6 @@
 package com.mogo.functions.test
 
 import android.os.Debug
-import android.util.Log
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
@@ -30,7 +29,6 @@ class RxJavaBackPressureTest {
     fun before() {
         launch = ActivityScenario.launch(MainLauncherActivity::class.java)
         RxJavaPlugins.setErrorHandler {
-            Log.e("RxJava2", it.message, it)
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -19,27 +19,6 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:label">
 
-<!--        <provider-->
-<!--            android:name="com.rousetime.android_startup.provider.StartupProvider"-->
-<!--            android:authorities="${applicationId}.android_startup"-->
-<!--            android:exported="false" >-->
-<!--            <meta-data-->
-<!--                android:name="com.mogo.launcher.stageone.HttpDnsStartUp"-->
-<!--                android:value="android.startup" />-->
-<!--            <meta-data-->
-<!--                android:name="com.mogo.launcher.stageone.MogoStartupProviderConfig"-->
-<!--                android:value="android.startup.provider.config" />-->
-<!--        </provider>-->
-
-<!--        &lt;!&ndash; 暂不使用Shizuku-API &ndash;&gt;-->
-<!--        <provider-->
-<!--            android:name="rikka.shizuku.ShizukuProvider"-->
-<!--            android:authorities="${applicationId}.shizuku"-->
-<!--            android:enabled="true"-->
-<!--            android:exported="true"-->
-<!--            android:multiprocess="false"-->
-<!--            android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />-->
-
         <!-- 配置APP ID -->
         <meta-data
             android:name="BUGLY_APPID"

app/src/main/java/com/mogo/launcher/crash/CrashSystem.java

@@ -11,9 +11,7 @@ import android.util.Log;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;