From c201d7545ed331228139938d587cbf3c13ec4feb Mon Sep 17 00:00:00 2001 From: snickersun Date: Sat, 4 Jan 2020 19:51:59 +0800 Subject: [PATCH] update --- ...app_libs_LauncherCtrl_jar_unspecified_jar.xml | 9 +++++++++ app/app.iml | 1 + app/libs/LauncherCtrl.jar | Bin 0 -> 2705 bytes app/src/main/AndroidManifest.xml | 4 ++-- .../ic/protocol/adapter/protocolAPIHelper.java | 8 +++++--- .../java/com/ic/protocol/service/KeepAlive.java | 9 +++++---- .../ic/protocol/service/protocolMainServer.java | 2 +- 7 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 .idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_LauncherCtrl_jar_unspecified_jar.xml create mode 100644 app/libs/LauncherCtrl.jar 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 @@ + + + + + + + + + \ 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 @@ + diff --git a/app/libs/LauncherCtrl.jar b/app/libs/LauncherCtrl.jar new file mode 100644 index 0000000000000000000000000000000000000000..cf80c360ba196e9336dc7c18ac968b48e2de151c GIT binary patch literal 2705 zcma);XHXN^8iqp&b?H5@^r8qsia<0V5~PG8Entu$#?U*VE(=maNBRQNyYylZq#C*) zO*%+ZI-x^E7p~rWXV$s1J9E#OGw1v{&-df~@jm+6WaO*>Dk>@f03h)F{I!GuYygz2 zvlQCi6(i+ijX~L2IoUsvQuVTTdJ1!Ov9Y%WqnxZgJrTxq0Ls6<0RWeS0Ko4_^Lq0t zj1gA?8mj!kX|VhkG#ufySPqYNU;Zt^N_rR4DOTSo~L_wH;|zdCSbED zeu{8a|2lkmwL4^IwUlE8;IVFc#yaIW({G*p++NOcdWjkX`=g5T@)~pCCn{G7qe=?v z>bb2MleW2rxvKU_euK*5W6GN!1=WVqWdSAs8 zq{0d&TDP}JPrVBV5|AxKW5K1Dmi3NUi;Y3kF$LA_ogA3vbm$|kYqNvtRfl+$2qo!* zB7&e>_(r6@{biPphL3~VO#R|=SBiM#(2}6X{zVSxk5_d^E`FW44!*s^-l6WBgS5rY zpS!d3u{TzQ*r~a%r0~5#S#}JBVs3Y!4)Vmu#!o7r@NUoB(&ZfX;R1h*7G&*TkIhdkdH1O zm==wM1nKmAW>k*f5ILk~%QZeIXH<^kFb+`fvW0DiiC{;{iLEa>__5pq0ZdkghXv7) zfp4GL1Atbk_~}mvUXTD7y;M1|B-(XgqC-;mOMG-XTdUx*HbXWCl~~Q@JAb(v4vvEB zeeyB1p`=yr6%Rd53S_G`-bJV!j~ZXRB|a5Ys#q;ic_glsk^@IaU`1uO@>f1liQphI zM#~vzc(ODl_`h?bHy!_dd)(-PeG)0x}NEfWWAx-c-GZadm5K7J< z5@%*Kp-LWlJ(9unQZTbYOU)OBB7!R@ozX}EFY5qx7n)!~i*5o*#xYAdWt}kA$PkgN zG7=vk8)Y!fpWB(}AL_vKE;b>a28yF?mnNCSpi+wrPF+SeW0?0;nA4Bx6|QETd`%wEFZo4C zx!%EW2wrc;(+?(^k~(=j(c%nmY1#B)A5MCfv?!C0?s8+EKg*q4skC@KmFaP^J6U>K zylw9+f?r880@Lkyhk!C1+D`p)o(GbrqoXHqusGeaDV3-`aueSojCvEtwc7Ix_2M7$+R4jgSGAj>w2O)CsnNOb+gl3_B)tUYfmMsm~bU z!bMEGWhwh)LEEypruHHfrz90jZdI4?U+SFhZ6V$`6^^0mNQd^5mv z`x@bM4{YgzNFF#=y{sr>_HEoYlYooSlJ&mYRdI3Y>~VREOVgcx-m&Tm%1O}=hr8H3 zUB`UoTMwAe50g6v9a+ftEak)st-F*?__EbO1E9qwfCX;pvj10ZHQie#wP<dur$wJ49?(10-Kt7r6<_T~zF`w{my$rQ9d(z?jSxxYxapbr&gwLKc*{pO7KfP?AtUGsb z^TIv$LCMY*$d6vcZxjb4EK2U9lz8}`uS2?N4-@@JS zPF&;dZ<^yG^<)=k&`sK|yt!s?TKo-EXn2paSK0spxd-WLMzOUAJszOEU*?6EG;{Fx1rqoQm+*Eyzkm%m7H1DN7Do6BOS^6EB1_hnZuY!(0u{r4{yFlS~B{V$)wz?f1lqzx|f5)q7p# zj-}fgYY{NH(Kd%Ek;oUZ-yx@C(8=+kpo~1kipII8!_A;8l|Sw^Jo!fIVb~+3&h~?O zg##kU-*k+dfOUKl|4vzL8;|9?IQ{EyH5@VNiQ|2$d*K>ZW`^t)U94gT-U;lF%+Z6L)D0O|Mr L=KJ0GZ`{8C_AAgx literal 0 HcmV?d00001 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 @@ - + - + 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); -- 2.17.1