From: snickersun <scy@incartech.cn>
Date: Sat, 9 Jan 2021 06:56:32 +0000 (+0800)
Subject: 补充 设备信息，添加 温度周期，以及定位，体温，心率周期加单位。
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f11bb5baf19b5cd7db1f73936723d4e7efede9b7;p=protocol_srv.git

补充 设备信息，添加 温度周期，以及定位，体温，心率周期加单位。
---

diff --git a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
index d13dbc31..a7dd4e1d 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
@@ -1,345 +1,348 @@
-package com.enqualcomm.support.utils;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
-
-import com.enqualcomm.support.Config;
-import com.enqualcomm.support.CoreService;
-import com.enqualcomm.support.bean.StepCount;
-import com.enqualcomm.support.bean.Runtime;
-import com.enqualcomm.support.service.KeepAlive;
-import com.ic.jni.ICJniUtils;
-
-import java.io.FileInputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-
-import chestnut.utils.PhoneUtils;
-
-public class DeviceInfoUtil {
-  private static final int CID_LENGTH = 16;
-  
-  public static String getCurStatus(Context paramContext) {
-    String str1;
-    try {
-      str1 = Settings.System.getString(paramContext.getContentResolver(), "eqc_position");
-    } catch (Exception e) {
-      e.printStackTrace();
-      str1 = "1";
-    }
-    String str2 = str1;
-    if (str1 == null)
-      str2 = "0"; 
-    return str2;
-  }
-
-  public static String getModule(){
-
-    return Build.MODEL;
-  }
-
-  public static boolean updateImei(Runtime runtime){
-
-    String imei= Config.getIMEI(runtime.getContextProxy().context);
-    String cellphoneNumb= DeviceInfoUtil.getNumber(runtime.getContextProxy().context);
-    ICLogger.i("get CellPhoneNumber "+cellphoneNumb);
-    String cid="";
-    if (imei.isEmpty()){
-      //如果配置里有IMEI，优先选配置里的，没有则选择系统的
-      imei= PhoneUtils.getIMEI(runtime.getContextProxy().context);
-      cid=PhoneUtils.getIMSI(runtime.getContextProxy().context);
-      if(imei==null) {
-        return false;
-      }else{
-        runtime.setImeiAndCid(imei, cid);
-      }
-    }  else{
-      runtime.setImeiAndCid(imei,cid);
-    }
-
-    return true;
-  }
-
-  /**
-   * 得到当前应用版本名称的方法
-   *
-   * @param context
-   *            :上下文
-   * @throws Exception
-   */
-  public static String getVersionName(Context context)  {
-    // 获取packagemanager的实例
-    PackageManager packageManager = context.getPackageManager();
-    // getPackageName()是你当前类的包名
-    try {
-      PackageInfo packInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
-      String version = packInfo.versionName;
-      return version;
-
-    }catch (Exception e){
-      e.printStackTrace();
-    }
-    return "";
-  }
-  public static String getVersionCode(Context context,String pkgName)  {
-    // 获取packagemanager的实例
-    PackageManager packageManager = context.getPackageManager();
-    // getPackageName()是你当前类的包名
-    try {
-      PackageInfo packInfo = packageManager.getPackageInfo(pkgName, 0);
-      String version = "V"+packInfo.versionCode;
-      return version;
-
-    }catch (Exception e){
-      e.printStackTrace();
-    }
-    return "";
-  }
-
-
-
-  public static String getVersionCode(Context context)  {
-    // 获取packagemanager的实例
-    PackageManager packageManager = context.getPackageManager();
-    // getPackageName()是你当前类的包名
-    try {
-      PackageInfo packInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
-      String version = "V"+packInfo.versionCode;
-      return version;
-
-    }catch (Exception e){
-      e.printStackTrace();
-    }
-    return "";
-  }
-  public static int getCustomId() {
-    int i = -1;
-    try {
-      String   customid = Util.getSystemProperties("ro.custom.id");
-      StringBuilder stringBuilder = new StringBuilder();
-      stringBuilder.append("ro.custom.id = ");
-      stringBuilder.append(customid);
-      ICLogger.i(stringBuilder.toString());
-      int j = i;
-      if (customid != null) {
-        j = Integer.valueOf(customid).intValue();
-        try {
-          StringBuilder stringBuilder1 = new StringBuilder();
-          stringBuilder1.append("---id=");
-          stringBuilder1.append(j);
-          ICLogger.i(stringBuilder1.toString());
-          return j;
-        } catch (Exception e) {
-          i = j;
-        }
-      } else {
-        return j;
-      }
-    } catch (Exception e) {
-       e.printStackTrace();
-    }
-    return i;
-  }
-
-  public static boolean getLockSimInfo(Context paramContext) {
-    int i = 0;
-    try {
-      if (Settings.System.getInt(paramContext.getContentResolver(), "com.eqc.watch.launcher.SimIsBlocked") != 0) {
-        i = 1;
-      }
-      StringBuilder stringBuilder = new StringBuilder();
-      stringBuilder.append("simIsBlocked:");
-      stringBuilder.append(i);
-      ICLogger.i(stringBuilder.toString());
-    } catch (Settings.SettingNotFoundException e) {
-      e.printStackTrace();
-    }
-    return (i==1);
-  }
-  
-  public static String getNumber(Context paramContext) {
-    return ((TelephonyManager)paramContext.getSystemService(Context.TELEPHONY_SERVICE)).getLine1Number();
-  }
-  
-  public static String getSN() {
-    try {
-      String str=Util.getSystemProperties("ro.product.partitionpath");
-      StringBuilder stringBuilder = new StringBuilder();
-      stringBuilder.append(str);
-      stringBuilder.append("miscdata");
-      FileInputStream fileInputStream = new FileInputStream(stringBuilder.toString());
-      byte[] arrayOfByte = new byte[128];
-      fileInputStream.read(arrayOfByte);
-      fileInputStream.close();
-      return new String(arrayOfByte, 28, 16);
-    } catch (Exception exception) {
-      exception.printStackTrace();
-      return null;
-    } 
-  }
-  
-  public static int getStepCount(Context paramContext) {
-    Uri uri = Uri.parse("content://com.eqc.db.watchProvider/step/queryLast");
-    ArrayList arrayList = new ArrayList();
-    Cursor cursor = paramContext.getContentResolver().query(uri, new String[] { "number", "date" }, null, null, null);
-    if (cursor != null && cursor.getCount() > 0) {
-      while (cursor.moveToNext())
-        arrayList.add(new StepCount(cursor.getInt(0), cursor.getString(1)));
-      cursor.close();
-    } 
-    return (arrayList.size() > 0) ? ((StepCount)arrayList.get(0)).getStepCount() : 0;
-  }
-  
-  public static int getStepCount_Custom(Context context) {
-    try {
-        return Settings.Global.getInt(context.getContentResolver(), "Steps", 0);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return 0;
-  }
-  
-  public static String getSystemVersion() {
-    return Build.VERSION.RELEASE;
-  }
-
-  public static String getSWVersionDisplayName(){ return Build.DISPLAY;}
-
-  public static boolean isTopActivity(Context paramContext) {
-    ArrayList<String> arrayList = new ArrayList();
-    arrayList.add("com.enqualcomm.imessage.ui.chat.ChatActivity_");
-    return arrayList.contains(((ActivityManager.RunningTaskInfo)((ActivityManager)paramContext.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1).get(0)).topActivity.getClassName());
-  }
-  public static boolean isFactoryTestTopActivity(Context paramContext) {
-    ArrayList<String> arrayList = new ArrayList();
-    arrayList.add("mobile.miki");
-    return arrayList.contains(((ActivityManager.RunningTaskInfo)((ActivityManager)paramContext.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1).get(0)).topActivity.getPackageName());
-  }
-
-  public static String getDeviceInfo(Runtime runtime){
-
-    SimSignalUtil sim=SimSignalUtil.getInstance(runtime.getContextProxy().context);
-    double wrist_temp;
-//    wrist_temp=TemperatureUtil.get_temp_value_adjusted();
-    return new StringBuilder()
-            .append(TimeUtil.getLocalTime2()).append(" ").append(DeviceInfoUtil.getSWVersionDisplayName()).append("\n")
-            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
-            .append(SimSignalUtil.hasSimCard(runtime.getContextProxy().context)?" SIM ":" NoSIM ")
-            .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown"))
-            .append(" [").append(runtime.getSignalStrength()).append(",").append(runtime.getSignalInfo()).append("] ")
-            .append(runtime.IMEI())
-            .append("\n Srv [P").append(Config.protocol_no).append(" ").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle())
-            .append("\n ServerConnected is ").append(runtime.isServerProtocolConnected())
-//            .append(",Temp ").append(String.format("%1$.2f",wrist_temp)).append(",Body ").append(String.format("%1$.2f",TemperatureUtil.getBodyTemp(wrist_temp,26.0f)))
-            .append(",BTIn ").append(runtime.bleInfo.is_in_area)
-            .append(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())
-            .append(" charged ").append(runtime.isPowerConnected())
-            .append(" StepCount ").append(runtime.getTotalStepCount())
-            .append( "\n Working Mode ").append(runtime.getLocationInstance().getWorkingMod())
-            .append(" \n Location Cycle ").append(runtime.getLocationInstance().getLocation_cycle())
-            .append(" \n LocationType ").append(runtime.getLocationInstance().getLocationType())
-            .append(" at ").append(runtime.getLocationInstance().getLocationTime())
-            .append(" \n PPGTestCycle ").append(runtime.getPpgTestCycle())
-            .append("\n LastPPG ").append(runtime.getHRS().getPPG())
-            .append(",bph ").append(runtime.getHRS().getBPH())
-            .append(",bpl ").append(runtime.getHRS().getBPL())
-            .append(" at ").append(runtime.getHRS().getTestTime())
-            .append("\nrealimei:").append(PhoneUtils.getIMEI(runtime.getContextProxy().context))
-            .append("\n").append(runtime.getLBSMultiStationData())
-            .append("\nWiFi Status ").append(Util.isWifiIsOpen(runtime.getContextProxy().context,runtime))
-            .toString();
-  }
-  public static String getShortDeviceInfo(Runtime runtime){
-
-    SimSignalUtil sim=SimSignalUtil.getInstance(runtime.getContextProxy().context);
-//    double wrist_temp=TemperatureUtil.get_temp_value_adjusted();
-    return new StringBuilder("Firmware ")
-            .append(DeviceInfoUtil.getSWVersionDisplayName()).append("\nProtocol ")
-            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
-            .append("\nIMEI ").append(runtime.IMEI())
-            .append("\n"+TimeUtil.getLocalTime()).append("\nNetwork ")
-            .append(SimSignalUtil.hasSimCard(runtime.getContextProxy().context)?" ":" NoSIM ")
-            .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown"))
-            .append("[").append(runtime.getSignalInfo()).append("]")
-            .append("\nHeartbeat[P").append(Config.protocol_no).append(" ").append(runtime.getSrvIP()).append(":").append(runtime.getPort()).append(",").append(runtime.isServerProtocolConnected()).append(",").append(runtime.getHeartBeatCycle())
-            .append("]\nBat").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())
-            .append(" charged ").append(runtime.isPowerConnected())
-            .append(",Step").append(runtime.getTotalStepCount())
-            .append( "\nLocation[M").append(runtime.getLocationInstance().getWorkingMod())
-            .append(",C").append(runtime.getLocationInstance().getLocation_cycle())
-            .append(",T").append(runtime.getLocationInstance().getLocationType())
-            .append(",").append(runtime.getLocationInstance().getLocationTime())
-            .append(",BTIn").append(runtime.bleInfo.is_in_area)
-            .append("]\nPPG[C").append(runtime.getPpgTestCycle())
-//            .append(",P").append(runtime.getHRS().getPPG())
-//            .append(",H").append(runtime.getHRS().getBPH())
-//            .append(",L").append(runtime.getHRS().getBPL())
-//            .append(",T").append(String.format("%1$.2f",wrist_temp))
-//            .append(",TA").append(String.format("%1$.2f",TemperatureUtil.getBodyTemp(wrist_temp,26.0f)))
-//            .append(",").append(runtime.getHRS().getTestTime()).append("]")
-            .toString();
-  }
-
-  public static String getDeviceVersion(Runtime runtime){
-    return new StringBuilder("Firmware ")
-            .append(DeviceInfoUtil.getSWVersionDisplayName()).append("\nProtocol ")
-            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
-            .append("\nIMEI ").append(runtime.IMEI())
-            .append("\n"+TimeUtil.getLocalTime())
-            .toString();
-  }
-  public static void setLockSimInfo(Context paramContext) {
-    Settings.System.putInt(paramContext.getContentResolver(), "com.eqc.watch.launcher.SimIsBlocked", 1); }
-
-  private static String[][] packagelist={
-          {"com.enqualcomm.support","Protocol"},
-          {"com.ic.blood","BLood"},
-          {"com.ic.launcher","Launcher"},
-          {"com.ic.work","Work"},
-          {"com.ic.weather","Weather"},
-          {"com.ic.hardware","Hardware"},
-          {"mobile.miki","FactoryMode"},
-          {"com.ic.dial","Dialer"},
-          {"android.rockchip.update.service","Fota"}
-  };
-
-  public static String getPackageVersionName(Context context , String packagename) {
-    String versionName = "";
-    try {
-      PackageManager pm = context.getPackageManager();
-      PackageInfo pi = pm.getPackageInfo(packagename, 0);
-      versionName = "V"+pi.versionCode;
-      if (versionName == null || versionName.length() <= 0) {
-        return "";
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return versionName;
-  }
-
-  public static String getPackageVersions(Context context){
-      StringBuilder versions=new StringBuilder();
-      versions.append(getSWVersionDisplayName()).append(",");
-      for (String[] packagename: packagelist){
-        versions.append(packagename[1]);
-        versions.append("-");
-        versions.append( getPackageVersionName(context,packagename[0]));
-        versions.append(",");
-      }
-      return versions.toString();
-    }
-
-
-}
+package com.enqualcomm.support.utils;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
+
+import com.enqualcomm.support.Config;
+import com.enqualcomm.support.CoreService;
+import com.enqualcomm.support.bean.StepCount;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.service.KeepAlive;
+import com.ic.jni.ICJniUtils;
+
+import java.io.FileInputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+import chestnut.utils.PhoneUtils;
+
+public class DeviceInfoUtil {
+  private static final int CID_LENGTH = 16;
+  
+  public static String getCurStatus(Context paramContext) {
+    String str1;
+    try {
+      str1 = Settings.System.getString(paramContext.getContentResolver(), "eqc_position");
+    } catch (Exception e) {
+      e.printStackTrace();
+      str1 = "1";
+    }
+    String str2 = str1;
+    if (str1 == null)
+      str2 = "0"; 
+    return str2;
+  }
+
+  public static String getModule(){
+
+    return Build.MODEL;
+  }
+
+  public static boolean updateImei(Runtime runtime){
+
+    String imei= Config.getIMEI(runtime.getContextProxy().context);
+    String cellphoneNumb= DeviceInfoUtil.getNumber(runtime.getContextProxy().context);
+    ICLogger.i("get CellPhoneNumber "+cellphoneNumb);
+    String cid="";
+    if (imei.isEmpty()){
+      //如果配置里有IMEI，优先选配置里的，没有则选择系统的
+      imei= PhoneUtils.getIMEI(runtime.getContextProxy().context);
+      cid=PhoneUtils.getIMSI(runtime.getContextProxy().context);
+      if(imei==null) {
+        return false;
+      }else{
+        runtime.setImeiAndCid(imei, cid);
+      }
+    }  else{
+      runtime.setImeiAndCid(imei,cid);
+    }
+
+    return true;
+  }
+
+  /**
+   * 得到当前应用版本名称的方法
+   *
+   * @param context
+   *            :上下文
+   * @throws Exception
+   */
+  public static String getVersionName(Context context)  {
+    // 获取packagemanager的实例
+    PackageManager packageManager = context.getPackageManager();
+    // getPackageName()是你当前类的包名
+    try {
+      PackageInfo packInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+      String version = packInfo.versionName;
+      return version;
+
+    }catch (Exception e){
+      e.printStackTrace();
+    }
+    return "";
+  }
+  public static String getVersionCode(Context context,String pkgName)  {
+    // 获取packagemanager的实例
+    PackageManager packageManager = context.getPackageManager();
+    // getPackageName()是你当前类的包名
+    try {
+      PackageInfo packInfo = packageManager.getPackageInfo(pkgName, 0);
+      String version = "V"+packInfo.versionCode;
+      return version;
+
+    }catch (Exception e){
+      e.printStackTrace();
+    }
+    return "";
+  }
+
+
+
+  public static String getVersionCode(Context context)  {
+    // 获取packagemanager的实例
+    PackageManager packageManager = context.getPackageManager();
+    // getPackageName()是你当前类的包名
+    try {
+      PackageInfo packInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+      String version = "V"+packInfo.versionCode;
+      return version;
+
+    }catch (Exception e){
+      e.printStackTrace();
+    }
+    return "";
+  }
+  public static int getCustomId() {
+    int i = -1;
+    try {
+      String   customid = Util.getSystemProperties("ro.custom.id");
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append("ro.custom.id = ");
+      stringBuilder.append(customid);
+      ICLogger.i(stringBuilder.toString());
+      int j = i;
+      if (customid != null) {
+        j = Integer.valueOf(customid).intValue();
+        try {
+          StringBuilder stringBuilder1 = new StringBuilder();
+          stringBuilder1.append("---id=");
+          stringBuilder1.append(j);
+          ICLogger.i(stringBuilder1.toString());
+          return j;
+        } catch (Exception e) {
+          i = j;
+        }
+      } else {
+        return j;
+      }
+    } catch (Exception e) {
+       e.printStackTrace();
+    }
+    return i;
+  }
+
+  public static boolean getLockSimInfo(Context paramContext) {
+    int i = 0;
+    try {
+      if (Settings.System.getInt(paramContext.getContentResolver(), "com.eqc.watch.launcher.SimIsBlocked") != 0) {
+        i = 1;
+      }
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append("simIsBlocked:");
+      stringBuilder.append(i);
+      ICLogger.i(stringBuilder.toString());
+    } catch (Settings.SettingNotFoundException e) {
+      e.printStackTrace();
+    }
+    return (i==1);
+  }
+  
+  public static String getNumber(Context paramContext) {
+    return ((TelephonyManager)paramContext.getSystemService(Context.TELEPHONY_SERVICE)).getLine1Number();
+  }
+  
+  public static String getSN() {
+    try {
+      String str=Util.getSystemProperties("ro.product.partitionpath");
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append(str);
+      stringBuilder.append("miscdata");
+      FileInputStream fileInputStream = new FileInputStream(stringBuilder.toString());
+      byte[] arrayOfByte = new byte[128];
+      fileInputStream.read(arrayOfByte);
+      fileInputStream.close();
+      return new String(arrayOfByte, 28, 16);
+    } catch (Exception exception) {
+      exception.printStackTrace();
+      return null;
+    } 
+  }
+  
+  public static int getStepCount(Context paramContext) {
+    Uri uri = Uri.parse("content://com.eqc.db.watchProvider/step/queryLast");
+    ArrayList arrayList = new ArrayList();
+    Cursor cursor = paramContext.getContentResolver().query(uri, new String[] { "number", "date" }, null, null, null);
+    if (cursor != null && cursor.getCount() > 0) {
+      while (cursor.moveToNext())
+        arrayList.add(new StepCount(cursor.getInt(0), cursor.getString(1)));
+      cursor.close();
+    } 
+    return (arrayList.size() > 0) ? ((StepCount)arrayList.get(0)).getStepCount() : 0;
+  }
+  
+  public static int getStepCount_Custom(Context context) {
+    try {
+        return Settings.Global.getInt(context.getContentResolver(), "Steps", 0);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return 0;
+  }
+  
+  public static String getSystemVersion() {
+    return Build.VERSION.RELEASE;
+  }
+
+  public static String getSWVersionDisplayName(){ return Build.DISPLAY;}
+
+  public static boolean isTopActivity(Context paramContext) {
+    ArrayList<String> arrayList = new ArrayList();
+    arrayList.add("com.enqualcomm.imessage.ui.chat.ChatActivity_");
+    return arrayList.contains(((ActivityManager.RunningTaskInfo)((ActivityManager)paramContext.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1).get(0)).topActivity.getClassName());
+  }
+  public static boolean isFactoryTestTopActivity(Context paramContext) {
+    ArrayList<String> arrayList = new ArrayList();
+    arrayList.add("mobile.miki");
+    return arrayList.contains(((ActivityManager.RunningTaskInfo)((ActivityManager)paramContext.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1).get(0)).topActivity.getPackageName());
+  }
+
+  public static String getDeviceInfo(Runtime runtime){
+
+    SimSignalUtil sim=SimSignalUtil.getInstance(runtime.getContextProxy().context);
+    double wrist_temp;
+//    wrist_temp=TemperatureUtil.get_temp_value_adjusted();
+    return new StringBuilder()
+            .append(TimeUtil.getLocalTime2()).append(" ").append(DeviceInfoUtil.getSWVersionDisplayName()).append("\n")
+            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
+            .append(SimSignalUtil.hasSimCard(runtime.getContextProxy().context)?" SIM ":" NoSIM ")
+            .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown"))
+            .append(" [").append(runtime.getSignalStrength()).append(",").append(runtime.getSignalInfo()).append("] ")
+            .append(runtime.IMEI())
+            .append("\n Srv [P").append(Config.protocol_no).append(" ").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle())
+            .append("\n ServerConnected is ").append(runtime.isServerProtocolConnected())
+//            .append(",Temp ").append(String.format("%1$.2f",wrist_temp)).append(",Body ").append(String.format("%1$.2f",TemperatureUtil.getBodyTemp(wrist_temp,26.0f)))
+            .append(",BTIn ").append(runtime.bleInfo.is_in_area)
+            .append(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())
+            .append(" charged ").append(runtime.isPowerConnected())
+            .append(" StepCount ").append(runtime.getTotalStepCount())
+            .append( "\n Working Mode ").append(runtime.getLocationInstance().getWorkingMod())
+            .append(" \n Location Cycle ").append(runtime.getLocationInstance().getLocation_cycle()).append("s")
+            .append(" \n LocationType ").append(runtime.getLocationInstance().getLocationType())
+            .append(" at ").append(runtime.getLocationInstance().getLocationTime())
+            .append(" \n PPGTestCycle ").append(runtime.getPpgTestCycle()).append("m")
+            .append("\n LastPPG ").append(runtime.getHRS().getPPG())
+            .append(",bph ").append(runtime.getHRS().getBPH())
+            .append(",bpl ").append(runtime.getHRS().getBPL())
+            .append(" at ").append(runtime.getHRS().getTestTime())
+            .append(" \n TempTestCycle ").append(runtime.temp_test_Cycle_Seconds).append("s")
+            .append("\nrealimei:").append(PhoneUtils.getIMEI(runtime.getContextProxy().context))
+            .append("\n").append(runtime.getLBSMultiStationData())
+            .append("\nWiFi Status ").append(Util.isWifiIsOpen(runtime.getContextProxy().context,runtime))
+            .toString();
+  }
+  public static String getShortDeviceInfo(Runtime runtime){
+
+    SimSignalUtil sim=SimSignalUtil.getInstance(runtime.getContextProxy().context);
+//    double wrist_temp=TemperatureUtil.get_temp_value_adjusted();
+    return new StringBuilder("Firmware ")
+            .append(DeviceInfoUtil.getSWVersionDisplayName()).append("\nProtocol ")
+            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
+            .append("\nIMEI ").append(runtime.IMEI())
+            .append("\n"+TimeUtil.getLocalTime()).append("\nNetwork ")
+            .append(SimSignalUtil.hasSimCard(runtime.getContextProxy().context)?" ":" NoSIM ")
+            .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown"))
+            .append("[").append(runtime.getSignalInfo()).append("]")
+            .append("\nHeartbeat[P").append(Config.protocol_no).append(" ").append(runtime.getSrvIP()).append(":").append(runtime.getPort()).append(",").append(runtime.isServerProtocolConnected()).append(",").append(runtime.getHeartBeatCycle())
+            .append("]\nBat").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())
+            .append(" charged ").append(runtime.isPowerConnected())
+            .append(",Step").append(runtime.getTotalStepCount())
+            .append( "\nLocation[M").append(runtime.getLocationInstance().getWorkingMod())
+            .append(",C").append(runtime.getLocationInstance().getLocation_cycle())
+            .append("s,T").append(runtime.getLocationInstance().getLocationType())
+            .append(",").append(runtime.getLocationInstance().getLocationTime())
+            .append(",BTIn").append(runtime.bleInfo.is_in_area)
+            .append("]\nPPG[C").append(runtime.getPpgTestCycle())
+//            .append(",P").append(runtime.getHRS().getPPG())
+//            .append(",H").append(runtime.getHRS().getBPH())
+//            .append(",L").append(runtime.getHRS().getBPL())
+//            .append(",T").append(String.format("%1$.2f",wrist_temp))
+//            .append(",TA").append(String.format("%1$.2f",TemperatureUtil.getBodyTemp(wrist_temp,26.0f)))
+//            .append(",").append(runtime.getHRS().getTestTime())
+            .append("m]\nTemp[C")
+            .append(runtime.temp_test_Cycle_Seconds).append("s]")
+            .toString();
+  }
+
+  public static String getDeviceVersion(Runtime runtime){
+    return new StringBuilder("Firmware ")
+            .append(DeviceInfoUtil.getSWVersionDisplayName()).append("\nProtocol ")
+            .append(DeviceInfoUtil.getVersionCode(runtime.getContextProxy().context))
+            .append("\nIMEI ").append(runtime.IMEI())
+            .append("\n"+TimeUtil.getLocalTime())
+            .toString();
+  }
+  public static void setLockSimInfo(Context paramContext) {
+    Settings.System.putInt(paramContext.getContentResolver(), "com.eqc.watch.launcher.SimIsBlocked", 1); }
+
+  private static String[][] packagelist={
+          {"com.enqualcomm.support","Protocol"},
+          {"com.ic.blood","BLood"},
+          {"com.ic.launcher","Launcher"},
+          {"com.ic.work","Work"},
+          {"com.ic.weather","Weather"},
+          {"com.ic.hardware","Hardware"},
+          {"mobile.miki","FactoryMode"},
+          {"com.ic.dial","Dialer"},
+          {"android.rockchip.update.service","Fota"}
+  };
+
+  public static String getPackageVersionName(Context context , String packagename) {
+    String versionName = "";
+    try {
+      PackageManager pm = context.getPackageManager();
+      PackageInfo pi = pm.getPackageInfo(packagename, 0);
+      versionName = "V"+pi.versionCode;
+      if (versionName == null || versionName.length() <= 0) {
+        return "";
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return versionName;
+  }
+
+  public static String getPackageVersions(Context context){
+      StringBuilder versions=new StringBuilder();
+      versions.append(getSWVersionDisplayName()).append(",");
+      for (String[] packagename: packagelist){
+        versions.append(packagename[1]);
+        versions.append("-");
+        versions.append( getPackageVersionName(context,packagename[0]));
+        versions.append(",");
+      }
+      return versions.toString();
+    }
+
+
+}
diff --git a/app/version_code.properties b/app/version_code.properties
index 4a128228..2d802ba1 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
 #Tue Dec 29 16:56:28 CST 2020
-VERSION_CODE=742
+VERSION_CODE=747