Merge branch 'dev_hengyang_base' into feature/feature_mogo_obu

# Conflicts:
#	.idea/misc.xml
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
This commit is contained in:
董宏宇
2021-08-20 16:19:23 +08:00
5 changed files with 72 additions and 83 deletions

View File

@@ -11,6 +11,7 @@ import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.common.MogoApisHandler;
@@ -81,6 +82,7 @@ public class EnvStatusManager {
"网络状态",
"App版本",
"Map版本",
"SN",
"HV状态",
"RV状态"
};
@@ -100,10 +102,12 @@ public class EnvStatusManager {
if (!TextUtils.isEmpty(mapVersion)) {
stringBuilder.append(mapVersion).append("\n");
}
} else if (i == 10) {
} else if(i == 10){
stringBuilder.append(MoGoAiCloudClientConfig.getInstance().getSn()).append("\n");
} else if (i == 11) {
boolean isHv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_HV", false );
stringBuilder.append("true".equals(isHv) ? "已连接" : "未连接").append("\n");
} else if (i == 11) {
} else if (i == 12) {
boolean isRv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_RV", false );
stringBuilder.append("true".equals(isRv) ? "已连接" : "未连接").append("\n");
} else {