diff --git a/.idea/misc.xml b/.idea/misc.xml index 9f6f97a3a6..37fc2ab8e9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -16,7 +16,7 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 8282a2b0be..91c053f9b1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -44,7 +44,7 @@ class MoGoHmiFragment : MvpFragment .setTag("DebugSettingView") .setLayout(debugSettingView) .setSidePattern(SidePattern.RIGHT) - .setGravity(Gravity.RIGHT, offsetY = 80) + .setGravity(Gravity.RIGHT, offsetY = 70) .setImmersionStatusBar(true) .setAnimator(object : DefaultAnimator() { override fun enterAnim( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 7b9574563c..c2ab39e8e8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -4,14 +4,19 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.data.constants.MoGoOBUConfig +import com.mogo.cloud.passport.MoGoAiCloudClient +import com.mogo.eagle.core.data.app.AppConfigInfo +import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.obu.ObuStatusInfo import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener import com.mogo.eagle.core.function.call.obu.CallerOBUManager import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.map.MogoMap +import com.mogo.utils.network.utils.GsonUtil import com.mogo.utils.storage.SharedPrefsMgr import kotlinx.android.synthetic.main.view_debug_setting.view.* @@ -47,6 +52,26 @@ class DebugSettingView @JvmOverloads constructor( private fun initView() { tvObuInfo.text = CallerObuListenerManager.getObuStatusInfo() + + // 初始化App 配置信息 + val appConfigInfo = AppConfigInfo() + appConfigInfo.appName = AppUtils.getAppName() + appConfigInfo.appVersionCode = AppUtils.getAppVersionCode() + appConfigInfo.appVersionName = AppUtils.getAppVersionName() + appConfigInfo.appPackageName = AppUtils.getAppPackageName() + appConfigInfo.devicesSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn + appConfigInfo.mapVersion = MogoMap.getInstance().mogoMap.mapVersion + + // 将数据绘制 + tvAppInfo.text = GsonUtil.jsonFromObject(appConfigInfo) + + // 初始化OBU IP信息 + val ipAddress = + SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199") + + etObuIP.setText(ipAddress) + etObuIP.text?.let { etObuIP.setSelection(it.length) } + btnSetObuIP.setOnClickListener { val obuIP = etObuIP.text.toString() if (obuIP.isNotEmpty()) { @@ -57,10 +82,11 @@ class DebugSettingView @JvmOverloads constructor( } } + /** + * OBU状态回调 + */ override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) { tvObuInfo.text = GsonUtils.toJson(obuStatusInfo) - etObuIP.setText(obuStatusInfo.connectIP) - etObuIP.text?.let { etObuIP.setSelection(it.length) } } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index a47576a327..95001345bc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1,8 +1,7 @@ - - + + android:orientation="vertical"> - + + + + + + + + android:orientation="vertical"> -