From b1d1e3f65ca5ae099b59cd0a72eac0dc5dff6982 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 7 Mar 2025 10:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E5=B1=95=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmdid未设置时，显示序列号 --- .../src/main/java/com/xypower/mpmaster/MainActivity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java index 64b9ac19..1479ccf2 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MainActivity.java @@ -19,6 +19,7 @@ import android.view.Menu; import android.view.MenuItem; import android.widget.TextView; +import com.dev.devapi.api.SysApi; import com.xypower.common.MicroPhotoContext; import java.text.SimpleDateFormat; @@ -182,7 +183,12 @@ public class MainActivity extends AppCompatActivity { Context context = getApplicationContext(); MicroPhotoContext.AppConfig appConfig = MicroPhotoContext.getMpAppConfig(context); StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("CMDID：" + (TextUtils.isEmpty(appConfig.cmdid) ? "" : appConfig.cmdid)); + if (TextUtils.isEmpty(appConfig.cmdid)) { + stringBuilder.append("CMDID：" + SysApi.getSerialNo(getApplicationContext()) + " (SN)"); + } else { + stringBuilder.append("CMDID："appConfig.cmdid); + } + MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(context); stringBuilder.append("\r\n");