From: snickersun Date: Sat, 29 Aug 2020 07:38:42 +0000 (+0800) Subject: release V509 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9f7b56e361efe75dfb238df03b293be323a242f2;p=protocol_srv.git release V509 根据L004客户修改DeviceInfo界面。把界面都改为了全屏界面。增加 MCC MNC数据，顺便把当前服务器及协议号等信息也有添加上。 SMS增加 设置协议号的命令。 --- diff --git a/app/release/ICSer_V508_2008282016_release.apk b/app/release/ICSer_V509_2008291532_release.apk similarity index 77% rename from app/release/ICSer_V508_2008282016_release.apk rename to app/release/ICSer_V509_2008291532_release.apk index f1c71f90..a5ce4477 100644 Binary files a/app/release/ICSer_V508_2008282016_release.apk and b/app/release/ICSer_V509_2008291532_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index a55727f9..be2bcce2 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":508,"versionName":"2008282016","enabled":true,"outputFile":"ICSer_V508_2008282016_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V508_2008282016_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":509,"versionName":"2008291532","enabled":true,"outputFile":"ICSer_V509_2008291532_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V509_2008291532_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 757f37d9..b3da421c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -98,7 +98,8 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@android:style/Theme.NoTitleBar.Fullscreen" + > diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 752b538c..2ec23c90 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -20,6 +20,7 @@ import com.enqualcomm.support.bean.ICLocation; import com.enqualcomm.support.bean.SleepInfo; import com.enqualcomm.support.bean.SleepRecord; import com.enqualcomm.support.service.AntiMonitorService; +import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.LedUtil; import com.enqualcomm.support.utils.StorageUtils; @@ -607,7 +608,7 @@ public class CoreService extends Service { //启动inner Service startService(new Intent(this, InnerService.class)); - ReConnectToServer(); + this.locationClient.init(); @@ -699,10 +700,18 @@ public class CoreService extends Service { //设置来电模式 SimSignalUtil.SetRingMode(this, AudioManager.RINGER_MODE_NORMAL,true); + + //备份DB数据到sd cache目录，为调试方便 Util.getDBFile(); // test(); //test function + //更新MCC MNC + CellInfoUtil.setCurrentAttachCellInfo(CoreService.getInstance().runtime); + //更新IMEI + DeviceInfoUtil.updateImei(runtime); + + ReConnectToServer(); } private void test(){ diff --git a/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java b/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java index b73257ed..4bf8c14b 100644 --- a/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java +++ b/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java @@ -1,5 +1,6 @@ package com.enqualcomm.support; +import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.os.Build; @@ -9,6 +10,7 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; +import com.enqualcomm.support.utils.CellInfoUtil; import com.enqualcomm.support.utils.DeviceInfoUtil; import com.enqualcomm.support.utils.SimSignalUtil; import com.enqualcomm.support.utils.Util; @@ -17,7 +19,7 @@ import chestnut.utils.PhoneUtils; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -public class DeviceInfoActivity extends AppCompatActivity { +public class DeviceInfoActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { @@ -27,11 +29,14 @@ public class DeviceInfoActivity extends AppCompatActivity { TextView tv_Version=(TextView)findViewById(R.id.tv_versionname); TextView tv_imei=(TextView)findViewById(R.id.tv_imei); TextView tv_serveraddr=(TextView)findViewById(R.id.tv_serveraddr); + TextView tv_mncmcc=(TextView)findViewById(R.id.tv_mncmcc); tv_imei.setText(PhoneUtils.getIMEI(this)); - tv_Version.setText(Build.DISPLAY); - tv_serveraddr.setText(Config.getProtocolServerHost(this)+":"+Config.getProtocolServerPort(this)); - + tv_Version.setText("Protocol:"+DeviceInfoUtil.getVersionCode(this)+"\r\nFirmware:"+Build.DISPLAY); + tv_serveraddr.setText("P"+Config.protocol_no+" "+Config.getProtocolServerHost(this)+":"+Config.getProtocolServerPort(this)); + if (CoreService.getInstance()!=null) { + tv_mncmcc.setText(CoreService.getInstance().runtime.getMccAndMnc()); + } } diff --git a/app/src/main/java/com/enqualcomm/support/GPSActivity.java b/app/src/main/java/com/enqualcomm/support/GPSActivity.java index 09c138c6..dc49c21c 100644 --- a/app/src/main/java/com/enqualcomm/support/GPSActivity.java +++ b/app/src/main/java/com/enqualcomm/support/GPSActivity.java @@ -1,5 +1,6 @@ package com.enqualcomm.support; +import android.app.Activity; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; @@ -19,7 +20,7 @@ import com.enqualcomm.support.utils.WakeLockUtil; import java.util.ArrayList; import java.util.List; -public class GPSActivity extends AppCompatActivity implements location_callback { +public class GPSActivity extends Activity implements location_callback { private RecyclerView mRv; diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java index 57df41b6..6918ae63 100644 --- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java +++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java @@ -18,6 +18,7 @@ import android.os.Message; import android.os.SystemClock; import android.telephony.SmsManager; import android.telephony.SmsMessage; +import android.text.TextUtils; import android.widget.Toast; import com.enqualcomm.support.bean.Contact; @@ -446,7 +447,7 @@ public class ICSmsManager extends BroadcastReceiver { } catch (Exception e) { e.printStackTrace(); } - if (mod < 6 && mod > 0 && cycle >= 30) { + if ( mod > 0 && cycle >= 30) { switch (mod) { case ICLocation.NORMAL_MOD: cycle = 60 * 15; @@ -994,6 +995,26 @@ public class ICSmsManager extends BroadcastReceiver { { sendSMS(phonenumber, "current is IC Protocol!"); } + }else if(TextUtils.isDigitsOnly(strtmp)) { + int protocolno=Integer.parseInt(strtmp); + switch (protocolno) { + case 0: + case 1: + case 2: + case 3: + case 4: + Util.setSystemProperties("persist.sys.protocol_no", strtmp); + Config.getProtocolNumber(); + Config.loadServerSettings(runtime); + sendSMS(phonenumber, "set setprotocol to Protocol"+protocolno+"! \r\nYou may also need to set server ip for this protocol !"); + CoreService.getInstance().disconnect_server(); + CoreService.getInstance().ReConnectToServer(); + break; + default: + sendSMS(phonenumber, "setprotocol only support Protocol 0/1/2/3/4 by now! "); + break; + } + }else{ sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!"); } diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java index ff7cfad0..f4b16d7e 100644 --- a/app/src/main/java/com/enqualcomm/support/MainActivity.java +++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java @@ -1,5 +1,6 @@ package com.enqualcomm.support; +import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.graphics.Bitmap; @@ -35,7 +36,7 @@ import rx.functions.Action1; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends Activity { TextView tv; private boolean showmessage=false; diff --git a/app/src/main/java/com/enqualcomm/support/toolActivity.java b/app/src/main/java/com/enqualcomm/support/toolActivity.java index 637c58a4..0d624e91 100644 --- a/app/src/main/java/com/enqualcomm/support/toolActivity.java +++ b/app/src/main/java/com/enqualcomm/support/toolActivity.java @@ -1,5 +1,6 @@ package com.enqualcomm.support; +import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.support.v7.app.AppCompatActivity; @@ -13,7 +14,7 @@ import com.enqualcomm.support.utils.Util; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; -public class toolActivity extends AppCompatActivity { +public class toolActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { 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 bbc704d1..2fcbcbc2 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java @@ -234,7 +234,7 @@ public class DeviceInfoUtil { .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 [").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle()) + .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(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage()) @@ -266,7 +266,7 @@ public class DeviceInfoUtil { .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[").append(runtime.getSrvIP()).append(":").append(runtime.getPort()).append(",").append(runtime.isServerProtocolConnected()).append(",").append(runtime.getHeartBeatCycle()) + .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()) diff --git a/app/src/main/res/layout/activity_showinfo.xml b/app/src/main/res/layout/activity_showinfo.xml index 4b7b91ef..ae87456e 100644 --- a/app/src/main/res/layout/activity_showinfo.xml +++ b/app/src/main/res/layout/activity_showinfo.xml @@ -67,5 +67,25 @@ android:textSize="20sp" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_misscall_layout.xml b/app/src/main/res/layout/dialog_misscall_layout.xml index c70307cc..30e6776b 100644 --- a/app/src/main/res/layout/dialog_misscall_layout.xml +++ b/app/src/main/res/layout/dialog_misscall_layout.xml @@ -2,9 +2,32 @@ - + + - + + diff --git a/app/version_code.properties b/app/version_code.properties index 1f14a362..702d1cab 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Aug 28 20:16:02 CST 2020 -VERSION_CODE=508 +#Sat Aug 29 15:32:52 CST 2020 +VERSION_CODE=509