[解决冲突]code fix

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -108,6 +108,14 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         showAutopilotBiz();
 
         mSwitchLine.setOnClickListener(this);
+
+        mLineName.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showHideTestBar();
+                return false;
+            }
+        });
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

app/build.gradle

@@ -36,15 +36,6 @@ if (!isAndroidTestBuild()) {
     apply plugin: 'apm-plugin'
 }
 
-if (!isAndroidTestBuild()) {
-    apply plugin: 'bytex.threadOpt'
-    thread_opt {
-        enable !isReleaseBuild
-        enableInDebug !isReleaseBuild
-        logLevel "DEBUG"
-    }
-}
-
 if (!isAndroidTestBuild()) {
     apply plugin: 'LancetX'
     LancetX {
@@ -290,10 +281,6 @@ dependencies {
     androidTestImplementation rootProject.ext.dependencies.androidx_espresso_core
     androidTestImplementation rootProject.ext.dependencies.localbroadcastmanager
     androidTestImplementation rootProject.ext.dependencies.mogo_v2x
-
-    if (isAndroidTestBuild()) {
-        implementation "com.mogo.thread.opt:lib:${THREAD_OPT_VERSION}"
-    }
 }
 
 if (!isAndroidTestBuild()) {

build.gradle

@@ -34,7 +34,6 @@ buildscript {
         classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}"
         classpath "com.mogo.cloud:bizconfig:${BIZCONFIG_VERSION}"
         classpath 'com.volcengine:apm_insight_plugin:1.4.1'
-        classpath "com.mogo.thread.opt:plg:${THREAD_OPT_VERSION}"
         classpath 'com.mogo.cloud:systrace:1.0.1'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
         classpath 'com.mogo.sticky:service:1.0.8'

gradle.properties

@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.26
 MOGO_TELEMATIC_VERSION=1.4.3.26
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.6.0.10
+MAP_SDK_VERSION=2.6.1.1
 MAP_SDK_OPERATION_VERSION=1.1.2.4
 # websocket
 WEBSOCKET_VERSION=1.1.7