编译 FactoryMode V7 202003191209 release

配合 L02Protocol ICSer_V380_2003191208_release.apk
修复工厂模式下，只要进行过GPS测试，就很可能造成 ICProtocol无法继续GPS定位的问题。

diff --git a/app/release/FactoryMode_V7_202003191209_release.apk b/app/release/FactoryMode_V7_202003191209_release.apk
new file mode 100644 (file)
index 0000000..73f2574
Binary files /dev/null and b/app/release/FactoryMode_V7_202003191209_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index e9fed5a..275acc9 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"202003181801","enabled":true,"outputFile":"FactoryMode_V6_202003181801_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V6_202003181801_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"202003191209","enabled":true,"outputFile":"FactoryMode_V7_202003191209_release.apk","fullName":"release","baseName":"release"},"path":"FactoryMode_V7_202003191209_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/mobile/miki/GPSActivity.java b/app/src/main/java/mobile/miki/GPSActivity.java
index 4e1622e..4e4579a 100644 (file)
--- a/app/src/main/java/mobile/miki/GPSActivity.java
+++ b/app/src/main/java/mobile/miki/GPSActivity.java
@@ -1,6 +1,7 @@
 package mobile.miki;\r
 \r
 import android.content.Context;\r
+import android.content.Intent;\r
 import android.graphics.Color;\r
 import android.graphics.Rect;\r
 import android.location.Criteria;\r
@@ -236,7 +237,6 @@ public class GPSActivity extends BaseActivity  {
 \r
             Logger.d("GPS StartListen with Provider " + provider);\r
             this.locationManager.requestLocationUpdates(provider, 0L, 0.0F, gpsListener);\r
-\r
             this.listening = true;\r
             longitude = 0;\r
             latitude = 0;\r
@@ -254,7 +254,7 @@ public class GPSActivity extends BaseActivity  {
         }\r
     }\r
 \r
-\r
+    private static String ACTION_GPSCMD="com.enqualcomm.support.gps";\r
     public void stopListen() {\r
         this.locationManager.removeNmeaListener(gpsListener);\r
         this.locationManager.removeUpdates(gpsListener);\r
@@ -262,9 +262,14 @@ public class GPSActivity extends BaseActivity  {
         Logger.d("stopListen 定位 ");\r
 \r
         Settings.Secure.setLocationProviderEnabled(this.getContentResolver(), GPS_PROVIDER, false);\r
-\r
+        sendBroadcast();\r
+    }\r
+    public void sendBroadcast() {\r
+        Intent intent = new Intent();\r
+        intent.setAction(ACTION_GPSCMD);\r
+        intent.putExtra("status", "needReopen");\r
+        this.sendBroadcast(intent);\r
     }\r
-\r
     private LocationManager locationManager;\r
     private double longitude;\r
     private double latitude;\r

diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java
index 6d54b33..51c5ae2 100644 (file)
--- a/app/src/main/java/mobile/miki/GpsTest.java
+++ b/app/src/main/java/mobile/miki/GpsTest.java
@@ -280,8 +280,15 @@ public class GpsTest extends BaseActivity implements
 \r
         //还原gps状态\r
         Settings.Secure.putInt(this.getContentResolver(), Settings.Secure.LOCATION_MODE, gpsMode);\r
+        sendBroadcast();\r
+    }\r
+    private static String ACTION_GPSCMD="com.enqualcomm.support.gps";\r
+    public void sendBroadcast() {\r
+        Intent intent = new Intent();\r
+        intent.setAction(ACTION_GPSCMD);\r
+        intent.putExtra("status", "needReopen");\r
+        this.sendBroadcast(intent);\r
     }\r
-\r
 \r
     @Override\r
     public void onClick(View arg0) {\r

diff --git a/app/src/main/java/mobile/miki/mainui/TestMainList.java b/app/src/main/java/mobile/miki/mainui/TestMainList.java
index d26dcbc..036d7d9 100644 (file)
--- a/app/src/main/java/mobile/miki/mainui/TestMainList.java
+++ b/app/src/main/java/mobile/miki/mainui/TestMainList.java
@@ -2,8 +2,11 @@ package mobile.miki.mainui;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -77,6 +80,8 @@ public class TestMainList extends BaseActivity implements OnClickListener {
                        pcbatest.setVisibility(View.GONE);
                }
 
+               String title=Factory_test_title.getText().toString();
+               Factory_test_title.setText(title+" "+getVersionCode());
                pcbatest.setOnClickListener(this);
                moblietest.setOnClickListener(this);
                engineermodetest.setOnClickListener(this);
@@ -92,7 +97,20 @@ public class TestMainList extends BaseActivity implements OnClickListener {
                Settings.System.putInt(getContentResolver(), "mobile.miki.FactoryModeRunning", 1);
                Config.initConfig(this);
        }
+       public  String getVersionCode( )  {
+               // 获取packagemanager的实例
+               PackageManager packageManager = this.getPackageManager();
+               // getPackageName()是你当前类的包名
+               try {
+                       PackageInfo packInfo = packageManager.getPackageInfo(this.getPackageName(), 0);
+                       String version = "V"+packInfo.versionCode;
+                       return version;
 
+               }catch (Exception e){
+                       e.printStackTrace();
+               }
+               return "";
+       }
        @Override
        protected void onResume() {
                // TODO Auto-generated method stub

diff --git a/app/version_code.properties b/app/version_code.properties
index d52082a..9ac0e3e 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Mar 18 18:01:27 CST 2020\r
-VERSION_CODE=6\r
+#Thu Mar 19 12:09:12 CST 2020\r
+VERSION_CODE=7\r