From: snickersun <scy@incartech.cn>
Date: Thu, 31 Dec 2020 07:05:30 +0000 (+0800)
Subject: release V62
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=e521da66b6ebc20bbf2f019492548628e1581dbc;p=factoryMode.git

release V62
添加  WTSRUI 项目支持
---

diff --git a/app/release/FactoryMode_V61_202012251632_release.apk b/app/release/FactoryMode_V62_202012311503_release.apk
similarity index 94%
rename from app/release/FactoryMode_V61_202012251632_release.apk
rename to app/release/FactoryMode_V62_202012311503_release.apk
index 800c7af..6947715 100644
Binary files a/app/release/FactoryMode_V61_202012251632_release.apk and b/app/release/FactoryMode_V62_202012311503_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 76fbb8d..b1a5f1e 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":61,"versionName":"202012251632","enabled":true,"outputFile":"FactoryMode_V61_202012251632_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V61_202012251632_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":62,"versionName":"202012311503","enabled":true,"outputFile":"FactoryMode_V62_202012311503_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V62_202012311503_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/mobile/miki/util/FTUtils.java b/app/src/main/java/mobile/miki/util/FTUtils.java
index 61e60a2..3293b30 100644
--- a/app/src/main/java/mobile/miki/util/FTUtils.java
+++ b/app/src/main/java/mobile/miki/util/FTUtils.java
@@ -8,7 +8,10 @@ import android.os.SystemProperties;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -23,6 +26,30 @@ public class FTUtils {
         return Build.MODEL.toUpperCase();
     }
 
+    private static final String mConfigFilePath="/system/etc/factorymode.cfg";
+    public static String isUsingConfigFile(){
+        String retempty="";
+        File cfgf=new File(mConfigFilePath);
+        if( cfgf.exists()){
+            try {
+                FileInputStream cfgIS=new FileInputStream(cfgf);
+                StringBuilder sb=new StringBuilder();
+                byte[] buffer=new byte[1024];
+                int readcount=0;
+                while((readcount=cfgIS.read(buffer,0,buffer.length))>0){
+                    sb.append(new String(buffer,0,readcount));
+                }
+                if(sb.length()>0){
+                    return sb.toString();
+                }
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return retempty;
+    }
     /**
      * 展讯猎豹项目
      * @return
@@ -233,7 +260,9 @@ public class FTUtils {
 
     public static  boolean isQ3FT(){
 
-        if ( SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("VitracK")) {
+        if ( SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("VitracK") ||
+                SystemProperties.get("persist.sys.customname","").equalsIgnoreCase("wtsrui")
+        ) {
             return true;
         }
         return false;
diff --git a/app/version_code.properties b/app/version_code.properties
index 98f8014..b95f36a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Dec 25 16:32:39 CST 2020
-VERSION_CODE=61
+#Thu Dec 31 15:03:35 CST 2020
+VERSION_CODE=62