MQTT 分支 同步 Multi分支中对界面的修改。同步 V508，V509的修改

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 757f37d..b3da421 100644 (file)
--- 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"
+        >
         <activity android:name=".toolActivity"></activity>
         <activity android:name=".GPSActivity"></activity>
         <activity android:name=".DeviceInfoActivity"></activity>

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index a704cd8..7edaf30 100644 (file)
--- 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();\r
 //        test(); //test function\r
 \r
-        //更新IMEI\r
+ //更新MCC MNC\r
+        CellInfoUtil.setCurrentAttachCellInfo(CoreService.getInstance().runtime);\r
+ //更新IMEI\r
         DeviceInfoUtil.updateImei(runtime);\r
 \r
         ReConnectToServer();\r

diff --git a/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java b/app/src/main/java/com/enqualcomm/support/DeviceInfoActivity.java
index b73257e..4bf8c14 100644 (file)
--- 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 09c138c..dc49c21 100644 (file)
--- 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;\r
 \r
+import android.app.Activity;\r
 import android.graphics.Color;\r
 import android.graphics.Rect;\r
 import android.os.Bundle;\r
@@ -19,7 +20,7 @@ import com.enqualcomm.support.utils.WakeLockUtil;
 \r
 import java.util.ArrayList;\r
 import java.util.List;\r
-public class GPSActivity extends AppCompatActivity implements location_callback {\r
+public class GPSActivity extends Activity implements location_callback {\r
 \r
     private RecyclerView mRv;\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index 57df41b..6918ae6 100644 (file)
--- 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;\r
 import android.telephony.SmsManager;\r
 import android.telephony.SmsMessage;\r
+import android.text.TextUtils;\r
 import android.widget.Toast;\r
 \r
 import com.enqualcomm.support.bean.Contact;\r
@@ -446,7 +447,7 @@ public class ICSmsManager  extends BroadcastReceiver {
                             } catch (Exception e) {\r
                                 e.printStackTrace();\r
                             }\r
-                            if (mod < 6 && mod > 0 && cycle >= 30) {\r
+                            if ( mod > 0 && cycle >= 30) {\r
                                 switch (mod) {\r
                                     case ICLocation.NORMAL_MOD:\r
                                         cycle = 60 * 15;\r
@@ -994,6 +995,26 @@ public class ICSmsManager  extends BroadcastReceiver {
                         {\r
                             sendSMS(phonenumber, "current is IC Protocol!");\r
                         }\r
+                    }else if(TextUtils.isDigitsOnly(strtmp)) {\r
+                        int protocolno=Integer.parseInt(strtmp);\r
+                        switch (protocolno) {\r
+                            case 0:\r
+                            case 1:\r
+                            case 2:\r
+                            case 3:\r
+                            case 4:\r
+                                Util.setSystemProperties("persist.sys.protocol_no", strtmp);\r
+                                Config.getProtocolNumber();\r
+                                Config.loadServerSettings(runtime);\r
+                                sendSMS(phonenumber, "set setprotocol to Protocol"+protocolno+"! \r\nYou may also need to set server ip for this protocol !");\r
+                                CoreService.getInstance().disconnect_server();\r
+                                CoreService.getInstance().ReConnectToServer();\r
+                            break;\r
+                            default:\r
+                                sendSMS(phonenumber, "setprotocol only support  Protocol 0/1/2/3/4 by now! ");\r
+                                break;\r
+                        }\r
+\r
                     }else{\r
                         sendSMS(phonenumber, " only support protocol JiAi , IC and Beehome!");\r
                     }\r

diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java
index ff7cfad..f4b16d7 100644 (file)
--- 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 6347e1e..f290046 100644 (file)
--- 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;\r
 \r
     public int SignalStrength;\r
-\r
+    //上一次成功心跳时间，供系统重连机制使用。\r
+    public long lastLoginSuccessTime=0;\r
     public TemperatureInfo tempInfo=new TemperatureInfo();\r
   public boolean BindingStatus=false;\r
   public BLEInfo bleInfo=new BLEInfo();\r

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 4618156..7d641d6 100644 (file)
--- 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();\r
             if (stringMessage != null) {\r
               String cmd = stringMessage.isFromCache();\r
-              String topci = stringMessage.cmd();\r
-              stringBuilder.append(topci);\r
+              String topic = stringMessage.cmd();\r
+              stringBuilder.append(topic);\r
               stringBuilder.append(" ");\r
               stringBuilder.append(cmd);\r
               stringBuilder.append("\n");\r
@@ -218,7 +218,7 @@ public class Deliver extends AbstractConnectionService {
                 needCheckResponseCMD=stringMessage;\r
                 //如果需要Check\r
                 if (NeedCheckServerResponse==true){\r
-                    ICLogger.i("checkSrvResponse "+cmd);\r
+                    ICLogger.i("checkSrvResponse "+topic+" "+cmd);\r
                     ServerResponsed=false;\r
                 }\r
                 ret=true;\r

diff --git a/app/src/main/java/com/enqualcomm/support/toolActivity.java b/app/src/main/java/com/enqualcomm/support/toolActivity.java
index 637c58a..0d624e9 100644 (file)
--- 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;\r
 \r
+import android.app.Activity;\r
 import android.content.ComponentName;\r
 import android.content.Intent;\r
 import android.support.v7.app.AppCompatActivity;\r
@@ -13,7 +14,7 @@ import com.enqualcomm.support.utils.Util;
 \r
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;\r
 \r
-public class toolActivity extends AppCompatActivity {\r
+public class toolActivity extends Activity {\r
 \r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r

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 bbc704d..2fcbcbc 100644 (file)
--- 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"))\r
             .append(" [").append(runtime.getSignalStrength()).append(",").append(runtime.getSignalInfo()).append("] ")\r
             .append(runtime.IMEI())\r
-            .append("\n Srv [").append(runtime.getHost()).append(":").append(runtime.getPort()).append("]").append(KeepAlive.isConnected).append(" , HBcycle ").append(runtime.getHeartBeatCycle())\r
+            .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())\r
             .append("\n ServerConnected is ").append(runtime.isServerProtocolConnected())\r
             .append(",Temp ").append(String.format("%1$.2f",wrist_temp)).append(",Body ").append(String.format("%1$.2f",TemperatureUtil.getBodyTemp(wrist_temp,26.0f)))\r
             .append(" \n Bat ").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())\r
@@ -266,7 +266,7 @@ public class DeviceInfoUtil {
             .append(SimSignalUtil.hasSimCard(runtime.getContextProxy().context)?" ":" NoSIM ")\r
             .append(sim.getNetworkType()==SimSignalUtil.IS_2G?"2G":(sim.getNetworkType()==SimSignalUtil.IS_3G)?"3G":(sim.getNetworkType()==SimSignalUtil.IS_4G?"4G":"unknown"))\r
             .append("[").append(runtime.getSignalInfo()).append("]")\r
-            .append("\nHeartbeat[").append(runtime.getSrvIP()).append(":").append(runtime.getPort()).append(",").append(runtime.isServerProtocolConnected()).append(",").append(runtime.getHeartBeatCycle())\r
+            .append("\nHeartbeat[P").append(Config.protocol_no).append(" ").append(runtime.getSrvIP()).append(":").append(runtime.getPort()).append(",").append(runtime.isServerProtocolConnected()).append(",").append(runtime.getHeartBeatCycle())\r
             .append("]\nBat").append(runtime.getBattery()).append(",").append(runtime.getBatteryVotage())\r
             .append(" charged ").append(runtime.isPowerConnected())\r
             .append(",Step").append(runtime.getTotalStepCount())\r

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 c44a006..50ef378 100644 (file)
--- 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 {
 \r
         if(paramStringMessage==null)\r
         {\r
-            ICLogger.i("send StringMessage Null skip!");\r
+            ICLogger.i("mqtt send StringMessage Null skip!");\r
             return;\r
         }\r
         String topci=paramStringMessage.cmd();\r
         String msgdata=paramStringMessage.isFromCache();\r
         if (topci.startsWith("WBG100/v1")) {\r
             mqtt_client.sendMessage(topci, msgdata);\r
-            ICLogger.logToFile("API","send "+topci+" "+msgdata);\r
+            ICLogger.logToFile("API","mqtt send "+topci+" "+msgdata);\r
         }else{\r
-            ICLogger.i("topci foramt error "+topci);\r
+            ICLogger.i("mqtt topci foramt error "+topci);\r
         }\r
     }\r
 \r

diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 40a1ba1..df0de59 100644 (file)
--- 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 {
     }\r
 \r
     private static boolean is_protocol_not_Initialled(){\r
-        return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null);\r
+        return (protocolbeehome_handler==null || protocoljiai_handler == null || protocolic_handler==null|| protocolfzd_handler==null ||protocolmqtt_handler==null);\r
 \r
     }\r
     /*\r
@@ -75,7 +75,12 @@ public class protocolAPIHelper {
 \r
 \r
     public static String isCmdStr(StringMessage msg){\r
-        if (is_protocol_not_Initialled()) return "";\r
+        if(msg==null)\r
+            ICLogger.i("isCmdStr StringMessage is null");\r
+        if (is_protocol_not_Initialled()) {\r
+            ICLogger.i("isCmdStr is_protocol_not_Initialled ");\r
+            return "";\r
+        }\r
         String ret="";\r
         switch(Config.protocol_no)\r
         {\r

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 1d1d37d..46f258b 100644 (file)
--- 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";\r
     private static final String CMDEND = "#";\r
     private static final String CMDSPLIT = ",";\r
-    public static final String defaultServerIP="device.beehome360.com";\r
-    public static final int defaultServerPort=5111;\r
+    public static final String defaultServerIP="en.beehome360.com";\r
+    public static final int defaultServerPort=5018;\r
     public enum CMD_TYPE {\r
         /*终端发起*/\r
         AP00,//登录包\r

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 ddbc8ec..380afad 100644 (file)
--- 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 {
 \r
 \r
     public static String isCmdStr(StringMessage msg){\r
+        ICLogger.i("mqtt isCmdStr cmd "+msg.cmd());\r
         for (CMD_TYPE key : cmdMap.keySet()) {\r
-            if (cmdMap.get(key).toString().equals(msg.cmd())){\r
+            ICLogger.i("mqtt isCmdStr cmd "+msg.cmd()+" key "+cmdMap.get(key));\r
+            if (cmdMap.get(key).equals(msg.cmd())){\r
                 return msg.cmd();\r
             }\r
         }\r
@@ -203,8 +205,7 @@ public class protocol_mqtt {
  * 是，则消息为：[003F,123456789,22.570512,N,113.8623267,E,5947ffff0001, 5947ffff0002]\r
  */\r
         String[] list=data.split(CMDSPLIT);\r
-        if (list.length>=8){\r
-\r
+        if (list.length>=7){\r
             runtime.bleInfo.ble_area_id=list[1];\r
             runtime.bleInfo.gps_n=list[2];\r
             runtime.bleInfo.gps_e=list[4];\r

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 7b01983..97c5464 100644 (file)
--- 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 {
 \r
             mClient.setHandler(mHandler);\r
 \r
-            attemptBindService();\r
         }\r
 \r
         @Override\r
@@ -145,7 +144,7 @@ public class protocol_mqtt_client {
     }\r
 \r
     public void disconnect() {\r
-        mClient.disconnect();\r
+        Pause();\r
     }\r
 \r
     public void connectservice() {\r
@@ -202,7 +201,7 @@ public class protocol_mqtt_client {
     }\r
 \r
     public void sendMessage(String cmdtype,String data){\r
-       mClient.publish(topic_header+cmdtype,data);\r
+       mClient.publish(cmdtype,data);\r
     }\r
 \r
     public interface MqttCallbackInterface\r

diff --git a/app/src/main/res/layout/activity_showinfo.xml b/app/src/main/res/layout/activity_showinfo.xml
index 4b7b91e..ae87456 100644 (file)
--- 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" />
     </RelativeLayout>
 
+    <RelativeLayout
+        android:id="@+id/ic_mnc_mcc_hoop_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/ic_lc_hoop_name">
+
+        <TextView
+            android:id="@+id/ic_mnc_nametxt"
+            style="@style/IcTextStyle"
+            android:text="MCC_MNC:"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tv_mncmcc"
+            style="@style/IcTextStyle"
+            android:layout_below="@id/ic_mnc_nametxt"
+            android:layout_marginStart="10dp"
+            android:textSize="20sp" />
+    </RelativeLayout>
+
 
 </RelativeLayout>
\ 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 c70307c..30e6776 100644 (file)
--- a/app/src/main/res/layout/dialog_misscall_layout.xml
+++ b/app/src/main/res/layout/dialog_misscall_layout.xml
@@ -2,9 +2,32 @@
 <FrameLayout android:orientation="vertical" android:padding="20.0dip" android:clickable="true" android:layout_width="fill_parent" android:layout_height="fill_parent"\r
   xmlns:android="http://schemas.android.com/apk/res/android">\r
     <LinearLayout android:layout_gravity="center" android:orientation="vertical" android:background="@drawable/dialog_bottom_bg" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-        <TextView android:gravity="center" android:id="@+id/title" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="40.0dip" android:text="@string/title_alert" style="@style/text_18_ffffff" />\r
+\r
+        <TextView\r
+            android:id="@+id/title"\r
+            style="@style/text_18_ffffff"\r
+            android:layout_width="fill_parent"\r
+            android:layout_height="40.0dip"\r
+            android:gravity="center"\r
+            android:text="@string/title_alert"\r
+            android:textSize="24sp"\r
+            android:visibility="visible" />\r
         <LinearLayout android:gravity="center" android:id="@+id/noticeContent" android:layout_width="fill_parent" android:layout_height="wrap_content">\r
-            <TextView android:gravity="center" android:id="@+id/message" android:background="#88ffffff" android:paddingLeft="20.0dip" android:paddingTop="15.0dip" android:paddingRight="20.0dip" android:paddingBottom="15.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="80.0dip" android:lineSpacingMultiplier="1.5" style="@style/text_16_666666" />\r
+\r
+            <TextView\r
+                android:id="@+id/message"\r
+                style="@style/text_16_666666"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:background="#88ffffff"\r
+                android:gravity="center"\r
+                android:lineSpacingMultiplier="1.5"\r
+                android:minHeight="80.0dip"\r
+                android:paddingLeft="20.0dip"\r
+                android:paddingTop="15.0dip"\r
+                android:paddingRight="20.0dip"\r
+                android:paddingBottom="15.0dip"\r
+                android:textSize="18sp" />\r
         </LinearLayout>\r
         <View android:background="#ffd0d0d0" android:layout_width="fill_parent" android:layout_height="1.0px" />\r
         <LinearLayout android:gravity="center" android:layout_gravity="bottom" android:orientation="horizontal" android:background="@drawable/bg_bombbox" android:layout_width="fill_parent" android:layout_height="60.0dip">\r

diff --git a/app/version_code.properties b/app/version_code.properties
index d5c8d3c..702d1ca 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Aug 27 00:06:54 CST 2020\r
-VERSION_CODE=505\r
+#Sat Aug 29 15:32:52 CST 2020\r
+VERSION_CODE=509\r