浏览代码

<初始化界面增加MCU版本显示>

weizhengliang 5 年之前
父节点
当前提交
ed58f55b0b

+ 1 - 1
app/src/main/java/com/wdkl/callingmainnursemanager/ui/activity/InitActivity.java

@@ -478,7 +478,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.IForBro
             LogUtil.d("serialPortBedOnclickString", "newStr==" + newStr);
             switch (content[0]) {
                 case "V":
-                    Constants.MCU_VERSION_NUMBER = content[1].substring(0, 17);
+                    Constants.MCU_VERSION_NUMBER = content[1].substring(0, 14);
                     LogUtil.d("serialPortBedOnclick", "Constants.MCU_VERSION_NUMBER==" + Constants.MCU_VERSION_NUMBER);
                     break;
             }

+ 5 - 1
app/src/main/java/com/wdkl/callingmainnursemanager/util/StringUtils.java

@@ -10,6 +10,7 @@ import android.os.Bundle;
 import com.wdkl.callingmainnursemanager.BuildConfig;
 import com.wdkl.callingmainnursemanager.MyApplication;
 import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -74,7 +75,10 @@ public class StringUtils {
 
     public static String getAllVersionName() {
         String str = "\r\nApp名称: " + MyApplication.getAppContext().getString(R.string.app_name)
-                + "\r\nAPP版本号:V" + BuildConfig.VERSION_NAME + "     中央服务器系列总控主机\r\n发布日期:" + BuildConfig.BUILD_TIME;
+                + "\r\nAPP版本号: V" + BuildConfig.VERSION_NAME
+                + "\r\nMCU版本号: " + Constants.MCU_VERSION_NUMBER
+                + "\r\n中央服务器系列"
+                + "\r\n发布日期:" + BuildConfig.BUILD_TIME;
         if (android.os.Build.VERSION.SDK_INT >= 26) { //android8.0 = 26
             str = str + "    android8.1 , rk3368";// rk3368 android8.1
         } else if (android.os.Build.VERSION.SDK_INT >= 24) { //android7.0 = 24