yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

Browse Source
This commit is contained in:
wangmingjun
2023-03-14 19:00:09 +08:00
parent 26d6f4ef62 286d9cbc28
commit f0131a23b0
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -9,6 +9,7 @@ import android.graphics.Color
import android.os.Build
import android.text.Html
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import androidx.annotation.RequiresApi
@@ -540,15 +541,15 @@ internal class DebugSettingView @JvmOverloads constructor(
/**
* 修改自车按钮（出租车、小巴车）
*/
// tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked ->
// if (!isChecked) {
// // 替换为出租车图标
// CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
// } else {
// // 替换为小巴车图标
// CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
// }
// }
tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked ->
if (!isChecked) {
// 替换为出租车图标
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
} else {
// 替换为小巴车图标
CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
}
}
/**
@@ -814,9 +815,9 @@ internal class DebugSettingView @JvmOverloads constructor(
}
//初始化切换自车按钮文本（Bus版本默认显示：切换自车为出租车）
if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
tbChangeCurrentCarIcon.isChecked = true
}
// if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
// tbChangeCurrentCarIcon.isChecked = true
// }
//初始化ADAS日志开关状态
tbADASLog.isChecked = CallerAutoPilotControlManager.isEnableLog()

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -1482,7 +1482,6 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btnDrawTrolley"
app:layout_constraintTop_toBottomOf="@id/reset_changesight"
android:visibility="invisible"
/>
<ToggleButton

2
foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java
View File

@@ -26,7 +26,7 @@ public class HostConst {
public static final String HOST_RELEASE = "http://eagle-mis.zhidaozhixing.com";
public static final String HOST_EAGLE_QA = "http://eagle-dns-qa.zhidaozhixing.com/";
public static final String HOST_EAGLE_RELEASE = "http://eagle-dns-qa.zhidaozhixing.com/";
public static final String HOST_EAGLE_RELEASE = "http://eagle-dns.zhidaozhixing.com/";
public static String getHost() {
String host = HOST_RELEASE;