[清扫车][merge]: 合并清扫车司机端V1.0.0代码时,对比master分支代码,reset 无关的代码修改;

This commit is contained in:
aibingbing
2022-09-26 20:44:00 +08:00
parent 6a21e175b4
commit fa090ed8ba
3 changed files with 10 additions and 8 deletions

View File

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

View File

@@ -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'

View File

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