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 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; }