解决冲突-EntranceFragment再验证一遍

modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java

@@ -82,14 +82,10 @@ public class EnvStatusManager {
                 "网络状态",
                 "App版本",
                 "Map版本",
-<<<<<<< HEAD
-                "SN"
-=======
                 "SN",
                 "OBU状态",
                 "HV状态",
                 "RV状态"
->>>>>>> dev/dev_eagle_architecture_upgrade
         };
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < sStatusName.length; i++) {
@@ -109,8 +105,6 @@ public class EnvStatusManager {
                 }
             } else if(i == 10){
                 stringBuilder.append(MoGoAiCloudClientConfig.getInstance().getSn()).append("\n");
-<<<<<<< HEAD
-=======
             } else if (i == 11) {
                 boolean isObuConnect = SharedPrefsMgr.getInstance(mContext).getBoolean("OBU", false);
                 stringBuilder.append(isObuConnect == true ? "已连接" : "未连接").append("\n");
@@ -120,7 +114,6 @@ public class EnvStatusManager {
             } else if (i == 13) {
                 boolean isRv = SharedPrefsMgr.getInstance( mContext ).getBoolean("OBU_RV", false );
                 stringBuilder.append(isRv == true ? "已连接" : "未连接").append("\n");
->>>>>>> dev/dev_eagle_architecture_upgrade
             } else {
                 stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
             }