From 91abf349e42619d809d43e6e0df4080d72cce155 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 23 Dec 2021 12:12:57 +0800
Subject: [PATCH] wait to finish

---
 core/function-impl/mogo-core-function-main/build.gradle   | 2 ++
 .../mogo-core-function-main/src/main/AndroidManifest.xml  | 2 ++
 .../eagle/core/function/main/MainMoGoApplication.java     | 4 +++-
 .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 8 ++++----
 gradle.properties                                         | 4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle
index 3bf204ed91..8c269a93ac 100644
--- a/core/function-impl/mogo-core-function-main/build.gradle
+++ b/core/function-impl/mogo-core-function-main/build.gradle
@@ -61,6 +61,8 @@ dependencies {
 
     implementation rootProject.ext.dependencies.mogoami
 
+    implementation rootProject.ext.dependencies.mogochainbase
+
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         api rootProject.ext.dependencies.mogoaicloudservicesdk
         api rootProject.ext.dependencies.mogocommons
diff --git a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
index 4a4c78a268..d325f347ac 100644
--- a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.eagle.core.function.main">
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index d741ca6810..e0647dec88 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -20,6 +20,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.notice.PushUIConstants;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
+import com.mogo.eagle.core.utilcode.util.DeviceUtils;
 import com.mogo.map.MapApiPath;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoApisHandler;
@@ -38,6 +39,7 @@ import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
 import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.support.obu.ami.AmiClientManager;
+import com.zhjt.service.chain.core.ChainTraceStarter;
 
 /**
  * 默认初始化一些基础服务配置
@@ -57,6 +59,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             return;
         }
         start = System.currentTimeMillis();
+        ChainTraceStarter.start("com.mogo.launcher.f", DeviceUtils.getMacAddress());
         // Crash 日志收集
         initCrashConfig();
         initLogConfig();
@@ -65,7 +68,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         initCloudClientConfig();
     }
 
-
     @Override
     protected boolean shouldInit() {
         Logger.w(TAG, "evaluate shouldInit() with: %s", ProcessUtils.getProcessName(Process.myPid()));
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
index f9633ad1c7..9c1828bc5c 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -43,7 +43,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     private var vip: Boolean = false
 
     @Volatile
-    private var enter: Boolean = false
+    private var exit: Boolean = true
 
     private var result: TrafficLightResult? = null
     private var lastResult: TrafficLightStatus? = null
@@ -99,8 +99,8 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (!vip) {
             return
         }
-        if (!enter) {
-            Logger.d(TAG, "驶入路口，返回 , then  resetConditions")
+        if (!exit) {
+            Logger.d(TAG, "驶出路口，返回 , then  resetConditions")
             resetConditions()
             return
         }
@@ -228,7 +228,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     override fun onEnterCrossRoad(enter: Boolean) {
         super.onEnterCrossRoad(enter)
         UiThreadHandler.post {
-            this.enter = enter
+            this.exit = enter
         }
     }
 
diff --git a/gradle.properties b/gradle.properties
index d745816928..cc445138c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -56,8 +56,8 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true
 bytex.verifyProguardConfigurationChanged=false
 bytex.ASM_API=ASM7
 
-HOOK_LOG_VERSION=1.4.94
-SERVICE_CHAIN_VERSION=1.0.32
+HOOK_LOG_VERSION=1.4.109
+SERVICE_CHAIN_VERSION=1.0.43
 ################  外部依赖引用 ################
 # loglib
 LOGLIB_VERSION=1.1.6