From fa090ed8bad7193edc501481eac13466f2003c36 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 26 Sep 2022 20:44:00 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6][merge]:=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=B8=85=E6=89=AB=E8=BD=A6=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AFV1.0.0=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94master=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81=EF=BC=8Cres?=
 =?UTF-8?q?et=20=E6=97=A0=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhidao/adas/client/ui/MainActivity.java   |  6 ++++--
 build.gradle                                           |  2 +-
 .../src/main/java/com/mogo/map/utils/ObjectUtils.java  | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
index ce9ba763cf..832cd76fe5 100644
--- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
+++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
@@ -1066,15 +1066,17 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas
         }
         connectStatus = ipcConnectionStatus;
         String status = onUpdateConnectStateView();
-        getHandler().sendEmptyMessage(WHAT_IPC_IP);
         if (connectStatus == IPC_CONNECTION_STATUS.CONNECTED) {
-
+            getHandler().sendEmptyMessage(WHAT_IPC_IP);
             String tem = getIPCIP();
             if (!TextUtils.isEmpty(tem)) {
                 List<String> ips = Constants.getIpcUsedIps(this);
                 Constants.addIpcUsedIps(this, ips, tem);
             }
+        } else if (connectStatus == IPC_CONNECTION_STATUS.DISCONNECTED) {
+            getHandler().sendEmptyMessage(WHAT_IPC_IP);
         }
+
 //        LogSave.getInstance().saveLog("连接状态", status);
 //        CupidLogUtils.i(TAG, "connectStatus=" + status);
     }
diff --git a/build.gradle b/build.gradle
index 56d272e099..2d52e63827 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30'
         classpath "com.alibaba:arouter-register:1.0.12-mogo"
         classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4'
         classpath 'com.tencent.bugly:symtabfileuploader:2.2.1'
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
index 6da00cf5fd..4b9327d7da 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
@@ -486,11 +486,11 @@ public class ObjectUtils {
         if (options.getColorValues() != null) {
             target.colorValues(options.getColorValues());
         }
-//        if (options.isBrightOn()) {
-//            target.isBright = true;
-//            target.brightColor = options.getBrightColor();
-//            target.brightSpeed = options.getBrightSpeed();
-//        }
+        if (options.isBrightOn()) {
+            target.isBright = true;
+            target.brightColor = options.getBrightColor();
+            target.brightSpeed = options.getBrightSpeed();
+        }
         return target;
     }