diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt index 7bcb4554da..022634fc25 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i +import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.support.device.DevicesManager import com.mogo.support.device.IWriteChainLogListener import com.mogo.support.device.led.LedSourceManager @@ -68,7 +69,7 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener { paramIndexes = [0, 1, 2] ) override fun onWriteChainLog(tag: String, title: String, info: String) { - if(DebugConfig.isDebug()) { + if (DebugConfig.isDebug()) { try { i("${tag}_${EVENT_KEY_HARDWARE_DEVICES}", "${title}_${info}") val params = HashMap() @@ -82,4 +83,8 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener { } } } + + override fun onGetString(id: Int): String { + return StringUtils.getString(id) + } } \ No newline at end of file diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/IWriteChainLogListener.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/IWriteChainLogListener.kt index a6ef9b2073..14c48190c2 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/IWriteChainLogListener.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/IWriteChainLogListener.kt @@ -1,9 +1,13 @@ package com.mogo.support.device +import androidx.annotation.StringRes + /** * 日志 */ interface IWriteChainLogListener { fun onWriteChainLog(tag: String, title: String, info: String) + + fun onGetString(@StringRes id: Int): String } \ No newline at end of file diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/BackLedUIViewModel.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/BackLedUIViewModel.kt index 4975410229..7524229168 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/BackLedUIViewModel.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/BackLedUIViewModel.kt @@ -2,6 +2,7 @@ package com.mogo.support.device.led import android.util.Log import com.mogo.support.device.IWriteChainLogListener +import com.mogo.support.device.R import com.mogo.support.device.manager.cpower5a.LedScreenCpower5aManager import com.mogo.support.device.manager.cpower5a.common.LedScreen import com.mogo.support.device.manager.cpower5a.common.Program @@ -101,7 +102,8 @@ open class BackLedUIViewModel(writeChainLogListener: IWriteChainLogListener) : B LedScreenCpower5aManager.getInstance() .playProgramLineStationReportHint( LedScreen.OUTWARD_BACK, - "车辆进站" +// "车辆进站" + writeChainLogListener.onGetString(R.string.module_device_vehicle_arrive_station) ) writeChainLogListener.onWriteChainLog( TAG, @@ -114,7 +116,8 @@ open class BackLedUIViewModel(writeChainLogListener: IWriteChainLogListener) : B LedScreenCpower5aManager.getInstance() .playProgramLineStationReportHint( LedScreen.OUTWARD_BACK, - "车辆起步" +// "车辆起步" + writeChainLogListener.onGetString(R.string.module_device_vehicle_start) ) writeChainLogListener.onWriteChainLog( TAG, diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/FrontLedUIViewModel.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/FrontLedUIViewModel.kt index ac51b24654..4db3e8bcb6 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/FrontLedUIViewModel.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/FrontLedUIViewModel.kt @@ -2,6 +2,7 @@ package com.mogo.support.device.led import android.util.Log import com.mogo.support.device.IWriteChainLogListener +import com.mogo.support.device.R import com.mogo.support.device.manager.cpower5a.LedScreenCpower5aManager import com.mogo.support.device.manager.cpower5a.common.LedScreen import com.mogo.support.device.manager.cpower5a.common.Program @@ -94,7 +95,8 @@ class FrontLedUIViewModel(writeChainLogListener: IWriteChainLogListener) : BaseL LedScreenCpower5aManager.getInstance() .playProgramLineStationReportHint( LedScreen.OUTWARD_FRONT, - "车辆进站" +// "车辆进站" + writeChainLogListener.onGetString(R.string.module_device_vehicle_arrive_station) ) writeChainLogListener.onWriteChainLog( TAG, @@ -107,7 +109,8 @@ class FrontLedUIViewModel(writeChainLogListener: IWriteChainLogListener) : BaseL LedScreenCpower5aManager.getInstance() .playProgramLineStationReportHint( LedScreen.OUTWARD_FRONT, - "车辆起步" +// "车辆起步" + writeChainLogListener.onGetString(R.string.module_device_vehicle_start) ) writeChainLogListener.onWriteChainLog( TAG, diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedSourceManager.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedSourceManager.kt index 020f92e2d0..c05d9389d9 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedSourceManager.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedSourceManager.kt @@ -4,7 +4,9 @@ package com.mogo.support.device.led import android.content.Context import android.os.CountDownTimer import android.text.TextUtils +import androidx.annotation.StringRes import com.mogo.support.device.IWriteChainLogListener +import com.mogo.support.device.R import com.mogo.support.device.manager.cpower5a.LedScreenCpower5aManager import com.mogo.support.device.manager.cpower5a.OnLedScreenCpower5aListener import com.mogo.support.device.manager.cpower5a.common.Cpower5aState.Execute @@ -297,20 +299,24 @@ object LedSourceManager : IWriteChainLogListener { //结束 frontViewModel.reset() backViewModel.reset() - receiveUI(FinishUI()) +// receiveUI(FinishUI()) + receiveUI(FinishUI(writeChainLogListener?.onGetString(R.string.module_device_thank_you_for_accompanying_all_the_way) ?: "感谢一路相伴")) } else if (type == 3) { //出站 if (arrivalStopName.isNotEmpty()) { - updateStationReportUI(arrivalStopName, "下一站") +// updateStationReportUI(arrivalStopName, "下一站") + updateStationReportUI(arrivalStopName, writeChainLogListener?.onGetString(R.string.module_device_next_station) ?: "下一站") } } else if (type == 4) { //进站 if (arrivalStopName.isNotEmpty()) { updateStationReportUI( arrivalStopName, if (isLastStop) { - "终点站" +// "终点站" + writeChainLogListener?.onGetString(R.string.module_device_destination) ?: "终点站" } else { - "已到达" +// "已到达" + writeChainLogListener?.onGetString(R.string.module_device_have_arrived) ?: "已到达" } ) } @@ -344,6 +350,10 @@ object LedSourceManager : IWriteChainLogListener { writeChainLogListener?.onWriteChainLog(tag, title, info) } + override fun onGetString(@StringRes id: Int): String { + return writeChainLogListener?.onGetString(id) ?: "" + } + private val cpower5aListener: OnLedScreenCpower5aListener = object : OnLedScreenCpower5aListener() { @@ -459,23 +469,28 @@ object LedSourceManager : IWriteChainLogListener { ): String { var temp = when (state) { Execute.EXECUTE_SUCCEED -> { - "欢迎语更改成功" +// "欢迎语更改成功" + writeChainLogListener?.onGetString(R.string.module_device_welcome_msg_update_success) ?: "欢迎语更改成功" } Execute.CONNECT_FAILED -> { - "欢迎语更改失败，无法连接到设备" +// "欢迎语更改失败，无法连接到设备" + writeChainLogListener?.onGetString(R.string.module_device_welcome_msg_update_fail_connect_failed) ?: "欢迎语更改失败，无法连接到设备" } Execute.DATA_EXCEPTION -> { - "欢迎语更改失败，数据异常" +// "欢迎语更改失败，数据异常" + writeChainLogListener?.onGetString(R.string.module_device_welcome_msg_update_fail_data_exception) ?: "欢迎语更改失败，数据异常" } Execute.EXECUTE_EXCEPTION -> { - "欢迎语更改失败，解析或发送异常" +// "欢迎语更改失败，解析或发送异常" + writeChainLogListener?.onGetString(R.string.module_device_welcome_msg_update_fail_execute_exception) ?: "欢迎语更改失败，解析或发送异常" } else -> { - "欢迎语更改失败" +// "欢迎语更改失败" + writeChainLogListener?.onGetString(R.string.module_device_welcome_msg_update_fail) ?: "欢迎语更改失败" } } if (!TextUtils.isEmpty(errMsg)) { @@ -483,15 +498,18 @@ object LedSourceManager : IWriteChainLogListener { } val device = when (LedScreen.getLedScreen(ip)) { LedScreen.OUTWARD_FRONT -> { - "前屏" +// "前屏" + writeChainLogListener?.onGetString(R.string.module_device_front_screen) ?: "前屏" } LedScreen.OUTWARD_BACK -> { - "后屏" +// "后屏" + writeChainLogListener?.onGetString(R.string.module_device_back_screen) ?: "后屏" } else -> { - "未知屏幕" +// "未知屏幕" + writeChainLogListener?.onGetString(R.string.module_device_unknown_screen) ?: "未知屏幕" } } return device + temp diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedUI.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedUI.kt index 7eb0260137..319078f2ec 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedUI.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/led/LedUI.kt @@ -49,7 +49,8 @@ class WelcomeUI(val hintMsg: String? = null, val isForever: Boolean = false) : } //结束提示 -class FinishUI(val hintMsg: String = "感谢一路相伴") : +//class FinishUI(val hintMsg: String = "感谢一路相伴") : +class FinishUI(val hintMsg: String) : LedUICountDown(priority = 5, countDownSeconds = 10) //线路信息提示 diff --git a/libraries/mogo-hardware-devices/src/main/res/values/strings.xml b/libraries/mogo-hardware-devices/src/main/res/values/strings.xml new file mode 100644 index 0000000000..a1942b188c --- /dev/null +++ b/libraries/mogo-hardware-devices/src/main/res/values/strings.xml @@ -0,0 +1,18 @@ + + 感谢一路相伴 + 下一站 + 终点站 + 已到达 + 前屏 + 后屏 + 未知屏幕 + 欢迎语更改成功 + 欢迎语更改失败，无法连接到设备 + 欢迎语更改失败，数据异常 + 欢迎语更改失败，解析或发送异常 + 欢迎语更改失败 + 车辆进站 + 车辆起步 + + +