From: snickersun Date: Sat, 29 Aug 2020 11:55:19 +0000 (+0800) Subject: MQTT 分支 同步 Multi分支中对界面的修改。同步 V508，V509的修改 X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=3f1336167ee1609c1a45dd3db216d7ddf7e7404e;p=protocol_srv.git MQTT 分支 同步 Multi分支中对界面的修改。同步 V508，V509的修改 --- 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 a704cd8f..7edaf306 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -712,7 +712,9 @@ public class CoreService extends Service { Util.getDBFile(); // test(); //test function - //更新IMEI + //更新MCC MNC + CellInfoUtil.setCurrentAttachCellInfo(CoreService.getInstance().runtime); + //更新IMEI DeviceInfoUtil.updateImei(runtime); ReConnectToServer(); 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/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index 6347e1ef..f2900464 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -23,7 +23,8 @@ public class Runtime { public int anti_test_cycle=30; public int SignalStrength; - + //上一次成功心跳时间，供系统重连机制使用。 + public long lastLoginSuccessTime=0; public TemperatureInfo tempInfo=new TemperatureInfo(); public boolean BindingStatus=false; public BLEInfo bleInfo=new BLEInfo(); diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index 4618156a..7d641d67 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -207,8 +207,8 @@ public class Deliver extends AbstractConnectionService { StringMessage stringMessage = queue.poll(); if (stringMessage != null) { String cmd = stringMessage.isFromCache(); - String topci = stringMessage.cmd(); - stringBuilder.append(topci); + String topic = stringMessage.cmd(); + stringBuilder.append(topic); stringBuilder.append(" "); stringBuilder.append(cmd); stringBuilder.append("\n"); @@ -218,7 +218,7 @@ public class Deliver extends AbstractConnectionService { needCheckResponseCMD=stringMessage; //如果需要Check if (NeedCheckServerResponse==true){ - ICLogger.i("checkSrvResponse "+cmd); + ICLogger.i("checkSrvResponse "+topic+" "+cmd); ServerResponsed=false; } ret=true; 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/java/com/enqualcomm/support/utils/mqttConnection.java b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java index c44a006d..50ef3784 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java +++ b/app/src/main/java/com/enqualcomm/support/utils/mqttConnection.java @@ -100,16 +100,16 @@ public class mqttConnection implements Connection { if(paramStringMessage==null) { - ICLogger.i("send StringMessage Null skip!"); + ICLogger.i("mqtt send StringMessage Null skip!"); return; } String topci=paramStringMessage.cmd(); String msgdata=paramStringMessage.isFromCache(); if (topci.startsWith("WBG100/v1")) { mqtt_client.sendMessage(topci, msgdata); - ICLogger.logToFile("API","send "+topci+" "+msgdata); + ICLogger.logToFile("API","mqtt send "+topci+" "+msgdata); }else{ - ICLogger.i("topci foramt error "+topci); + ICLogger.i("mqtt topci foramt error "+topci); } } diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 40a1ba10..df0de59c 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -31,7 +31,7 @@ public class protocolAPIHelper { } private static boolean is_protocol_not_Initialled(){ - return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null); + return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null ||protocolmqtt_handler==null); } /* @@ -75,7 +75,12 @@ public class protocolAPIHelper { public static String isCmdStr(StringMessage msg){ - if (is_protocol_not_Initialled()) return ""; + if(msg==null) + ICLogger.i("isCmdStr StringMessage is null"); + if (is_protocol_not_Initialled()) { + ICLogger.i("isCmdStr is_protocol_not_Initialled "); + return ""; + } String ret=""; switch(Config.protocol_no) { diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index 1d1d37dd..46f258b1 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -38,8 +38,8 @@ public class protocol_beehome { private static final String CMDHEADER = "IW"; private static final String CMDEND = "#"; private static final String CMDSPLIT = ","; - public static final String defaultServerIP="device.beehome360.com"; - public static final int defaultServerPort=5111; + public static final String defaultServerIP="en.beehome360.com"; + public static final int defaultServerPort=5018; public enum CMD_TYPE { /*终端发起*/ AP00,//登录包 diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt.java b/app/src/main/java/com/ic/protocols/protocol_mqtt.java index ddbc8ecc..380afad4 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt.java @@ -122,8 +122,10 @@ public class protocol_mqtt { public static String isCmdStr(StringMessage msg){ + ICLogger.i("mqtt isCmdStr cmd "+msg.cmd()); for (CMD_TYPE key : cmdMap.keySet()) { - if (cmdMap.get(key).toString().equals(msg.cmd())){ + ICLogger.i("mqtt isCmdStr cmd "+msg.cmd()+" key "+cmdMap.get(key)); + if (cmdMap.get(key).equals(msg.cmd())){ return msg.cmd(); } } @@ -203,8 +205,7 @@ public class protocol_mqtt { * 是，则消息为：[003F,123456789,22.570512,N,113.8623267,E,5947ffff0001, 5947ffff0002] */ String[] list=data.split(CMDSPLIT); - if (list.length>=8){ - + if (list.length>=7){ runtime.bleInfo.ble_area_id=list[1]; runtime.bleInfo.gps_n=list[2]; runtime.bleInfo.gps_e=list[4]; diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java index 7b019835..97c54643 100644 --- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java +++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java @@ -102,7 +102,6 @@ public class protocol_mqtt_client { mClient.setHandler(mHandler); - attemptBindService(); } @Override @@ -145,7 +144,7 @@ public class protocol_mqtt_client { } public void disconnect() { - mClient.disconnect(); + Pause(); } public void connectservice() { @@ -202,7 +201,7 @@ public class protocol_mqtt_client { } public void sendMessage(String cmdtype,String data){ - mClient.publish(topic_header+cmdtype,data); + mClient.publish(cmdtype,data); } public interface MqttCallbackInterface 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 d5c8d3ca..702d1cab 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Aug 27 00:06:54 CST 2020 -VERSION_CODE=505 +#Sat Aug 29 15:32:52 CST 2020 +VERSION_CODE=509