update

diff --git a/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml
new file mode 100644 (file)
index 0000000..27fae75
--- /dev/null
+++ b/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">\r
+  <library name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar">\r
+    <CLASSES>\r
+      <root url="jar://$PROJECT_DIR$/app/libs/LauncherCtrl.jar!/" />\r
+    </CLASSES>\r
+    <JAVADOC />\r
+    <SOURCES />\r
+  </library>\r
+</component>
\ No newline at end of file

diff --git a/app/app.iml b/app/app.iml
index e15d0f0..de7d722 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -116,6 +116,7 @@
     <orderEntry type="library" exported="" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />\r
     <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />\r
     <orderEntry type="library" exported="" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />\r
+    <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />\r
     <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />\r
     <orderEntry type="library" exported="" name="Gradle: com.android.support:multidex:1.0.1@aar" level="project" />\r
     <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project" />\r

diff --git a/app/libs/LauncherCtrl.jar b/app/libs/LauncherCtrl.jar
new file mode 100644 (file)
index 0000000..cf80c36
Binary files /dev/null and b/app/libs/LauncherCtrl.jar differ

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e475cb2..381a587 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -133,12 +133,12 @@
 
         <provider android:authorities="com.enqualcomm.support" android:exported="true" android:name="com.ic.protocol.ICContentProvider"/>
 
-        <receiver android:exported="true" android:name="com.enqualcomm.support.BootCompleteReceiver">
+        <receiver android:exported="true" android:name="com.ic.protocol.BootCompleteReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <receiver android:exported="true" android:name="com.enqualcomm.support.util.ProcessReceiver">
+        <receiver android:exported="true" android:name="com.ic.protocol.utils.ProcessReceiver">
             <intent-filter>
                 <action android:name="com.enqualcomm.support.DIALOG"/>
                 <action android:name="com.enqualcomm.imessage.RESUME_ACTION"/>

diff --git a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
index 4531ac3..b03653d 100644 (file)
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -198,11 +198,13 @@ public class protocolAPIHelper {
         cmdbuf=new StringBuffer().append(last_inCompletecmd);\r
         return ret;\r
     }\r
-    public String AP00(Runtime ds){\r
+\r
+    /*登录*/\r
+    public static String AP00(Runtime ds){\r
         //示例数据：IWAP00867155030001063#\r
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()).append(CMDEND).toString();\r
     }\r
-    public String AP03(Runtime ds){\r
+    public static String AP03(Runtime ds){\r
         //示例数据：IWAP03,06000908000102,5555,30#\r
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(ds.getSignalStrength())\r
                 .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")\r
@@ -221,7 +223,7 @@ public class protocolAPIHelper {
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)\r
                 .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();\r
     }\r
-    public String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){\r
+    public static String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){\r
         //示例数据：IWAP28,D3590D54,xxxx,6,1,1#\r
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP28))\r
                 .append(CMDSPLIT).append(name)\r

diff --git a/app/src/main/java/com/ic/protocol/service/KeepAlive.java b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
index b1733da..789261f 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.IntentFilter;\r
 import android.os.SystemClock;\r
 \r
+import com.eiot.watch_lib.LauncherCtrl;\r
 import com.ic.protocol.adapter.protocolAPIHelper;\r
 import com.ic.protocol.bean.StringMessage;\r
 import com.ic.protocol.service.base.AbstractConnectionService;\r
@@ -236,7 +237,7 @@ public class KeepAlive extends AbstractConnectionService {
     connectionError = true;\r
     isConnected = false;\r
     paramRuntime.getContextProxy().sendBroadcast(isConnected);\r
-//    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", 1);\r
+    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", 1);\r
     return false;\r
   }\r
   \r
@@ -249,9 +250,9 @@ public class KeepAlive extends AbstractConnectionService {
     Logger.i(stringBuilder.toString());\r
     if (connectionError) {\r
       connectionError = false;\r
-      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP01(paramRuntime)), true);\r
+      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP00(paramRuntime)), true);\r
       if (Deliver.haveSendH42) {\r
-        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP01(paramRuntime)));\r
+        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP00(paramRuntime)));\r
         Deliver.haveSendH42 = false;\r
       }\r
     } \r
@@ -273,7 +274,7 @@ public class KeepAlive extends AbstractConnectionService {
     Logger.i("onHeartAlarm");\r
     UpdateHeartBeatTimeout();\r
     if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){\r
-//      ServiceUtil.offerQueue(API.H10(paramRuntime), true);\r
+      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)), true);\r
     }\r
 \r
   }\r

diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
index 990be17..ec1f228 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -548,7 +548,7 @@ public class protocolMainServer extends Service {
         stringBuilder.append(",kitkat=");\r
         stringBuilder.append(19);\r
         Logger.i(stringBuilder.toString());\r
-        int sleeptime=1;\r
+        int sleeptime=20;\r
         if (Build.VERSION.SDK_INT >= 19) {\r
 //            alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (i * 60 * 1000), pendingIntent);\r
             alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (i * sleeptime * 1000), pendingIntent);\r