release V407

在服务器连接和断开增加broadcast 消息。
com.ic.protocol.ACTION_IS_SERVER_CONNECTED
isConnected  true/false

diff --git a/app/release/ICSer_V402_2004131603_release.apk b/app/release/ICSer_V402_2004131603_release.apk
deleted file mode 100644 (file)
index 97e6899..0000000
Binary files a/app/release/ICSer_V402_2004131603_release.apk and /dev/null differ

diff --git a/app/release/ICSer_V407_2004231507_release.apk b/app/release/ICSer_V407_2004231507_release.apk
new file mode 100644 (file)
index 0000000..3ce629e
Binary files /dev/null and b/app/release/ICSer_V407_2004231507_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index 51d412d..4574028 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -45,7 +45,7 @@ public interface Constants {
   \r
   public static final String ACTION_IMESSAGE = "action.message";\r
   \r
-  public static final String ACTION_ISCONNECTED = "com.enqualcomm.support.ACTION_ISCONNECTED";\r
+  public static final String ACTION_ISCONNECTED = "com.ic.protocol.ACTION_IS_SERVER_CONNECTED";\r
   \r
   public static final String ACTION_ISSILENCE = "com.enqualcomm.icare.ACTION_ISSILENCE";\r
   \r

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 5e5984c..85e90e6 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -223,7 +223,7 @@ public class KeepAlive extends AbstractConnectionService {
     connectionError = true;\r
     isConnected = false;\r
     paramRuntime.setServerProtocolConnected(false);\r
-    paramRuntime.getContextProxy().sendBroadcast(false);\r
+    paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(false);\r
     StringBuilder stringBuilder = new StringBuilder();\r
     stringBuilder.append("onConnectionClose=");\r
     stringBuilder.append(",set KeepAlive isConnected = false");\r
@@ -310,7 +310,7 @@ public class KeepAlive extends AbstractConnectionService {
 //      isConnected = true;\r
       is_heartBeat_send_success=true;\r
 //广播服务器连接成功的消息\r
-      paramRuntime.getContextProxy().sendBroadcast(true);\r
+      paramRuntime.getContextProxy().sendBroadcastServerConnectionChanged(true);\r
 //      LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_ON);\r
 //      Deliver.triggerSendThread(); //链接上就尝试清除 buffer中的数据\r
       CoreService.getInstance().stopConnectionRetryTimer();\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
index a30ff01..2688909 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
@@ -31,6 +31,9 @@ import java.util.List;
 public class CellInfoUtil {\r
 \r
   public static int getSignal(TelephonyManager tm , Runtime runtime){\r
+\r
+    if(tm==null)\r
+      return 5;\r
     CellLocation celllocation = tm.getCellLocation();\r
     if (celllocation == null) {\r
       ICLogger.i("cellLocation = null");\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 92f9af9..392a4fc 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -310,7 +310,7 @@ public class ContextProxy {
 //    this.context.sendBroadcast(intent);\r
 //  }\r
 \r
-  public void sendBroadcast(boolean paramBoolean) {\r
+  public void sendBroadcastServerConnectionChanged(boolean paramBoolean) {\r
     Intent intent = new Intent();\r
     intent.setAction(ACTION_ISCONNECTED);\r
     intent.putExtra("isConnected", paramBoolean);\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 9fceacd..cf3b512 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Apr 19 05:20:52 CST 2020\r
-VERSION_CODE=406\r
+#Thu Apr 23 15:07:00 CST 2020\r
+VERSION_CODE=407\r

diff --git a/local.properties b/local.properties
index 218d050..be381b4 100644 (file)
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.\r
 # For customization when using a Version Control System, please read the\r
 # header note.\r
-#Sun Apr 12 23:38:56 CST 2020\r
-sdk.dir=E\:\\Android\\sdk\r
+#Thu Apr 23 14:33:06 CST 2020\r
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r