From: snickersun <scy@incartech.cn>
Date: Sat, 4 Jan 2020 11:51:59 +0000 (+0800)
Subject: update
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=c201d7545ed331228139938d587cbf3c13ec4feb;p=icsupport.git

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
index 00000000..27fae75b
--- /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">
+  <library name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/libs/LauncherCtrl.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index e15d0f02..de7d7220 100644
--- 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" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\LauncherCtrl.jar:unspecified@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: __local_jars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:multidex:1.0.1@aar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7:25.1.0@aar" level="project" />
diff --git a/app/libs/LauncherCtrl.jar b/app/libs/LauncherCtrl.jar
new file mode 100644
index 00000000..cf80c360
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 e475cb20..381a5876 100644
--- 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 4531ac3f..b03653d7 100644
--- 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);
         return ret;
     }
-    public String AP00(Runtime ds){
+
+    /*登录*/
+    public static String AP00(Runtime ds){
         //示例数据：IWAP00867155030001063#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP00)).append(ds.IMEI()).append(CMDEND).toString();
     }
-    public String AP03(Runtime ds){
+    public static String AP03(Runtime ds){
         //示例数据：IWAP03,06000908000102,5555,30#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(ds.getSignalStrength())
                 .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
@@ -221,7 +223,7 @@ public class protocolAPIHelper {
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)
                 .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();
     }
-    public String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){
+    public static String AP28(String name,String msg,int packagecount,int currentpackageindex,int received_success){
         //示例数据：IWAP28,D3590D54,xxxx,6,1,1#
         return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP28))
                 .append(CMDSPLIT).append(name)
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 b1733da7..789261f9 100644
--- 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;
 import android.os.SystemClock;
 
+import com.eiot.watch_lib.LauncherCtrl;
 import com.ic.protocol.adapter.protocolAPIHelper;
 import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.base.AbstractConnectionService;
@@ -236,7 +237,7 @@ public class KeepAlive extends AbstractConnectionService {
     connectionError = true;
     isConnected = false;
     paramRuntime.getContextProxy().sendBroadcast(isConnected);
-//    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", 1);
+    LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", 1);
     return false;
   }
   
@@ -249,9 +250,9 @@ public class KeepAlive extends AbstractConnectionService {
     Logger.i(stringBuilder.toString());
     if (connectionError) {
       connectionError = false;
-      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP01(paramRuntime)), true);
+      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP00(paramRuntime)), true);
       if (Deliver.haveSendH42) {
-        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP01(paramRuntime)));
+        ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP00(paramRuntime)));
         Deliver.haveSendH42 = false;
       }
     } 
@@ -273,7 +274,7 @@ public class KeepAlive extends AbstractConnectionService {
     Logger.i("onHeartAlarm");
     UpdateHeartBeatTimeout();
     if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){
-//      ServiceUtil.offerQueue(API.H10(paramRuntime), true);
+      ServiceUtil.offerQueue(new StringMessage(protocolAPIHelper.AP03(paramRuntime)), true);
     }
 
   }
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 990be171..ec1f2284 100644
--- 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=");
         stringBuilder.append(19);
         Logger.i(stringBuilder.toString());
-        int sleeptime=1;
+        int sleeptime=20;
         if (Build.VERSION.SDK_INT >= 19) {
 //            alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (i * 60 * 1000), pendingIntent);
             alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (i * sleeptime * 1000), pendingIntent);