From ad5df1bd1fb546db18a06c31362347b6e22e183e Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 10 Sep 2024 11:13:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xypower/mpmaster/MainActivity.java | 93 ++++++++++--------- mpmaster/src/main/res/menu/menu_main.xml | 6 ++ mpmaster/src/main/res/values/strings.xml | 1 + 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java index 401679b4..2433fdf9 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java @@ -95,50 +95,7 @@ public class MainActivity extends AppCompatActivity { protected void onResume() { super.onResume(); - Context context = getApplicationContext(); - MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context); - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("CMDID：" + (TextUtils.isEmpty(appConfig.cmdid) ? "" : appConfig.cmdid)); - - MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(context); - stringBuilder.append("\r\n"); - stringBuilder.append("运维主站：" + (TextUtils.isEmpty(masterConfig.server) ? MicroPhotoContext.DEFAULT_MASTER_SERVER : masterConfig.server)); - stringBuilder.append(":"); - stringBuilder.append(Integer.toString((masterConfig.port != 0) ? masterConfig.port : MicroPhotoContext.DEFAULT_MASTER_PORT)); - stringBuilder.append("\r\n"); - - stringBuilder.append("心跳模式："); - if (masterConfig.usingAbsHbTime != 0) { - stringBuilder.append("固定时间心跳 "); - if (masterConfig.absHeartbeats != null && masterConfig.absHeartbeats.length > 0) { - for (int item : masterConfig.absHeartbeats) { - stringBuilder.append(MicroPhotoContext.formatHeartbeatTime(item)); - stringBuilder.append(" "); - } - } else { - stringBuilder.append(MicroPhotoContext.formatHeartbeatTime(MicroPhotoContext.DEFAULT_HEARTBEAT_TIME_FOR_SEPARATE_NW)); - } - } - else { - stringBuilder.append("周期性心跳 / " + masterConfig.heartbeat + "分钟"); - } - stringBuilder.append("\r\n"); - - stringBuilder.append("运维网络："); - stringBuilder.append(masterConfig.separateNetwork != 0 ? "独立网络" : "公用网络"); - stringBuilder.append("\r\n"); - stringBuilder.append("\r\n"); - - stringBuilder.append("启动时间："); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date dt = new Date(mLaunchTime); - stringBuilder.append(sdf.format(dt)); - stringBuilder.append("\r\n"); - - - - - ((TextView) findViewById((R.id.cmdid))).setText(stringBuilder.toString()); + loadConfigInfo(); } @Override @@ -176,6 +133,10 @@ public class MainActivity extends AppCompatActivity { MpMasterService.restartApp(getApplicationContext()); } break; + case R.id.action_refresh:{ + loadConfigInfo(); + } + break; default: break; } @@ -183,4 +144,48 @@ public class MainActivity extends AppCompatActivity { } + private void loadConfigInfo() { + Context context = getApplicationContext(); + MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("CMDID：" + (TextUtils.isEmpty(appConfig.cmdid) ? "" : appConfig.cmdid)); + + MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(context); + stringBuilder.append("\r\n"); + stringBuilder.append("运维主站：" + (TextUtils.isEmpty(masterConfig.server) ? MicroPhotoContext.DEFAULT_MASTER_SERVER : masterConfig.server)); + stringBuilder.append(":"); + stringBuilder.append(Integer.toString((masterConfig.port != 0) ? masterConfig.port : MicroPhotoContext.DEFAULT_MASTER_PORT)); + stringBuilder.append("\r\n"); + + stringBuilder.append("心跳模式："); + if (masterConfig.usingAbsHbTime != 0) { + stringBuilder.append("固定时间心跳 "); + if (masterConfig.absHeartbeats != null && masterConfig.absHeartbeats.length > 0) { + for (int item : masterConfig.absHeartbeats) { + stringBuilder.append(MicroPhotoContext.formatHeartbeatTime(item)); + stringBuilder.append(" "); + } + } else { + stringBuilder.append(MicroPhotoContext.formatHeartbeatTime(MicroPhotoContext.DEFAULT_HEARTBEAT_TIME_FOR_SEPARATE_NW)); + } + } + else { + stringBuilder.append("周期性心跳 / " + masterConfig.heartbeat + "分钟"); + } + stringBuilder.append("\r\n"); + + stringBuilder.append("运维网络："); + stringBuilder.append(masterConfig.separateNetwork != 0 ? "独立网络" : "公用网络"); + stringBuilder.append("\r\n"); + stringBuilder.append("\r\n"); + + stringBuilder.append("启动时间："); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date dt = new Date(mLaunchTime); + stringBuilder.append(sdf.format(dt)); + stringBuilder.append("\r\n"); + + ((TextView) findViewById((R.id.cmdid))).setText(stringBuilder.toString()); + } + } \ No newline at end of file diff --git a/mpmaster/src/main/res/menu/menu_main.xml b/mpmaster/src/main/res/menu/menu_main.xml index 74ebacaf..51e63229 100644 --- a/mpmaster/src/main/res/menu/menu_main.xml +++ b/mpmaster/src/main/res/menu/menu_main.xml @@ -21,4 +21,10 @@ android:orderInCategory="100" android:title="@string/btn_reboot_mpmst" app:showAsAction="never" /> + + \ No newline at end of file diff --git a/mpmaster/src/main/res/values/strings.xml b/mpmaster/src/main/res/values/strings.xml index 5ff2b243..eb0ff924 100644 --- a/mpmaster/src/main/res/values/strings.xml +++ b/mpmaster/src/main/res/values/strings.xml @@ -4,4 +4,5 @@ 操作区 重启MpAPP 重启运维APP + 刷新 \ No newline at end of file