fix bug of branch problem

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -373,7 +373,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         if (DebugConfig.isDebug()) {
             mouduleArc.setLongClickable(true);
             mouduleArc.setOnLongClickListener(v -> {
-                Log.d(TAG,"长安显示状态工具栏");
+                Log.d(TAG,"长按显示状态工具栏");
                 Intent intent = new Intent();
                 intent.putExtra("oper", 52);
                 MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent);

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

@@ -15,7 +15,6 @@ import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.module.service.R;
-import com.mogo.utils.AppUtils;
 import com.mogo.utils.NetworkUtils;
 
 import static com.mogo.utils.CommonUtils.getVersionName;
@@ -70,20 +69,16 @@ public class EnvStatusManager {
 
     private void renderStatus() {
         String[] sStatusName = {
-                "定位",
-                "近景",
-                "下发",
-                "AUTO",
-                "长链",
+                "工控机定位",
+                "ADAS近景感知",
+                "云端远景感知",
+                "自动驾驶状态",
+                "socket长链",
                 "经度",
                 "纬度",
-<<<<<<< HEAD
-                "MapVersion"
-=======
                 "网络状态",
                 "App版本",
                 "Map版本"
->>>>>>> c475544d3ea71424fa7d0826b54156ae420293a6
         };
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < sStatusName.length; i++) {
@@ -93,18 +88,14 @@ public class EnvStatusManager {
             } else if (i == 5 || i == 6) {
                 stringBuilder.append(DebugConfig.getStatusData(i)).append("\n");
             } else if (i == 7) {
-<<<<<<< HEAD
-                String mapVersion = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapVersion();
-                if (!TextUtils.isEmpty(mapVersion)) {
-                    stringBuilder.append(mapVersion).append("\n");
-                }
-=======
                 stringBuilder.append(NetworkUtils.isConnected(mContext)).append("\n");
             } else if (i == 8) {
                 stringBuilder.append(getVersionName(mContext, "com.mogo.launcher.f")).append("\n");
             } else if (i == 9) {
-                stringBuilder.append(AppUtils.getCustomMapSDKVersion(mContext)).append("\n");
->>>>>>> c475544d3ea71424fa7d0826b54156ae420293a6
+                String mapVersion = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapVersion();
+                if (!TextUtils.isEmpty(mapVersion)) {
+                    stringBuilder.append(mapVersion).append("\n");
+                }
             } else {
                 stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
             }
@@ -120,10 +111,6 @@ public class EnvStatusManager {
                 mStatusTv.setTextColor(Color.WHITE);
             }
         }
-
-        //添加网络状态
-
-        //
     }
 
     private Context mContext;