From: snickersun <scy@incartech.cn>
Date: Thu, 19 Mar 2020 04:23:32 +0000 (+0800)
Subject: 编译 FactoryMode V7 202003191209 release
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=972f31693b637e55727735c1c74664a2fa0ffa00;p=factoryMode.git

编译 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
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
--- 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
--- 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;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.location.Criteria;
@@ -236,7 +237,6 @@ public class GPSActivity extends BaseActivity  {
 
             Logger.d("GPS StartListen with Provider " + provider);
             this.locationManager.requestLocationUpdates(provider, 0L, 0.0F, gpsListener);
-
             this.listening = true;
             longitude = 0;
             latitude = 0;
@@ -254,7 +254,7 @@ public class GPSActivity extends BaseActivity  {
         }
     }
 
-
+    private static String ACTION_GPSCMD="com.enqualcomm.support.gps";
     public void stopListen() {
         this.locationManager.removeNmeaListener(gpsListener);
         this.locationManager.removeUpdates(gpsListener);
@@ -262,9 +262,14 @@ public class GPSActivity extends BaseActivity  {
         Logger.d("stopListen 定位 ");
 
         Settings.Secure.setLocationProviderEnabled(this.getContentResolver(), GPS_PROVIDER, false);
-
+        sendBroadcast();
+    }
+    public void sendBroadcast() {
+        Intent intent = new Intent();
+        intent.setAction(ACTION_GPSCMD);
+        intent.putExtra("status", "needReopen");
+        this.sendBroadcast(intent);
     }
-
     private LocationManager locationManager;
     private double longitude;
     private double latitude;
diff --git a/app/src/main/java/mobile/miki/GpsTest.java b/app/src/main/java/mobile/miki/GpsTest.java
index 6d54b33..51c5ae2 100644
--- 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
 
         //还原gps状态
         Settings.Secure.putInt(this.getContentResolver(), Settings.Secure.LOCATION_MODE, gpsMode);
+        sendBroadcast();
+    }
+    private static String ACTION_GPSCMD="com.enqualcomm.support.gps";
+    public void sendBroadcast() {
+        Intent intent = new Intent();
+        intent.setAction(ACTION_GPSCMD);
+        intent.putExtra("status", "needReopen");
+        this.sendBroadcast(intent);
     }
-
 
     @Override
     public void onClick(View arg0) {
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
--- 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
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Mar 18 18:01:27 CST 2020
-VERSION_CODE=6
+#Thu Mar 19 12:09:12 CST 2020
+VERSION_CODE=7