Merge branch 'release_robotaxi-d-app-module_2100_220816_2.10.0.1' into 'master'

Release robotaxi d app module 2100 220816 2.10.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!195

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -109,11 +109,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         }
 
         tvOperationStatus.setVisibility(View.VISIBLE);
-
-        if (DebugConfig.isDebug()) {
-            initOrderTestBar();
-        }
-
+        initOrderTestBar();
     }
 
     private void initFragment() {

OCH/mogo-och-taxi/src/main/res/layout/taxi_panel.xml

@@ -62,7 +62,6 @@
             android:id="@+id/test_bar_to_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:onClick="testToStart"
             android:text="到达上车点"
             android:textSize="12sp" />
         <Button
@@ -70,7 +69,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="12sp"
-            android:onClick="testWayToEnd"
             android:text="开启服务"/>
 
         <Button
@@ -78,14 +76,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="12sp"
-            android:onClick="testWayToEnd"
             android:text="开启自动驾驶"/>
 
         <Button
             android:id="@+id/test_bar_to_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:onClick="testToEnd"
             android:text="到达目的地"
             android:textSize="12sp" />
 

app/build.gradle

@@ -33,19 +33,19 @@ if (!isAndroidTestBuild()) {
     apply plugin: 'apm-plugin'
 }
 
-if (!isAndroidTestBuild()) {
-    apply plugin: 'bytex.threadOpt'
-    thread_opt {
-        enable true
-        enableInDebug true
-        logLevel "DEBUG"
-        //白名单中的类不进行替换
-        white_list = [
-                'leakcanary.*',
-                'com.loc.*'
-        ]
-    }
-}
+//if (!isAndroidTestBuild()) {
+//    apply plugin: 'bytex.threadOpt'
+//    thread_opt {
+//        enable true
+//        enableInDebug true
+//        logLevel "DEBUG"
+//        //白名单中的类不进行替换
+//        white_list = [
+//                'leakcanary.*',
+//                'com.loc.*'
+//        ]
+//    }
+//}
 
 //if (!isAndroidTestBuild()) {
 //    /**

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -3,14 +3,14 @@ package com.mogo.launcher;
 import com.mogo.eagle.core.function.main.MainMoGoApplication;
 import android.content.Context;
 
-import androidx.annotation.NonNull;
+//import androidx.annotation.NonNull;
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.launcher.crash.CrashSystem;
-import com.mogo.thread.ext.core.ThreadManager;
-import com.mogo.thread.ext.core.config.ThreadConfig;
-
-import java.util.concurrent.ThreadPoolExecutor;
+//import com.mogo.thread.ext.core.ThreadManager;
+//import com.mogo.thread.ext.core.config.ThreadConfig;
+//
+//import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * @author congtaowang
@@ -23,36 +23,36 @@ public class MogoApplication extends MainMoGoApplication {
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
-        ThreadConfig.Builder builder = new ThreadConfig.Builder().listener(new ThreadConfig.TaskExecuteListener() {
-            @Override
-            public boolean isEnabled() {
-                return true; // 如果返回true，会有后续的回调；如果返回false, 不会有后续的回调
-            }
-
-            @Override
-            public void onExecutorBefore(@NonNull Runnable runnable) {
-                //每个任务执行前回调
-            }
-
-            @Override
-            public void onExecutorAfter(@NonNull Runnable runnable) {
-                //每个任务执行后回调
-            }
-
-            /**
-             * @param core 线程池的核心数
-             * @param max  线程池的最大线程数
-             * @param active 线程池正在活跃的任务数
-             * @param completed 线程池已完成的任务数
-             */
-            @Override
-            public void onExecutorStateChanged(@NonNull ThreadPoolExecutor pool, int core, int max, int active, long completed) {
-                //线程池在执行过程，状态变化回调
-                //Log.d("POOL", "core:" + core + ";max:" + max + ";active:" + active + ";completed:" + completed);
-            }
-        });
-        builder.loggable(false);
-        ThreadManager.INSTANCE.init(builder);
+//        ThreadConfig.Builder builder = new ThreadConfig.Builder().listener(new ThreadConfig.TaskExecuteListener() {
+//            @Override
+//            public boolean isEnabled() {
+//                return true; // 如果返回true，会有后续的回调；如果返回false, 不会有后续的回调
+//            }
+//
+//            @Override
+//            public void onExecutorBefore(@NonNull Runnable runnable) {
+//                //每个任务执行前回调
+//            }
+//
+//            @Override
+//            public void onExecutorAfter(@NonNull Runnable runnable) {
+//                //每个任务执行后回调
+//            }
+//
+//            /**
+//             * @param core 线程池的核心数
+//             * @param max  线程池的最大线程数
+//             * @param active 线程池正在活跃的任务数
+//             * @param completed 线程池已完成的任务数
+//             */
+//            @Override
+//            public void onExecutorStateChanged(@NonNull ThreadPoolExecutor pool, int core, int max, int active, long completed) {
+//                //线程池在执行过程，状态变化回调
+//                //Log.d("POOL", "core:" + core + ";max:" + max + ";active:" + active + ";completed:" + completed);
+//            }
+//        });
+//        builder.loggable(false);
+//        ThreadManager.INSTANCE.init(builder);
     }
 
     @Override