From: SnickerSun Date: Sat, 26 Jun 2021 07:54:27 +0000 (+0800) Subject: release V859 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=eb494332ae001bbaa421b70cf16972d314b5d7c8;p=protocol_srv.git release V859 修复 上传APVR 版本号 --- diff --git a/app/release/ICSer_V857_2106261303_release.apk b/app/release/ICSer_V859_2106261553_release.apk similarity index 78% rename from app/release/ICSer_V857_2106261303_release.apk rename to app/release/ICSer_V859_2106261553_release.apk index 97908932..b43cb69a 100644 Binary files a/app/release/ICSer_V857_2106261303_release.apk and b/app/release/ICSer_V859_2106261553_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 175929c8..d943abc9 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":857,"versionName":"2106261303","enabled":true,"outputFile":"ICSer_V857_2106261303_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V857_2106261303_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":859,"versionName":"2106261553","enabled":true,"outputFile":"ICSer_V859_2106261553_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V859_2106261553_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index b06d3c89..b2ea009d 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -216,19 +216,21 @@ public class CoreService extends Service { stringBuilder2.append("broadcastReceiver action=="); stringBuilder2.append(param1Intent.getAction()); ICLogger.i(stringBuilder2.toString()); + boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true"); if (ACTION_SEND_EMEGENCY_LOCATION_START.equals(param1Intent.getAction())) { runtime.getLocationInstance().setWorkingMod(EMERGNECY_MOD); //runtime.setPpgTestCycle(1); setLocationAlarm(runtime.getLocationInstance().getWorkingMod()); - //触发一次心率检测 - ICLogger.d("ACTION_SEND_EMEGENCY_LOCATION_START == > setHeartRateDetectAlarm "); - setHeartRateDetectAlarm(1); + if (needHRSTestOnSOS) { + //触发一次心率检测 + ICLogger.d("ACTION_SEND_EMEGENCY_LOCATION_START == > setHeartRateDetectAlarm "); + setHeartRateDetectAlarm(1); + } setEmegencyLocationSTOPAlarm(5); } else if (ACTION_LOCAL_SOS_ACTION.endsWith(param1Intent.getAction())) { VibrateUtil.getInstance(runtime.getContextProxy().context).vibrateOn(true); // if( param1Intent.getIntExtra("type", 1) == 1) { - boolean needHRSTestOnSOS = Util.getSystemProperties("persist.sys.needHRSOnSOS", "false").equals("true"); if (needHRSTestOnSOS) { //触发一次心率检测 ICLogger.d("needHRSTestOnSOS =}}= > setHeartRateDetectAlarm "); diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java index 73cae47e..332328de 100644 --- a/app/src/main/java/com/enqualcomm/support/MainActivity.java +++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java @@ -15,6 +15,7 @@ import android.widget.Button; import android.widget.TextView; import com.enqualcomm.support.adapter.BTHelper; +import com.enqualcomm.support.utils.AESCipher; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.IBeaconUtil; import com.enqualcomm.support.utils.ICLogger; @@ -39,8 +40,6 @@ public class MainActivity extends Activity { Handler handler=new Handler(new Handler.Callback() { @Override public boolean handleMessage(Message message) { - - StringBuilder sb=new StringBuilder(); try { @@ -117,6 +116,8 @@ public class MainActivity extends Activity { TextView tv_version=(TextView)findViewById(R.id.textViewVersion); tv_version.setText(DeviceInfoUtil.getVersionCode(this)+"-"+DeviceInfoUtil.getVersionName(this)); // testpic(); + AESCipher.test2(); + } @@ -125,7 +126,6 @@ public class MainActivity extends Activity { @Override public void OnScanFinished(ArrayList btBeaconScanResult, ArrayList btNewScanResult) { - // ICLogger.i("BT Pared "+btPairedScanResult.size()); // for ( String i :btPairedScanResult){ // ICLogger.i(i); diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java index 9377eb06..d6fa200d 100644 --- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java +++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java @@ -361,8 +361,11 @@ public class KeepAlive extends AbstractConnectionService { CoreService.getInstance().setLocationAlarm(paramRuntime.getLocationInstance().getWorkingMod()); } } else if (paramStringMessage.cmd().equals("login")) { + //广播服务器连接成功的消息 paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(true); + //login成功后，上传当前版本号 + paramConnection.send(protocolAPIHelper.getDeviceVersion(paramRuntime)); //登录包收到就停止重链接服务器 CoreService.getInstance().stopConnectionRetryTimer(); is_login_send_success = true; diff --git a/app/version_code.properties b/app/version_code.properties index 2b774cce..d9042adc 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,5 +1,5 @@ -#Sat Jun 26 13:03:54 CST 2021 +#Sat Jun 26 15:53:09 CST 2021 >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db -VERSION_CODE=857 +VERSION_CODE=859 =\=\=\=\=\=\= <<<<<<<=HEAD diff --git a/local.properties b/local.properties index 70301e17..0cdc2a6c 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sat Jun 19 18:18:09 CST 2021 -sdk.dir=E\:\\Android\\Sdk +#Sat Jun 26 13:03:49 CST 2021 +sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk