diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
index 80311a0326..69eba7b7f5 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
@@ -15,6 +15,10 @@ 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;
 
 
 /*
@@ -73,7 +77,13 @@ public class EnvStatusManager {
                 "长链",
                 "经度",
                 "纬度",
+<<<<<<< HEAD
                 "MapVersion"
+=======
+                "网络状态",
+                "App版本",
+                "Map版本"
+>>>>>>> c475544d3ea71424fa7d0826b54156ae420293a6
         };
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 0; i < sStatusName.length; i++) {
@@ -83,10 +93,18 @@ 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
             } else {
                 stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n");
             }
@@ -102,9 +120,16 @@ public class EnvStatusManager {
                 mStatusTv.setTextColor(Color.WHITE);
             }
         }
+
+        //添加网络状态
+
+        //
     }
 
+    private Context mContext;
+
     public void showPanel(Context context) {
+        mContext = context;
         if (mPanelView == null) {
             mPanelView = new WindowManagerView.Builder(context)
                     .contentView(R.layout.module_services_status_panel)