From 36e0b8a34f9cc2d2215c8a0eea4c5c7e9bbe5043 Mon Sep 17 00:00:00 2001
From: snickersun <scy@incartech.cn>
Date: Thu, 9 Jan 2020 07:28:17 +0800
Subject: [PATCH] =?utf8?q?=20KeepAlive=20=E8=BF=98=E6=98=AF=E4=B8=8D?=
 =?utf8?q?=E8=83=BD=E6=81=A2=E5=A4=8D=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=B7=B1?=
 =?utf8?q?=E7=9D=A1=E7=BD=91=E7=BB=9C=E5=B0=B1=E4=BC=9A=E6=96=AD=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../executionHistory/executionHistory.bin     | Bin 4060403 -> 4060403 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/5.4.1/fileHashes/fileHashes.bin       | Bin 437091 -> 437891 bytes
 .gradle/5.4.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .gradle/5.4.1/javaCompile/classAnalysis.bin   | Bin 7069601 -> 7091449 bytes
 .gradle/5.4.1/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .idea/workspace.xml                           | 419 +++++++++---------
 .../java/com/ic/protocol/MainActivity.java    |  56 ++-
 .../java/com/ic/protocol/bean/Runtime.java    |   2 +-
 .../com/ic/protocol/service/Initialize.java   |   2 +-
 .../com/ic/protocol/service/KeepAlive.java    |   4 +
 .../protocol/service/protocolMainServer.java  |  10 +
 .../ic/protocol/utils/NettyConnection.java    |  45 +-
 .../java/com/ic/protocol/utils/RxSocket.java  |  32 +-
 .../com/ic/protocol/utils/ServiceUtil.java    |   2 +
 app/src/main/res/layout/activity_main.xml     |  51 +--
 17 files changed, 296 insertions(+), 327 deletions(-)

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index defc3383ca1646ee53f5829a58fecc95ab01ece7..7bc8b2a52d111138f88efcd89d40d3db0cb6294f 100644
GIT binary patch
delta 10062
zcmeI2cU)B0w#PX`8AKTN3`3FP%o%1t7%684qzgn*EHoRj0udAtDN+<HfR3Uf0-~%a
z1Vo7qq($6TN+gk}QBY%vilEV8Lx?FV3hxY<`|g{`ect=|y#HSKd=?C6t-a4?pS{0(
zo!{cslRt=8v}MQ$8AGNjQ<JI7G-OPfrfh^vOEyxbEz^;)WV$jWW6L-)y<^-pJklvT
zaaB~bW6aX%h&bueq{U7#E5lP_;v%9FREEExkH?)|&@{)i@B&W*ns{6Zyg$ZbLolB^
zN!`Vsa&&;X^(+e{mDq<!>?QX0l>PA4TYPRMN_7b_X);{;d;jm5eS&wJilFQgFB-BJ
zi<aptx(F2&Rc&DZz%~Z-g#Okf<l1I+3b?fC<4%D=YmoUz2dk%25GFGo8fi_UC>PR_
z4c=-D4Tpf5Zni$oO)=<Xpwd+5cbThxtmBROxn7(dgn%7J3L!pPIsqQ18casV)?Od5
zc}==D8~DjwV!8!c9%%-&8PaA%+bG(MX)~eClr}TkMq`gO-i82?9#QnsQJw}W)`^7P
zP|+6HS*2wSl^1w=!*hwN!bFw?3|4Cy!Qe&S2IUFtJ!X}rbQPO^&kH5cXR(Kp-sZjZ
z_q}uSH_6hPYS?y}7s;9V=46gmdVk`jj-%gfIcaH5<UnANa2{G4JDFqZH7GoDWx7MJ
zMz|`Dzrx#3pl8?c!IvwOw{G;DEwKf|MCf{_rw{z4PP5VBmhSJCrk*oSo^*7?>(wEC
z(C(qF2Q}@y38-kIe!cIan@+pUl3st(;<OfCM2ha{UTk@AeJ-mfB)PR&rG2v@ytv9+
zk9-|&#M#_T@1$ZhKA9@qmIvwAc*!U|b93tZl|FuPQ@I1JukI#7(_J<f8(rshGZ6R1
zo3jBik0l<B)~b2AITW;4*^V!~%`?OSu_8YL*WKbV36#G!e92YADLeN1_538*|5zXT
z7V#wznjkU-beqS9qT4)EuuTvJpwJnod!Dsq*RA1C@PC!lvl05vYUu;_J#RFG-sQ1X
z3F0eYzvq!dzY#w`W~zZe{+R<S?(jI~LklV-JmRzDrM6-5%T&?mxO%}1^_rlVJuT^L
z1dlE#H9-nZ8voI~8Ala)9W_Z>l2F;MW1F#YO<qR<v~$Or%kMWspEpnAQCDQx(;Jf>
zH`YDhK84;SdaQz=)VY{{j~7K)4S)(U03Tg)1Rnysbx+}#`@CcZ-N3t*?{mD~d4mxO
zr(!}Xwl8p4!ZLog&-wXVARkF59q;E2Xrh#=xihx?5pgefk4c~38&(|jwM*wf?==fH
z=9{^eFm>Z216MR%{&u0-uEDF4amkQ*(jge)^F%Dnck%!&<jjBd>W_L`mnn|b(t|4D
zHqd9|8VxJG1fPwP*e;F<OH5Qn>mFL%nzhPp=M>k*8>jnyQsgm<p>CI80W?W<bw)}5
z43tF0r}X`F;-PL=;OL#1HvL0^gcQh?R2(w&_HAv5{hjMR<;eFsY*9C68}WN}kk!nA
z&T&aM-*-FN9Hf{&fxx!le~Z>;Xf}5)u1uft<>d1*qXtqSf4uV?h_8_*p<w&8w_mmh
z3yfxap82A@;tn)h^1nlg-3#}##zznvmbDZY+xl*nU;Pw%rDL?=<s0V+WOiZvE^d$G
z=vl$XG9x@@X%G8DpX;ze_bX`#`f}m@P<zAGKKfT26N8F&4MJ_6!>15$;g*OB`y$Ko
zEN}HWoeePdQ5koCc#hjF+}OD3nDht}w=MK2)JNQ4s|qrEmM-L+`J;uCeg&5;a_#5h
zTMPM58EB_!$KbY|ujlisce|a*y*?Tert{|jf0~66_6p<266g?R^px#iy>4UFjmB$6
zQH?-K+~z=2jyb)^o=OwZ>8Ce~8CLi99%d{jW_A9&9?B#xT{tAo)r^gP378T-kA?MW
z-gvFQu<?Qf`rb+V&^Loe%c41Jv)#3Q(t0P}9}lF=xepyot2xfNNH`W9>`LN%(OnO<
zlU({x_|1w_J*L6{R%?#-rlor(%6mvC%yrE`-<$oQHr4w|O$ocApzDw;Z^#3A`MONF
z;>uD7`zbEzsMu!A_9&Cqx#>@4A74P-@WBMbVFZEJZ(U~C!FkMDa<=I0MU!izao=jb
z7J+W*^)&C$cKn9#e$oE?=<5MMmXH$g;yZhSR|8dqesX;}^QnJ4H)qPJ6?K!V9sn6(
z|H0pz?VN)SCZACsQ!LtcKPGfKV}48l^sRHD=hEDnkK=Z^W@+Lp7u~bDs61CIV!BI#
zG_7a3Cv|jECFIw+{tScHDK=iz>T!oaIVVmFbk7<6c0lKI#uxgVdLe9`>l_FLXA{_a
zgUZ4&$6Z@gaZEYCS`~c~)HP47^Qv`Nng)||eh-E|iE}c>hxs`K>VK4H^we&C$MI>w
zUo!??=|NwQ`vdev)RTpCdo=f155VWkzFlw-nvEUk{bK0229G|<PvfGao^Olq#KP1!
zyq|AZ<<+I)c3+448c1dP_}Ej9XQmcUY-w@coA?+*EB~M|BZC3WD-Fyc&z`ix+aB^=
zOpw*on6lF+^r~Mn4;Yjg#jzlhLk0r>EuV)c4)XIyAepwtIlD5h@#6FApPgJ>lLN$D
zX9@7Rq^+C~+VGhr`59zv7cudv5o8k+ojdX3#n<c98xC)6c=2MnF(2~Z^FG865#u$R
z^c#u%JI7l$_C@76yesdq-H$XO;S3on2Z1gy{OJzmNHCPxhDWSYMK_jv$Db1$_e|75
z8XYtB;2*I%gainGa`AAqbU1o;+}iS{4X#%rt1Dhk8SV1pKSfKSWS%@))k+6CErsgn
z&FtV){<&dS#N*euTzYVA5s(5031mz*w}U1^M;q6VCO5E<us$w7r**=Xfx9`Jk>`?X
zfo6`R(1sibH8x}{I=Ez@^VK4g!X3Xm?WhtRQIUg{K8<Y2Ln!BtUy7yguEq0nlRl*)
zs``MiCqFCvgkJWUc4Ry{lmFb#(R*hcS0h|gW47%Rx%)N>$Xtaus=Y_7P98FxpHO^h
zs1eYRVZuy`j6=Hn618XYYQBE@b+BFIp@MnfEs)>OinIshFVFy237LpGqTRS(&5Bx$
zHa~C4`E~23!%ywcAaw||bW_JxQgQ+h$u30AV%Xc9o%E)zHh<07?ZcChH-(f!ldX;>
zelmkJ9fg)IINA>lqtcf%yms$!HhvG80rUf-*`tRy$B<hHWHRGPaW17BogJNja;<Br
zIgqjBJCw~DoABEqZKs`ICXcg~y*(mdUZH@(`5astN7itV?$=IHbtgsbd0x8CrW0@I
zL#B*e4L`0YH=&s`lUi4Am2@ZG%=&SS&3(&ZSLZ%+b?DtdW+Dyg;M><1_T1R`)6Dkd
z!}l&=x+y`Rdp|wDz)64e8-&FZzAx954mZ=;ME9uW@Vj-}vxVo&?sH0owSLaSuF+X!
zKB_P;{XC^4SX#c3XJcbAb_q~kVhO}&lT*MeR7VFUZzl8EJ2bPC_T{X%S>ZFTY#&nZ
zARufFxfBAokae6M&Zto$(`}y=#HCeeRyY<B7oa(dOog_ImMkdRN)~WV@!v+;XtOWY
zKQPVBQQ!E0_<lHI@1`+qxR6b*N9xHTRHu6tvuk9OgJGJrAFzw**{V6<WP)#QBiTGe
zESQ?6|IYinH=eu~<5oNf9L{{2YDg!jDIcSY<15K*2AcZKZNsnhuI(dyO;sN5eC`Kf
zPINaklMHZXHMvm}&Hg;gDee9dgQRP%q2<NpH=$YVD1oNqqzAN})*Y!zZ#(D<7KT9Q
zSzSx)b&BK>sM_e9qfw^L)1B4Ze2&iDvIg?^*?nje-=M1l&rXvm=&bt-^BZP1&(7o*
zzBPS**#Xnrnqi0@&uy50Kcn^`<cthpP4A^CDsP+TEAqpP>tqR&8}i3E!A})l?E{th
zD(XMpBj{YG9J;!BQXIO@(h<SMJ^{+w_kyHNfcL#HFXxZBqoR^?=cD<M>gxg`L<~JF
zq1BF%vGSh}h#uUoEA-W5E2579nTIVY$Qa;{hZ<vDCf;i#{908RfMsKap+m$2nt1w{
zKJv`el(FaSM@Kcenp@(1q_A0CnRry1Jm7!h+<!;>E4KBS$@}<|XKY2DF~FNgra-8V
zIR~#BBV5g7E3%A^Fy>QoTDj?|Dxr)4?P+8P#P<tXY(<uR@b!-2kAOHzsLocT*@u9d
z3A!Wnhd8bTwuGzn$?zwWG=_te=+<XK|A};-q&@6c1lw_`P=J&fM!5+iAaEvWiocp5
z{6?Fth_9iU2?4%<#f5<wQXkks!p+JIqaR`<y-szshHtJ&Gi*OY*fN5x$S?*ZY#`I=
z`BWs>kRuIV>^En!73swQVk4Q!R;1T(6C=mr!%Y!j3~0(Cx6*e~#24cqWD;>zks`Mk
z|HLN4p=YB=FUCKy$zUi#kzVxU?WZU?A$<*o2d6|Y`4%X=>M|0%GWksWU6@cCDHDvI
zLK<;0D+4@#g^=cq61?`h$QM9{jxoHirnlRuB;j~9WrEd?qod@w0vcEPus2nhsf;Xo
zLnSFO3Wj!S+jjbVZ97Y{u=Q$Tg(h1OS#;*au%;mIxp_EVEfZF2vAx`~3-rU{n1;Kj
zh+oAVT-yO*S;9qlcdl@kmhuaFzNamHoa_;<M~ZLhK&>5inZuP3kvc3W68h^azOvJ=
zgE`&M_=C0!@OAkd@bYjlfGZ^ydeC-MV1iE;3w=C||Fs?gUsSPv!CLo(WyA+5r=~;5
z9sZd0U5Ai15p5Q<S>o?H##FUg%=|c8)l{xS(2qvuxT)Ie3ZbF8F(y1d3g^{Y1*$3u
z7x0&IMpjzA6;7+S{=*%qPZT5XJ9p;2zV>_KGoN(_apo`9Rnrjj-HzD}(f&W5zP-JB
zMS~v(&++2=|10Ujp3N}9gPvk%Riq$bL=R_GHPIp)XuHbOhW@L(BxOOPY!{si4+Wu#
zVlJ$U7KJM58+iId$$&nxt1g!mUR`tik?M$)fUg|$A?Tf*5YRcN3DBfQ>fp<7Bn7Id
zt8Lev#$<cWoWbN0Q$~g>PIxcT8iBejcAGgym(87!5EitsLUIAT+h`rjeyMaS#7Aix
zLuaHo08Q>*mSeiDsexH`Fo-wpt{QkoiMOHaKg`kAj;L7AJhHy>O#72bK%BB42jipZ
zRy9%LQP2~utpRH_rQynveVWn*DBcYl9``>$roG76HMlmTTP`U`Aa{gxu96F1SSEgT
zV2oN?b5VR;q(gLka%5!MlIYm@aVwU`rp6~aEMA`UL2YDkR8BzVH%3B;yUr-gD%BfH
zn+-12v*oeT&G|W}uCgww#%w#MrDDSzjl-^sH)x>9!_C*1*%p2I`j->QYmU^VL73R~
z*Z(Bg6-%VHs|oZ}_m|J3&G)wEQkj88OAqV^c9$!i$}mhufk(fw78p#h4T8&#woDxD
zXj>eFzCD@nt%H`&S9Y89>n`hdyFl4lqoH^NQ>UA7AUey|3o#B=R34ei>bP25dAB&h
zP8CjN*;*57P}VIrht6md8z|YqV}i$K+mk4g5tQgzFtOnE`pq{&2LrYZzcTO_oA4ps
z-^2tGx7eP5+J`&}=xZW~(=ug(k*{3?T74~Va+cM(?1p(l&ve7eDOrzw?eJq?`@My_
z3i}6$Kb)n|x!Y_M#ND^2f%uDcB97{`|2$e>aZ3>@YH61t;gzWr_&N42P#sCAgPo1U
z7iy-O@uAa=FoBR+5)RJZZqIJ8KBA&hb>yRPP~WN2B8P)D?ww9uRwa5dG8IhH<0#5d
z#35Rw5b$u8ogiBcs%<>ja5a)D;3#TR#6DPbQQH)BeBD#=LPtR;16Ufgc(OKz+RacF
zs3HV<(6~jL1*HQtQWyF-r-O-`U>6RFr*>#4>s7=`%Hm^s6&=I-xAZD`;J?(X^1TID
z38*&av+;&h>U*ZLbQPLOtyh+=Zch_zQdX_vrVBPIt5#+ksEx{6)owq5Oj)6_@fTz%
ziBtHVjPm9xiBZs1LK(tnsZ<mD?WUp-M^TU>4g<T?$s7V#2$CW62z5$Xk;+XJ98%Vy
z`VLUW&|5Cjg45eQw&J`>YNWQZB84&qN0k*R`l=1or0|&#^1vZgS(_U259ZJ^l#)Ot
zcm1_MHPq;T3RE0Lfr@B=veT3p?5DbXt|U`I*+#*6WtFP)kjNO?8YvFMd(f$8?ppq4
zWvMDKOK_T_C{Pi#5Om&B45f{fI{0lC#KM&fdJ!#cq8{lf%T&$9g8i75slo}4qC!Pf
zLf3Su1$5TCZo`&0shR4^!qm%h0R^-$wG*-q2<kbC;uKK_LH8&TG?hB9RMx1xrb&%J
zcfUXrj1LKtfEKFQ*tL^7ucfS3v7b>qmXcZpK{dju_+_(T7Qv{(P?kNC%F5`Mn}jwg
z&ggfT<ZSWtM;W9NGRz=(ornqd9<iU&U~7HM{sinC9rt`lgf2TeCjXn+ioCL9pQYpE
zNZUB9<K$F8{zu0Tcvdp_*#C}r?q3vNXz_xU$!d+<Adkb<1E+i9RP^nen3UuLzCwf2
zrzfUQaOcW%hM}Oz;L;(ELBy6PwVN;F#yBIGk$5b45p>lWnZvCP@f)<P;jk&IEHGkL
z+u|kSX-~4C>%RCTyJCLIcVcS%{&}S=+2aw%iU{!T6bA#NOYDd6%KjIn39DSLI#2e|
zF&k%rL%PHoe=$&Ml2{0NZ9E|aJfL%)zpfW~-=JUZGV<tZO17tXigMBD;Y0Bjbcy5Y
zyMP<IIMX@F`RKscm%uyHX%+nX6aAMfy71aZ;ynbSZrb=637zkjx0ZB!{kD}B_pZ|u
zlD^2m2lk#a(t(Pf#VgU~vv!~HYa+sCMJB{`315%GnK4cxBCB?}6K&44xzOf{YnQvV
z%ob7nk1iv%N%At@c+8J=nqi8qJKYQ!$Rn<CaoXmlSpU;6w?yvjUxtGoxanyjgSjKR
zPX+B_H)ZF}e(m_pQK&5y8Dg54`<P(!tJ_xH{P++R-*k<K?iGXco5R*YSA&Zl<dtY^
zLg!&>B&54ZgV9`j^NZ<KK85p7KG4`}82l2*Cd)CH<t}A0QJY%HiccH9e>wA)?1a@N
z`aZbpfKwlVw+^_~G10U_<5dg2Jug0UD=xXBGj0&ypDsN>AjX>|t6Th8$?k`q`}nBs
zVMA!0=)(qeyX*2Pa=E^sUSK%ucD`R}Fel$|9^~&57{S<UmIz<G>r%+Tz9Zc`SxN~k
z4(f4<WGH8>HKy*V>Pi_a&b;LGgitQXF1V;|4zaIYtkH~{l`|UOK31*0^-Sk{lG7My
ze?VtWZ9SHha%NkWV&KD8s@_7vC2bMJirmrPm9M`mUw>D={;qr_K8B_M2S<p~_F(_b
gguj{aHxvFJGC^Ol8cwJ%C>!}d=6nM8e)TZ;FYyx0a{vGU

delta 14097
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
F{{>CQOX>gs

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 63276a9f1b10f6b68c745b0684451a6c24bcebfc..7ca20c6d9a493afde44a5a37a0ee82cea14b1c23 100644
GIT binary patch
literal 17
VcmZQxe8+%I(`3UV1~A}g0RS!31T+8u

literal 17
VcmZQxe8+%I(`3UV1~6bh1OP4&1aSZW

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index b87f52033873c4d4f51a3306cc5b96c863bff28a..b8111880ff2a11262e4631b8b2c444438b7650c3 100644
GIT binary patch
delta 7364
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
OiV7`iIw5qBjsFjPMxt5(

delta 5776
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

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 57ebfec9b7c457dbe4377145aaf1911e741c1203..7999ded378e21df6588bc5708e56cfbd59706a75 100644
GIT binary patch
literal 17
VcmZS9ewIDkXOC|w0~pNz001)>1#|!a

literal 17
VcmZS9ewIDkXOC|w0~kzN0{}9*1tS0e

diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 4b5524c0419f96356ab471f89499620f3da96a9d..aeb84e4ca66588b36ea3e22bbdafd7228922c387 100644
GIT binary patch
delta 4983
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
Ik*#I@4d<KG<p2Nx

delta 1605
zcmXZbX;4#F6bEo_AR&t(1jqt}zyncnA&E8$Diu)70zrZaAqfHnETB`x6@#s#2u4vm
zWv0$W9V)a{mRd_Xz!65v(hmiu3wF^mjx(U8qoTD?H*{or6hHhv+<E7nci#QqJAJRs
zyRqjR?}JsOidE%Z<<rjQ^pFbh?O{&`g8VmjrHFmVD^fp0d3IyGyZ1I5agZ<KA|CYK
z=I;+AXJGYHeq1!12o<a)_zGA3FWqxj$G|Oxz;=*Sg0^1JHwXM$1ukzm_qE`WH(c-t
z8U&DgRj|{CBvHZH^dq$8Y<jtSTfYF!K|<t*M93eBQ2+`=L9ne~a$phJ4G$km4iPx=
zNK(phA}76q7XL+?d(sB!vEDQd+z?9@^GP0k94B=_b-c8VfN7O<P|1pzra2ca7Fg|&
zrlgYXP<dV&BZlugrA9H^<(0faLtl;>+Msnns!b(E7!8!g`+_D^wtx#eqGV@8Y~qzs
z#ifOP_S4{6CR@IaSfH(3=Hfuo0og$zj2xFu3RvNjG_le;j~=MB>fF3K8Iq%56oNvL
z0)-(Z3P%x$L6Im5%|+2@9-5C9pcu3eEkcWdSGVNieR70$R>rzOcQ`gN49+#g-sZ3y
zy%e$(`mscBhNh<2xSgaPMuS!HKA=&mY9h%XJ*zY%P;R(E4>3uq?9JpOsJx)^1VU=J
zD!`vT=p`)U(9Ro12DT2VdY6zoSo~bo%{?`vZi1^s-6n);k$R<wnCVSZ+6V4&r5eVS
zn(ySq3SX|!)QZ5Q)9myoJjzws65Qi94O)tpp?6^1rrk<NF_`UIGatGOwQ+plZ__Rm
zk}m4<WK~1Weyzhra$)?j_8uGlexaQTVUKwQwf50hq2_q^jAS`lf#T5X^-8n~t%ey%
zLf3v`fXlTB8aa^G1P_O$yhjbe&II>J+iUNlH7F4!p=7ictwSkjJ&d&JLL&%;C&Ri)
z5zLJ0j<VphJGudXIPh3E#RBtj(+H3DHd%duP4s;kqyv61>!<nfXO5n)Bs>qp^__iu
z<B(oejaS6i*D%KK3@{9{;BJs%NDgJsbf<VATVc2rO?JVP97DVU*1HU6IAp}b#0lRv
zKWXssCsn|&H*|^N<|PB3u3c9QOW9<HhiMSZ7KQv|xa1<|=-_&z3miJ*s1P!(#?x}v
zylD?3pB>XZve$@GVPtRG?|aEnxb!gX8W-r(v=^b|nukdgKzEp_&`9=xvc%+wpcPdT
z8Erah%BL+=5;bf%W@544{MXybV(UzCQ<z|JO}a}C&p%IJ$%9{%)=hry^6qrB0m{2G
zewL9!$o(~AES%>2hhc1=%5V^3_b`|J-i+?fVwoX}l}Tc;E?b?M%!Y5ZnPSCkiMuF2
z6K#Z|e9Ocdk`EaT7JCr%wOfV-^rI4~oc8rvhKRV45kbzd#nwd1puOB0!-gjxS_{HR
zt%t$w!jOty5gkOI&%!8UJF@!yNSBAn7K7%GEJr#q!-*(ci#M3&+lINIRofN@k`@nB
z;_t58XhYdhx6wXUM-rjpfnCgkFaEKA!h_W3_ALRgKOHceL5;!@)<9CA`HF)HroN5B
zePF-txbFjZ3Y;g!aQT7b$0$6L)&5S6h+gYR(1SF>St=q*s0}d12pZL#**>QdokQLv
z8S>XTU2|YE!?}+`Kdng8!=TOC#;0kAlg!Z0cU%{{%XT|a4%&orp=@`aVlMVOS(n!@
zg5u`9ectfwtGotZR>+u#QA=hwynZ0hT|bbI-h=vqf&>i-hMUs`41u7R1<Apr)WbBt
dEuDxdbWg+-q0Q)hRE$bcDcS-PF<U!3{s&YFmvsOD

diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 0930d53e13371528cfc981d996affac94dca442d..3629dfcbff5d8978d24e52d6b4cf708684ab1e1a 100644
GIT binary patch
literal 17
VcmZSnt-0xphMmoK1~7<O3;;J@1wH@(

literal 17
VcmZSnt-0xphMmoK1~7=x1^_na1jYaW

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 00ae716fdb7959e8c1a7e54a2fe5161abf6d3d1d..f57e5826d34b23d75d8aa7f05a95855d1c555436 100644
GIT binary patch
literal 17
VcmZQxwQ6FEqHEbq1~3p@0su0?1eX8+

literal 17
VcmZQxwQ6FEqHEbq1~3pP1pqRU1ZMyM

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dafd761f..543f1833 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,14 @@
 <project version="4">
   <component name="AndroidLayouts">
     <shared>
-      <config />
+      <config>
+        <device id="wear_square" />
+        <target>android-19</target>
+      </config>
     </shared>
   </component>
   <component name="AndroidLogFilters">
+    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="A" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="ChangeListManager">
@@ -14,33 +18,19 @@
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/debug/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/debug/output.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -51,7 +41,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="867155030002145" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="2.7_QVGA_API_19" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -70,46 +60,47 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="324" column="28" selection-start-line="324" selection-start-column="28" selection-end-line="324" selection-end-column="28" />
+            <state relative-caret-position="412">
+              <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#1972#2091#0" expanded="true" />
+                <element signature="e#2090#2091#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="321">
-              <caret line="326" column="28" selection-start-line="326" selection-start-column="28" selection-end-line="326" selection-end-column="28" />
-              <folding>
-                <element signature="e#8222#8223#0" expanded="true" />
-                <element signature="e#8284#8285#0" expanded="true" />
-                <element signature="e#8802#8803#0" expanded="true" />
-                <element signature="e#8845#8846#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="283">
+              <caret line="250" column="43" selection-start-line="250" selection-start-column="26" selection-end-line="250" selection-end-column="43" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+          <provider selected="true" editor-type-id="android-designer2" />
+          <provider editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="109" column="17" selection-start-line="109" selection-start-column="17" selection-end-line="109" selection-end-column="17" />
+            <state relative-caret-position="496">
+              <caret line="47" selection-start-line="47" selection-end-line="47" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="301" column="68" selection-start-line="301" selection-start-column="68" selection-end-line="301" selection-end-column="68" />
+            <state relative-caret-position="74">
+              <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -117,56 +108,47 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="94">
-              <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+            <state relative-caret-position="188">
+              <caret line="107" column="2" lean-forward="true" selection-start-line="107" selection-start-column="2" selection-end-line="107" selection-end-column="2" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="234" column="68" selection-start-line="234" selection-start-column="68" selection-end-line="234" selection-end-column="68" />
+            <state relative-caret-position="131">
+              <caret line="94" column="34" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="169">
-              <caret line="254" column="46" selection-start-line="254" selection-start-column="46" selection-end-line="254" selection-end-column="46" />
+            <state relative-caret-position="150">
+              <caret line="59" column="20" lean-forward="true" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-              <folding>
-                <element signature="e#9387#9388#0" expanded="true" />
-                <element signature="e#9408#9409#0" expanded="true" />
-                <element signature="e#9441#9442#0" expanded="true" />
-                <element signature="e#9462#9463#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="94">
+              <caret line="26" column="24" lean-forward="true" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="436">
+              <caret line="108" column="3" selection-start-line="108" selection-start-column="3" selection-end-line="108" selection-end-column="3" />
             </state>
           </provider>
         </entry>
@@ -182,14 +164,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>location</find>
-      <find>onReceive</find>
-      <find>handle_cmd</find>
-      <find>stop</find>
-      <find>runtime.getLocationInstance()</find>
-      <find>timetofix</find>
-      <find>getHost</find>
-      <find>gethost</find>
       <find>runt</find>
       <find>AP01</find>
       <find>setIMEI</find>
@@ -198,20 +172,28 @@
       <find>setoption</find>
       <find>Socket</find>
       <find>socketChannel</find>
-      <find>onClose</find>
       <find>setCdma</find>
       <find>lbs</find>
       <find>receive</find>
       <find>startLocationProcess</find>
       <find>CellInfo</find>
       <find>mCellinfo</find>
-      <find>CurrentCellInfo</find>
       <find>Cellinfoutil</find>
-      <find>close</find>
       <find>waitAndSendLocation</find>
       <find>getCdm</find>
-      <find>battery</find>
+      <find>close</find>
+      <find>disconnect</find>
+      <find>socketStatus</find>
       <find>preCellInfo</find>
+      <find>battery</find>
+      <find>CurrentCellInfo</find>
+      <find>RxSocket</find>
+      <find>\\r</find>
+      <find>keep</find>
+      <find>onopen</find>
+      <find>initial</find>
+      <find>onClose</find>
+      <find>delive</find>
     </findStrings>
     <replaceStrings>
       <replace>stop</replace>
@@ -221,7 +203,7 @@
     </replaceStrings>
   </component>
   <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="D:\Snicker\icsupport\app\EQC_G5.jks" />
+    <option name="KEY_STORE_PATH" value="D:\workspace\icsupport\app\EQC_G5.jks" />
     <option name="KEY_ALIAS" value="watch_g5" />
     <option name="REMEMBER_PASSWORDS" value="true" />
     <option name="BUILD_TARGET_KEY" value="apk" />
@@ -239,7 +221,6 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RunCMD.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ExeCommand.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GPSListener.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java" />
@@ -247,28 +228,30 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java" />
         <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/UpLoadDataPoints.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="620" />
-    <option name="y" value="198" />
+    <option name="x" value="670" />
+    <option name="y" value="38" />
     <option name="width" value="964" />
     <option name="height" value="784" />
   </component>
@@ -326,6 +309,17 @@
               <item name="protocol" type="cbb59c9e:AndroidPsiDirectoryNode" />
               <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="res" type="d4f16f75:AndroidResFolderNode" />
+            </path>
+            <path>
+              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
+              <item name="app" type="feadf853:AndroidModuleNode" />
+              <item name="res" type="d4f16f75:AndroidResFolderNode" />
+              <item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
+            </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
               <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
@@ -456,8 +450,8 @@
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
     <layout>
-      <window_info id="Captures" order="0" sideWeight="0.22002634" side_tool="true" visible="true" weight="0.26028922" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7799736" visible="true" weight="0.26028922" />
+      <window_info id="Captures" order="0" sideWeight="0.21962617" side_tool="true" visible="true" weight="0.26028922" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.7803738" visible="true" weight="0.26028922" />
       <window_info id="Structure" order="2" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
       <window_info id="Favorites" order="3" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
       <window_info id="Build Variants" order="4" sideWeight="0.21818182" side_tool="true" weight="0.26028922" />
@@ -466,13 +460,13 @@
       <window_info id="Resources Explorer" order="7" sideWeight="0.49717513" weight="0.3298109" />
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Run" order="0" weight="0.32952183" />
-      <window_info anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.63570637" weight="0.6496881" />
+      <window_info active="true" anchor="bottom" auto_hide="true" x="96" y="344" width="1798" height="456" id="Logcat" order="1" sideWeight="0.63570637" visible="true" weight="0.33264032" />
       <window_info anchor="bottom" id="TODO" order="2" weight="0.32952183" />
       <window_info anchor="bottom" id="Find" order="3" sideWeight="0.48164627" weight="0.47193348" />
       <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49499443" weight="0.32848233" />
       <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.36429366" side_tool="true" weight="0.44802496" />
       <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49944383" weight="0.32952183" />
-      <window_info active="true" anchor="bottom" id="Build" order="7" sideWeight="0.49276975" visible="true" weight="0.21101871" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49276975" weight="0.21101871" />
       <window_info anchor="bottom" id="Debug" order="8" sideWeight="0.4938821" weight="0.32848233" />
       <window_info anchor="bottom" id="Android Profiler" order="9" />
       <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
@@ -523,12 +517,6 @@
           <properties />
           <option name="timeStamp" value="17" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java</url>
-          <line>250</line>
-          <properties />
-          <option name="timeStamp" value="32" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
@@ -606,59 +594,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/SynchronousTime.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="760">
-          <caret line="40" column="22" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="73" column="39" lean-forward="true" selection-start-line="73" selection-start-column="39" selection-end-line="73" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="443">
-          <caret line="40" column="27" lean-forward="true" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/gsm/GsmCellLocation.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
-          <folding>
-            <element signature="e#537#538#0" expanded="true" />
-            <element signature="e#588#589#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/stepCounter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StepCount.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
@@ -666,17 +601,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Timer.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="26" column="5" lean-forward="true" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-          <folding>
-            <element signature="e#548#549#0" expanded="true" />
-            <element signature="e#599#600#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="233">
@@ -784,13 +708,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="265">
-          <caret line="391" column="67" selection-start-line="391" selection-start-column="45" selection-end-line="391" selection-end-column="67" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/StepCounterInterface.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="379">
@@ -847,13 +764,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="235" column="51" selection-start-line="235" selection-start-column="51" selection-end-line="235" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/ICLocation.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="197">
@@ -868,13 +778,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="42" column="20" selection-start-line="42" selection-start-column="20" selection-end-line="42" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/NMEAListener.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
@@ -924,6 +827,68 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="234" column="68" selection-start-line="234" selection-start-column="68" selection-end-line="234" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="564">
+          <caret line="380" column="8" selection-start-line="380" selection-start-column="8" selection-end-line="380" selection-end-column="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="891">
+          <caret line="265" column="27" selection-start-line="265" selection-start-column="27" selection-end-line="265" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
+          <folding>
+            <element signature="e#9387#9388#0" expanded="true" />
+            <element signature="e#9408#9409#0" expanded="true" />
+            <element signature="e#9441#9442#0" expanded="true" />
+            <element signature="e#9462#9463#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="397">
+          <caret line="105" column="14" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
+          <folding>
+            <element signature="e#3633#3634#0" expanded="true" />
+            <element signature="e#3668#3669#0" expanded="true" />
+            <element signature="e#5331#5332#0" expanded="true" />
+            <element signature="e#5360#5361#0" expanded="true" />
+            <element signature="e#5411#5412#0" expanded="true" />
+            <element signature="e#5449#5450#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="321">
@@ -937,74 +902,102 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/Handler.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="324" column="28" selection-start-line="324" selection-start-column="28" selection-end-line="324" selection-end-column="28" />
+        <state relative-caret-position="663">
+          <caret line="146" column="21" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#201#202#0" expanded="true" />
+            <element signature="e#252#253#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/RxSocket.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="496">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Timer.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="301" column="68" selection-start-line="301" selection-start-column="68" selection-end-line="301" selection-end-column="68" />
+        <state relative-caret-position="323">
+          <caret line="32" column="16" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="108" column="3" selection-start-line="108" selection-start-column="3" selection-end-line="108" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+      <provider selected="true" editor-type-id="android-designer2" />
+      <provider editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="412">
+          <caret line="67" column="21" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1972#2091#0" expanded="true" />
+            <element signature="e#2090#2091#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/GSensorListener.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/ConnectionService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="94">
-          <caret line="90" column="8" selection-start-line="90" selection-start-column="8" selection-end-line="90" selection-end-column="8" />
+          <caret line="26" column="24" lean-forward="true" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="234" column="68" selection-start-line="234" selection-start-column="68" selection-end-line="234" selection-end-column="68" />
+        <state relative-caret-position="283">
+          <caret line="250" column="43" selection-start-line="250" selection-start-column="26" selection-end-line="250" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="26" column="26" selection-start-line="26" selection-start-column="26" selection-end-line="26" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="150">
+          <caret line="59" column="20" lean-forward="true" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
-          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
-          <folding>
-            <element signature="e#9387#9388#0" expanded="true" />
-            <element signature="e#9408#9409#0" expanded="true" />
-            <element signature="e#9441#9442#0" expanded="true" />
-            <element signature="e#9462#9463#0" expanded="true" />
-          </folding>
+          <caret line="94" column="34" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NettyConnection.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="109" column="17" selection-start-line="109" selection-start-column="17" selection-end-line="109" selection-end-column="17" />
+        <state relative-caret-position="74">
+          <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/LocationClient.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="254" column="46" selection-start-line="254" selection-start-column="46" selection-end-line="254" selection-end-column="46" />
+        <state relative-caret-position="188">
+          <caret line="107" column="2" lean-forward="true" selection-start-line="107" selection-start-column="2" selection-end-line="107" selection-end-column="2" />
         </state>
       </provider>
     </entry>
diff --git a/app/src/main/java/com/ic/protocol/MainActivity.java b/app/src/main/java/com/ic/protocol/MainActivity.java
index 47faedd0..66256efa 100644
--- a/app/src/main/java/com/ic/protocol/MainActivity.java
+++ b/app/src/main/java/com/ic/protocol/MainActivity.java
@@ -1,10 +1,13 @@
 package com.ic.protocol;
 
 import android.content.Intent;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.ic.protocol.bean.StepCount;
@@ -16,6 +19,8 @@ import com.ic.protocol.utils.StepCounterInterface;
 
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import chestnut.ui.Toastc;
 import rx.android.schedulers.AndroidSchedulers;
@@ -23,52 +28,55 @@ import rx.schedulers.Schedulers;
 
 public class MainActivity extends AppCompatActivity {
 
-    private protocolMainServer mProtocolMainServer;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
         Button btnConnect = (Button) findViewById(R.id.btnConnect);
-        Button btnDisConnect = (Button) findViewById(R.id.btnDisConnect);
-        Button btnWrite = (Button) findViewById(R.id.btnWrite);
-        Button btnWrite2 = (Button) findViewById(R.id.btnWrite2);
+        TextView tv = (TextView)findViewById(R.id.textView);
 
         btnConnect.setOnClickListener(clickListener);
-        btnDisConnect.setOnClickListener(clickListener);
-        btnWrite.setOnClickListener(clickListener);
-        btnWrite2.setOnClickListener(clickListener);
+
 
         startService(new Intent(this,protocolMainServer.class));// protocol service
-        if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
+
+
+        Handler handler=new Handler(new Handler.Callback() {
+            @Override
+            public boolean handleMessage(Message message) {
+
+                 tv.setText( protocolMainServer.getInstance().getServerAlive());
+
+                return false;
+            }
+        });
+        TimerTask tmt=new TimerTask() {
+            @Override
+            public void run() {
+                handler.sendEmptyMessage(0);
+            }
+        };
+        new Timer().schedule(tmt,0,2000);
+
 
     }
 
+
+
     private View.OnClickListener clickListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
             switch (view.getId()) {
                 case R.id.btnConnect:
                     //进行连接Socket：这里使用的是，在本地上开启了一个服务器。
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null)    mProtocolMainServer.connectServer();
-                    break;
-                case R.id.btnDisConnect:
-                    //断开连接
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.disconnectServer();
-                    break;
-                case R.id.btnWrite:
-                    //向RxSocket写数据
+                    stopService(new Intent(MainActivity.this,protocolMainServer.class));// protocol service
+                    startService(new Intent(MainActivity.this,protocolMainServer.class));// protocol service
 
-//                    if (mProtocolMainServer == null ) mProtocolMainServer  = protocolMainServer.getInstance();
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.sendMsg(new String("IWAP00867155030001063#"));
-                    break;
-                case R.id.btnWrite2:
 
-//                    if(mProtocolMainServer !=null) mProtocolMainServer.testGpsData();
-                    StepCounterInterface.getStepCount();
                     break;
+
             }
         }
     };
diff --git a/app/src/main/java/com/ic/protocol/bean/Runtime.java b/app/src/main/java/com/ic/protocol/bean/Runtime.java
index 7ccf577f..a8e5bccd 100644
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/ic/protocol/bean/Runtime.java
@@ -56,7 +56,7 @@ public class Runtime {
   
   private String host = "watch.jiai.pro"; //118.178.155.223
 
-  private String srvIP = "39.98.94.164";
+  private String srvIP = "118.178.155.223";//"39.98.94.164";
 
   private String imei = "867155030002145";
 
diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/ic/protocol/service/Initialize.java
index b9608726..43d982a6 100644
--- a/app/src/main/java/com/ic/protocol/service/Initialize.java
+++ b/app/src/main/java/com/ic/protocol/service/Initialize.java
@@ -53,7 +53,7 @@ public class Initialize extends AbstractConnectionService {
   
   public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) {
     initOK=false;
-    return this.initOK ^ true;
+    return false;
   }
   
   public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
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 a4b22c39..bf4540ba 100644
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -247,6 +247,10 @@ public class KeepAlive extends AbstractConnectionService {
     connectionError = true;
     isConnected = false;
     paramRuntime.getContextProxy().sendBroadcast(isConnected);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("onConnectionClose=");
+    stringBuilder.append(",set KeepAlive isConnected = false");
+    Logger.i(stringBuilder.toString());
     LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF);
     return false;
   }
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 bf8aef25..09af3bc1 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -36,6 +36,7 @@ import com.ic.protocol.utils.DBHelper;
 import com.ic.protocol.utils.FileOutputUtil;
 import com.ic.protocol.utils.Logger;
 import com.ic.protocol.utils.NettyConnection;
+import com.ic.protocol.utils.ServiceUtil;
 import com.ic.protocol.utils.SharPreferenceUtil;
 import com.ic.protocol.utils.SimSignalUtil;
 import com.ic.protocol.utils.Util;
@@ -87,6 +88,15 @@ public class protocolMainServer extends Service {
 
     private static boolean is_wifi_network_ok = false;
 
+
+    public String getServerAlive(){
+        return new StringBuilder().append("Connecttion status is ").append(this.connection.isServerConnected())
+                .append("\n KeepAlive ").append(KeepAlive.isConnected)
+                .append( "\n cmd Queue size ").append(LocationClient.queue.size())
+                .append("\n AP01 = ").append(protocolAPIHelper.AP01(runtime))
+                .toString();
+    }
+
     private BroadcastReceiver AtCallbackBroadcastReceiver = new BroadcastReceiver() {
         public void onReceive(Context param1Context, Intent param1Intent) {
             if (param1Intent.getAction().equals("com.eqc.intent.action.callback.at")) {
diff --git a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
index eeb454fd..7a3c29ff 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -19,7 +19,7 @@ import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
 import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;
 
 
-public class NettyConnection implements Connection ,RxSocket.SocketConnectionListener{
+public class NettyConnection implements Connection {
   private static long realtime_old;
   private static final String TAG = NettyConnection.class.getSimpleName();
 
@@ -32,7 +32,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   
   public NettyConnection(ConnectionListener paramConnectionListener) {
     this.listener = paramConnectionListener;
-    RxSocket.getInstance().setConnectionListener(this);
+//    RxSocket.getInstance().setConnectionListener(this);
     if (API == null) API=new protocolAPIHelper(
             new protocolAPIHelper.CmdHandler() {
                 @Override
@@ -44,7 +44,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                             case BP00:
                                 API.handleBP00(cmd);
                                 Logger.i("服务器收到心跳AP00");
-                                sendCMDMessage("AP00",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("AP00",cmd);//通知下面线程状态变化
                                 break;
                             case BP01:
                                 API.handleBP01(cmd);
@@ -53,34 +53,34 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                             case BP03:
                                 API.handleBP03(cmd);
                                 Logger.i("服务器收到心跳AP03");
-                                sendCMDMessage("AP03",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("AP03",cmd);//通知下面线程状态变化
                                 break;
                             case BP28:
                                  API.handleBP28(cmd);
                                 Logger.i("服务器收到语音AP28");
-                                sendCMDMessage("AP28",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("AP28",cmd);//通知下面线程状态变化
 
                                 break;
                             case BPTM:
                                 API.handleBP28(cmd);
                                 Logger.i("服务器收到校时命令APTM");
-                                sendCMDMessage("APTM",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("APTM",cmd);//通知下面线程状态变化
                                 break;
                             case BP85://设置闹钟
                                 API.handleBP85(cmd,NettyConnection.this,null);
                                 Logger.i("收到服务器设置闹钟命令BP85");
-                                sendCMDMessage("AP85",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("AP85",cmd);//通知下面线程状态变化
                                 break;
                             case BP33:
                                 //设置工作模式
                                 API.handleBP33(NettyConnection.this,null,cmd);
-                                sendCMDMessage("AP33",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("AP33",cmd);//通知下面线程状态变化
 
                                 break;
                             case BP16:
                                 //立即定位指令（长链接有效）
                                 API.handleBP16(NettyConnection.this,null,cmd);
-                                sendCMDMessage("StartLocate",cmd);//通知下面线程状态变化
+                                DeliverCMDMessageToSystem("StartLocate",cmd);//通知下面线程状态变化
                                 break;
                         }
 
@@ -97,7 +97,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   
   public void close() {
       listener =null;
-      RxSocket.getInstance().setConnectionListener(null);
+//      RxSocket.getInstance().setConnectionListener(null);
   }
   
   public void connect(final String host, final int port) {
@@ -134,6 +134,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket Connect Error : "+throwable.getMessage());
                     },
                     () -> {
+                        log("RxSocket Connect main");
 
                     }
             );
@@ -154,7 +155,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket DisConnect Error : "+throwable.getMessage());
                     },
                     () -> {
-
+                        log("RxSocket DisConnect main");
                     }
             );
 
@@ -193,7 +194,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       log("RxSocket write Error : " + throwable.getMessage());
                     },
                     () -> {
-
+                        log("RxSocket write main ");
                     }
             );
     return true;
@@ -202,7 +203,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   public int getTimeout() { return this.timeout; }
 
 
-  public void sendCMDMessage(String cmd,String msg){
+  public void DeliverCMDMessageToSystem(String cmd,String msg){
       if (NettyConnection.this.listener!=null){
           String[] msgArr=new String[]{cmd,msg};
           StringMessage stringMessage=new StringMessage(msgArr);
@@ -226,10 +227,10 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
 
                       },
                       throwable -> {
-
+                          log("get Msg throwable");
                       },
                       ()->{
-
+                          log("get Msg ()");
                       }
               );
 
@@ -247,6 +248,7 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
                       if (NettyConnection.this.listener!=null){
                           NettyConnection.this.listener.onConnectionClose();
                       }
+                      disconnectServer();
                   }
               });
 
@@ -267,18 +269,5 @@ public class NettyConnection implements Connection ,RxSocket.SocketConnectionLis
   
   public void setTimeout(int paramInt) { this.timeout = paramInt; }
 
-    @Override
-    public void onConnectionClose(String errMsg) {
-//        if (NettyConnection.this.listener!=null){
-//            NettyConnection.this.listener.onConnectionClose();
-//        }
-    }
-
-    @Override
-    public void onConnectionOpen() {
-//        if (NettyConnection.this.listener!=null){
-//            NettyConnection.this.listener.onConnectionOpen();
-//        }
-    }
 }
 
diff --git a/app/src/main/java/com/ic/protocol/utils/RxSocket.java b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
index e7f23d15..3bade991 100644
--- a/app/src/main/java/com/ic/protocol/utils/RxSocket.java
+++ b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
@@ -74,7 +74,7 @@ public class RxSocket {
     private ReadThread readThread = null;
     private boolean isReadThreadAlive = true;
     private SocketReconnectCallback socketReconnectCallback = null;
-    private SocketConnectionListener conectionListener = null;
+//    private SocketConnectionListener conectionListener = null;
 
     /*  方法
     * */
@@ -86,9 +86,9 @@ public class RxSocket {
         return connectStatus;
     }
 
-    public void setConnectionListener(SocketConnectionListener callback){
-        conectionListener=callback;
-    }
+//    public void setConnectionListener(SocketConnectionListener callback){
+//        conectionListener=callback;
+//    }
     /**
      * 建立Socket连接，只是尝试建立一次
      * @param ip    IP or 域名
@@ -294,13 +294,9 @@ public class RxSocket {
                         if (selectionKey != null) selectionKey.cancel();
                         socketChannel = SocketChannel.open();
                         socketChannel.configureBlocking(false);
-//                        socketChannel.setOption(SocketOptions.SO_KEEPALIVE, Boolean.TRUE);
-//                        socketChannel.setOption(SocketOptions.TCP_NODELAY, Boolean.TRUE);
-//                        socketChannel.getOption(StandardSocketOptions.SO_KEEPALIVE);
                         selector = Selector.open();
 //                        socketChannel.socket().setKeepAlive(true);
                         socketChannel.connect(new InetSocketAddress(ip, port));
-
 //                        socketChannel.socket().setTcpNoDelay(true);
                         selectionKey = socketChannel.register(selector, SelectionKey.OP_CONNECT);
                         socketStatus = SocketStatus.CONNECTING;
@@ -313,9 +309,6 @@ public class RxSocket {
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail1");
 
-//                        if( conectionListener !=null) {
-//                            conectionListener.onConnectionClose("SocketConnectFail");
-//                        }
                     }
                 }
                 //读取
@@ -336,9 +329,6 @@ public class RxSocket {
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onSuccess();
 
-                                        if( conectionListener !=null) {
-                                            conectionListener.onConnectionOpen();
-                                        }
                                     } catch (Exception e) {
                                         isReadThreadAlive = false;
                                         socketStatus = SocketStatus.DIS_CONNECT;
@@ -347,9 +337,6 @@ public class RxSocket {
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onFail("SocketConnectFail2");
 
-//                                        if( conectionListener !=null) {
-//                                            conectionListener.onConnectionClose("SocketConnectFail2");
-//                                        }
                                     }
                                 }
                             } else if (key.isReadable()) {
@@ -363,9 +350,6 @@ public class RxSocket {
                                     if (socketReconnectCallback!=null)
                                         socketReconnectCallback.onFail("SocketConnectFail3");
 
-//                                    if( conectionListener !=null) {
-//                                        conectionListener.onConnectionClose("SocketConnectFail3");
-//                                    }
                                 } else {
                                     LogUtils.i(OpenLog, TAG, "readSubject:msg！"+ "length:" + length);
                                     byte[] bytes = new byte[length];
@@ -385,9 +369,6 @@ public class RxSocket {
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail4");
 
-//                        if( conectionListener !=null) {
-//                            conectionListener.onConnectionClose("SocketConnectFail4");
-//                        }
                     }
                 }
             }
@@ -405,9 +386,4 @@ public class RxSocket {
         void onFail(String msg);
     }
 
-    public interface SocketConnectionListener {
-        void onConnectionClose(String errMsg);
-
-        void onConnectionOpen();
-    }
 }
diff --git a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java b/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
index e94c4a68..fd6b0ca9 100644
--- a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
+++ b/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
@@ -44,6 +44,8 @@ public class ServiceUtil {
       LocationClient.queue.offerLast(paramStringMessage);
     } 
   }
+
+
   
 //  public static void offerVideoQueue(OssFileContent paramOssFileContent, LinkedBlockingDeque<OssFileContent> paramLinkedBlockingDeque, FileCache paramFileCache) {
 //    if (!paramLinkedBlockingDeque.offerLast(paramOssFileContent)) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2ccdf09..61aa82cb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,39 +10,26 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.ic.protocol.MainActivity">
 
-    <Button
-        android:id="@+id/btnConnect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:text="connect" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <Button
-        android:id="@+id/btnDisConnect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnConnect"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:text="disConnect" />
+        <Button
+            android:id="@+id/btnConnect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ReConnect" />
 
-    <Button
-        android:id="@+id/btnWrite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnDisConnect"
-        android:layout_alignEnd="@+id/btnConnect"
-        android:layout_marginTop="5dp"
-        android:text="write" />
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical"
+            android:text="TextView"
+            android:textAlignment="viewStart"
+            android:textSize="18sp" />
+
+    </LinearLayout>
 
-    <Button
-        android:id="@+id/btnWrite2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnWrite"
-        android:layout_alignEnd="@+id/btnConnect"
-        android:layout_marginTop="5dp"
-        android:text="write" />
 </RelativeLayout>
-- 
2.17.1