From c0c8ed5ce7fc72ee0ecfccab91d6ddaad05cc6bd Mon Sep 17 00:00:00 2001
From: snickersun <scy@incartech.cn>
Date: Mon, 6 Jan 2020 23:20:53 +0800
Subject: [PATCH] update  socket and alarm timer work now

---
 .../taskArtifacts/cache.properties.lock       | Bin 17 -> 17 bytes
 .gradle/2.14.1/taskArtifacts/fileHashes.bin   | Bin 332917 -> 334877 bytes
 .../2.14.1/taskArtifacts/fileSnapshots.bin    | Bin 3047434 -> 3076283 bytes
 .../fileSnapshotsToTreeSnapshotsIndex.bin     | Bin 26390 -> 26390 bytes
 .../2.14.1/taskArtifacts/taskArtifacts.bin    | Bin 98276 -> 98276 bytes
 .idea/caches/build_file_checksums.ser         | Bin 586 -> 586 bytes
 .idea/workspace.xml                           | 756 ++++++++++--------
 .../java/com/ic/protocol/LocationClient.java  | 140 ++--
 .../protocol/adapter/protocolAPIHelper.java   | 274 +++----
 .../java/com/ic/protocol/bean/Runtime.java    |  10 +-
 .../com/ic/protocol/bean/heartRateStatus.java |   2 +-
 .../com/ic/protocol/service/CheckSIM.java     |  27 +-
 .../java/com/ic/protocol/service/Deliver.java |  38 +-
 .../com/ic/protocol/service/Initialize.java   | 108 +++
 .../com/ic/protocol/service/KeepAlive.java    |   6 +-
 .../ic/protocol/service/SynchronousTime.java  |  87 ++
 .../protocol/service/protocolMainServer.java  | 102 ++-
 .../com/ic/protocol/utils/AlarmWakeUp.java    |   2 +
 .../com/ic/protocol/utils/CameraUtil.java     | 209 +++++
 .../com/ic/protocol/utils/ContextProxy.java   | 550 ++++++-------
 .../com/ic/protocol/utils/CustomDialog.java   | 178 +++++
 .../ic/protocol/utils/CustomNotification.java | 216 +++++
 .../java/com/ic/protocol/utils/Logger.java    |   2 +-
 .../ic/protocol/utils/NettyConnection.java    | 103 ++-
 .../ic/protocol/utils/NetworkObservable.java  |  26 +-
 .../ic/protocol/utils/ProcessReceiver.java    | 142 ++--
 .../java/com/ic/protocol/utils/RxSocket.java  |  36 +-
 library/build.gradle                          |   3 +
 28 files changed, 2013 insertions(+), 1004 deletions(-)
 create mode 100644 app/src/main/java/com/ic/protocol/service/Initialize.java
 create mode 100644 app/src/main/java/com/ic/protocol/service/SynchronousTime.java
 create mode 100644 app/src/main/java/com/ic/protocol/utils/CameraUtil.java
 create mode 100644 app/src/main/java/com/ic/protocol/utils/CustomDialog.java
 create mode 100644 app/src/main/java/com/ic/protocol/utils/CustomNotification.java

diff --git a/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/.gradle/2.14.1/taskArtifacts/cache.properties.lock
index ed0f7caf252c20783b940ca309f0e302d0b9f8ea..9bcadf1c9938c2b212487684e9cfb8f38dd350e4 100644
GIT binary patch
literal 17
VcmZQx5}sju_(t<a1~9mw1^_qj1!({P

literal 17
VcmZQx5}sju_(t<a1~6#b3;;Li1*`x7

diff --git a/.gradle/2.14.1/taskArtifacts/fileHashes.bin b/.gradle/2.14.1/taskArtifacts/fileHashes.bin
index fe6475dce0447103a4fdc0ab211fece7bb12af4a..81625ae45a283530768fedc4f8f4d748f9a82c8d 100644
GIT binary patch
delta 11495
zcmZ{Kd0dU#_kYiDnsrLkIZ@|ixX9E+B2!UjQKlv(QxbJf&Jm(y%5aTg5m9EDi~ATt
zap@vA^H4-65=lfvzWdqh>Gyhl{`l>`PJ6xgT5GSh_F8N2r`m%yX=iNK+cG8_?7D9V
z=)){Nx$3k%^Et&+af_2Fre<3z=b6cC*EZPQx7}_a4w-Uc_M%pwWb)=)+@9#y1mUE^
z=IrS%;TCec7|UMSZ9mdU{-1H#xjn2H`Qg9ce=aEXL}at0+5h%TGL*Ms>ox_3{v}Py
zvOPUbIQhchs`}T~i|8bO^IW#)053+qsOPJmb%&A=sr1R7>-~*kin0}hmZvk{vUk04
zG~;A;v$8MMq_LdL_E&aTZEIsrW^*(p`Ioc&ar%I;Ut@L1vHn^1u3v7Zgs2xD88Ii#
z<s+P2YX2)bhP)LWA<>4}CV#vz`+R*)4z77W8|1dkclimkd;1bEUB=0W>)^L7Gl%W$
z0l6wJQt-5AR{qJyN9rC4w+1tzEcvNth0ep6YDS!W3nM1-YDi>xYhm07Cc{*un+f&f
z869U99~s+(ay2l6ydS&*3N3jXVSg~QUq)cD<}fOpi6XzWON2||%tY3lOmet@iB56$
zRltBL%qJ0Q0%_xUwGc3ssWBG+ZVpTsZ=2G|*G!0xX69Hj_k^+phB1_ze%d?Ori(9S
zB2#`4o-JhpP37JX`V~J=`rr<KRtp{1F?kMhudn>)Z>nyHwXcP;L(Dp+NVt&6?6+ph
zgee!9CMLw}V+CD4(}!&)vnl&6jlokt4E@J!;tgEtFhMwVo$+fbpWu_Xe0yCAiun;D
z{48dA8p^FM#Y|5)kRge&g$^$nKY8?)_?@}a^Ki0RnV@^g*qbn`g!h%qF*)vVXFWAe
ztU_q=lNlyjJJtb8#<41h|Akhu2TcRBTO=r8!316fLJ_g=kl)M*if#(KLU`5bv+O)-
zSvxAsfExzka@JlL%dvJ%$Xe}hC>_hIgteAzJGzX4^HwZ%%P(+g%61ho4MKQRwjU?{
z{0_wVD%d%iw-NuW6N+tFYjL5r9!P|!g{JoG#TG4`EnC&xt~y+Ly<e%%<|94!40>f?
zz{JEy&X|j8j9Ubyv5Zo^cT1GswyVpD!TgK988Mk^M9p$X%WPf^Rt#$o{XJMw+RO$B
z@?g7>IGGhl0nCbdlnrEiuuBMFRxo(<Lck;hto|wj?1(;g+L&R(LwBsSiOs!t>rvc2
zloWZB;tW`8%1CuAVR6HSHSIQ4-Z$SE+-ez#UnWKqW-}a7&Y)dDl>WYD;H|fA?mw;#
z@Y_DUEa<7UwRs3?<%CLm^k!{{sx$XU5-d>FTz_i0Su0_6Z>p;Hy979xvVp|B&lt4q
z52z<}(Xc<EU<^<F@DpbAVciH*?JsG~WV)uuIJzd5g;C>pTcNrSJ56*}Y*PsGV%@}p
zXfNSYtPU$7+l!hrRtYz~s0y(TNVd8|+073{cFiDZ7CGI){pm(xn<2==hJpgZ5ab9N
zauy-CKO3+9=d(fGp09^&0{*^UwLfs|C^Ss0lO()?E}T7pO4m+-)dSD~Q;}}ukYaU0
z39kpR)}rzpoUkN}ExlQlm>EnE^oN2nsU45fO`%Bu-%Z@18PaXQS<fqBY5>yBpxB%3
zDy}z2degNuAi&j!wG*XSz=lBH8KQh}j~0kB{)Rr>O{PVZ9M1W$ZsIRX@Cf2Xx5Qcr
z?FX_;8NypHnU6&e?wv?w>jy*5L~<%k2UFI%3S=!ClHwI)4^6`n^ar?vQ-1n(uwgKD
zxV{CX;+(Dqm?3mdR}ZF>Xb|Y#z-tmYu<M4fCB`jVSQ!Wg(_i<Fc(lE(ag=M*sMIJl
zy6!oOV=G`oM@A_e@@HSs?ClNf$5ONFHb{tJRG~Lx+2P_|CgUs<4WGOjB?OG4-q1IL
zm~ptQ00Dm};ACHt)bk~PiI|*3OY0sWz@`Pw;cnxp3H7EhVm!?zy4zynw@vX4GKD=z
z)IEpugeZ#dBPrFJE^Zoti)VmK04{zH;pCTy3`eB#H=@1*&IC|Bb+u3!z|J84(YpzK
z0@)C{=UAEwAt#u6LO&2!a>J;MFJxB4dx3cf+P`zkf~6{$975-HRS-|+#f^Q%b#@<9
zv|;veSEAR!yAZ0IUIWe(ki#EhSgK*(1Z3R_HcUXJryvUx8^{Y}6z~=Sx@xhYsX!Hq
zp+b_AIL7}C%n8v4q3DAS;!#t<+E8|hXn=8u;tq-a6S{@5A%?srY-%F-MX-(z&XyCd
z6?=HUPIcXze7x!tzb+pGW0@b^oJzIS)WWX|M9Y@b*kY0(=bpOWYlQ3Y)xl%BzggP6
z^LPpV2&FvRiRo*>RMt)y8Nq%Y&Abu@oM*>!q(|8&Y`@4>TUb`sHciY(@jgSB$dspr
zCAU~FOL<dGOnru{70x#6Bb<N69yeuzvcuUkEWBvR$%KGPHqMwS7jA!MmFDvG?F`*r
z`{RL^Dbj=&zu9FnQi`v_bQz~7Kh_8@WZX(dUjH=BBhkMO89Uq(CK_=^jR@UQu#|IJ
zM&9{!;*R=EYf9%+X9;sHIT=s%b%RAV+;#ceEL$6Y*D@sEwh}yTxg<_LFUhiGZ+EO8
z{Lf)<M!|iTKfH8ntjpasC`s`^IH=^@jfDAsaf?{tV@vL>AyX+lcHs`0$REmkzsax0
zE<oncTA167JK0noVYSiJ;Q1jG_4&S_9>gh0ry0CyVnh8G<Z8c6a2?LgF=snD5X;mt
zqGjZ;y)A1am<4l%9P>da4&@w4E2wND)KBD|u=1=Qnt|2df|2VT5N=Kucl~g8n|U7-
z*GpVS2wkUgCWi8!4Wl=#IgF9T*W?OaqqufW<b88GWIb-V7_rUtFnTVRBrmPq%Ct!E
zml#|SZqDUCv2y*K@m;1XE}^i(C?Pvu+(LMVdCkXEw!+zZM!2$wdqCPIyJy1oRa^<f
zbjtQ)uS<IwmBZNymg~57FUWb*vO=F2ezp_&Im-}6`SFf$XAN&p{+xMRc)x}ZG*`6v
zuAR}><LQ~z;kP@r-*l@~jL7-Ue+Pl8Eu&KP&`pVcbj&khPcN^U?0fE{kc$n5z718y
zfP+tItO6{981Zmx_QIv<<mj9y9kS4n$}h4c2S~FIp|W|P9YJcwp2Pf55xYnDbeKOP
z7EsM@A>%mz*-QkdOW+~2{+u~a)3+uAZl9;=n@D&*gtdjx-n=<{Sj&qgOtTL>b9gaX
zX%6D*c02GCZOy^u&)`H3EngapLIWf4o6XpP>;kof<};`-AcGgkfY*ZdA*Y177f?be
ztdjsQ5nz%}vw7uI)&{;`;CqN_e1*e0UZwDxb~xK|dFD>vQ*FLwMn^~n(|m)O7jX+u
zAg`QM+>gGjDU8;lhDA_(5j7}A0kTXeO(1!Hk~c&5SPVlh(ZWO+c^xF_B>fU^LkhB{
z1o6fYew!%#n9Pd0yn<>8{sa7gcO;3&G}*n`k8O+kB(8ei?{m$o26Ut*3)lC0h^aCm
z7a7z;t{!`TI0QKL9P)rT_qiSg*W*G4@+@Qucp-s)Lhn4(^CzsYAbKjc;_5fxx|J96
zyGClN40EW9S4i{<NZ(2=plxgpvS{7-hIFkQ<lC@4vw*zI)RJT_VH*i(yDPldWN2-{
z^$HT4!HbuvVZ{|HTk8zzgg|6#TcFb1CF;I!SNLJ#>{^`VKZ~>KDKR6{=E^(%`zAc-
z4!=C2DH=+98$s$9qFU->D$A&5k>#@^+s&{G`q6!~1i}+)U~yI4n<}$ItB>j-!5@`3
z?+o)^=tORW;@Q!*MovCZ8bHcUldGuYe#qR8+E0K#YgpTqoxWzUkPwN6jW;~DH+Z>_
z^VV|*jZ1AZjM{-~mVvs8IOo6)WVQq@?Lcd;Kw->IYE8Q|q@RFJX}nmydbq}i7}ciT
z`&i~>d#e^ABo((o={4R7JUv+6>69?@U#~vNU2jCpy;zeb0a7KCt;Mj3A+0ft$md(C
zTO3OAnRH?4gDd*PR{N`cpGkP>LShn2`$8hPW1(I7h5obpZ8WYhyLQq#M8eI3+<dwt
z-PV-!Ftz&Z8$*+Gp3@53$?y9=lh?5lYypaA&(R)X<iFHPdLCz;LaBF`|I53Ho!gNv
zi;aRiJ5;~jl7BK|(~2?w%R=^Ebd_R<+2%Edfz3@@r`kLZdw7N>LE@_UU~!#SsaeBS
zCXZ~s?eL#)YFXcyTGBmHM=nHpvP7D0)CK#m*&na6@AT$mMMk{m^A8d#2~neerD*pl
zVb^tZ-QN(r3tg8BRo5GT-P}c-IK-azGuk`|w<j0T1vlvKwErNVfvq5KIje-zH;~az
zD7b+KV;5-Ck<l*bbra{(;RTr^i9$;n6LA>BhReJ{Z9jCV>(7GC8)IvZO-#PpWEs&l
zT6<%~5CoZS0Bs7VfS3%FaRYLOvTEp2fYEakMin6Yd*C&k5DrL$dvK`$HMkFzU06q`
zj$wFE+(Is6!1WZ#2qSMHmrywA&Desk3u~q_Eu7u^wqjCI`RWw)>48(wa+=GiP4DT{
zpBKnFF@N00Sw4qGbS-kzJOInngn7sR5G3_e(_Z2YV+xrTQ^ZqP@E>M^0OVrciE_Cw
z(Vs(;IKsuekat(l?vxudcu&K`P5XwoDvx6PBzKa~5QlLQO%~Cs5`%W|8JdvYQ*+n7
zn;l0%Lu<Scq%NS(0P4QW(hh8B`DNSSZwHi_>n%vmrSU_uhB(^V!kt3C1JO@67ns|;
zN;T`QzqV(;&Se=lGFLfmZ$erZiuXo511Goe;$=HN(&A&k$Q#RUxJ@?cl9WWA%_yud
z!i=8Nuv7>IA11ds6=ZvKX@Kcj!Gkn>6y+&yRV)l1enG0(tCks~ilbt>92!8nC!`}6
zb2EBk32wx#{ZY}QOe_C%bW2Vsj65abq^+8!G~%=_v&~v{h?u<m-pFFrzNDQJZUFML
zZzpApJLnN_vCyd0fs0NIc5mLpd`+=+=ke{&p2kJ`-nhsjiyGU(&)-k?bouaZ$Lh!f
z)DaRMR8#4qp?0KUvSuGiMQ!iWnyh^X&-RfMwd5{u!x8sG>Rk-aN+=b`{3kLmhQ%i^
zxrc-r!RsDx#VUGba8WJ(u_)^6*6(!po7U-~sQKMnd=X|m;JY!ZIC<@o3DK|bZQYa|
zxM$c{l4J?_-N;3#t|f$zAlHsvvE-qs;vxTvS62_KY2~?Y*R5HV0|xtiYD?4D{4e$~
zh;LG#Qo33R184Krpm@qV6JrP5e-K?{aeT?-p(EjNegRhNu(47E%-Kp^tGc$oe)Z5X
zFFqW7?U8)o+aIJEB?fWXzXRF2i0>$3oXoWDdSt7@^I2s{kC|Ebc3?O~d?&eC9Glux
zj|i`x@}C%jZsvON)a8Mt*Rme1_i0)eLNYzsTXN=0L=PT`{<C<_KP6zhX@g&SNA7da
zbx|~{n9Dt-8uU6pAHhZ~sh;ZBA8It~M!T7Qi8-xVp4{DsqWZLXh$!bna5A0rIul;-
z*5rWeq{W;A9v-8kZ%Srw>au6j^V|g!C+}0x#jd^%xOjjg6(JP7;3tX?Wcp}ueaUwv
z8BZ@+*Eod<Q$YGu>T3OT*!hxX03E(E8<@1AHRQl_O4ofBTUh$&2_0YIl0e#X(t11<
zr*ws|@D&Xh-9@qaB-iYNX7Jz@&2xG=ynjVcmYHSA$m8qFmK;|rk1fsAklTvbS)Y^I
z4Q^rMiRm`?uW%Q`)`b>BdY$|@>i!G5!$@5%?$Dy75!W;?qUeQ9xk=QRuqVnXIsYO~
z-xhId8MOoqJ%DN(L&0m@X*mLn^mL~!%aE>wUS((~8Pa+1$|p&G{V1A3b)Rw8+>>U=
za}w8XP+CR{ik^5;96UG!={(i*kn5k|SI(;y`8|*A^zw_Z9Gx+|V#Ueu3Q5&2pqWQ{
z-<{>WN=$c^Vk;~*X8Lx>jJ-%z?2PZ8dKtLBp(^U6tlI?go{&gscMydQ5_@5~UdjQ+
z&QN-s0Ja^ZuFw_12?R903z=rpf}jqyltslI8#Ry{crNZIA2>lWc?qh~>jMV)j<+ah
z0!>oT?-2b{_X#TBqFS#JFEzn)kgkssn_v~pt-#f-#ZH)NX@qbivdgXHS)u~tWeEJP
zpv{`@9n$$j)a2vd;rbwmeuu&KO>BZya8)Asi=D6<evv;#8{$>cz>Z5fxm^j}E0Mbf
zMpPpATgaXJk8<BziQFea4$}4Qk#6Ws&z-7SR_EHo@9%sV?pM9gv;5{_$%Rtk<iO9J
zwQolHt4C30$6BrIqW^ticGU5mS>);}W@UXSxSk~kBO%OGJ^ReRj}LzvI%;BKY!`=p
zcCLufN;R5|fFwg!sj}<Y?awEFtsB%OHQ+(w@KF+*X{eM1y)CHk1pZa?+rj5!)W%Tb
zw<SulV^NllJbR17r-(*RyASB5kKpxz?p!|$>Ba(H>$ZKs==cC9KA>ZoOMqeYPGVez
z46cbywfH2gyCnA0wjdwPm_eLGy#eb8RW!UIuIBfU0;GT=$4DCgUPYceN3~#i`?53k
ztdY`-JzR4kPWJgfN#jbWKSp!JjIM`L9A2Aqw>z(}aDKY!g|zLd$kIuT*=@~7{w}Mw
zniKZLHSE#(^6JIMI}TyV6CvHbl$o)&R;s^#Ikf)C4<`QdkDf8DR?SdJsK?0BC_=Q6
z%F#W!s*_(();IaBkv6d(_ajL22|)~KHLOA%?y@cY`EN(2-<OhOzD@oZFL5HpNF2@6
zFhBeCKFTk>BAn{^a(#Zy_+>2-rME$pX+Jzl`p?v+S`(0;l%6Gzd?sC1w0ERtWm)g!
z@RTzyCHGFRq^o_u;%ke6;~+6sRbSq}tl6PcmXw|TsOjGD?yMw2s)jPq4kl;b{|kC;
zGtBscULAufG|ix1eRzV>^}$ee0_kIsE;~o*15YBo4}_kiUe`~7q+0wn5eiP?5qu2Q
z(%b;(l||?DE)ez=<KziA?c&txrCdPY?iUkF9_{@8o;A1`BI!$7NO720QF&EgQQn{6
zkd3RqfnPRihCl<(m<II0Y~0y*$R%{K$o0qe+A@vfL3s+JIZte_MXK(m*jbCMU5gia
zbq$X1D%xF)yPH1G?wX_rz7ZPq9)JZS_Y@}lI+RKpYw-(79hnuGeH9yPF?;Dq-yn{N
z{@7EG{*HiRi2BZppG$PV5MbV%-gKUvM!nuZwb+^eByjPtbVHEwbxg#Lw@3b*{c-ea
zmyyckyT`YYTMEq{dI|N2MvuCMzs>bP&-~4q*A7)&Fft$&R75r2$qh|u=ePR@iKp%k
zuZ%+%I^Ip087YfA`-(?oWBo8mq>W^Uv;BHGetnhR`Rc&VwXS-SW9UJWo;279dX60v
zQ2!hVt0(U|@=jx~^e@z|m^Sgqm~8jH2P8$uK~w^vM)wM+O4vT6!#~%jcua7bXd+SD
z!!5E_9qyZ%Rd;XszkZvRH}|OwUM9)AjGJTzh)OB`2yf$mDr$JhRjB%Tsw}dT#DaXA
zNhB;f>W$p2D{o$y-fq>U8;gC9AXWPWS+I!^o=R$WL?Y^Zffg)9n`FW3=!aJND|M5*
z&ZrQ-Q&Z!H!Hb{dmSJHje^Q%KP-FStYgXi-5bQA{^*Us!hKzV}s=EKeDD?o}Uw9TG
zK+}_Pgx$aBtBan4oL?Ar<=9kPH{gmU(7pkqwI7hCS`AAY@VN!~8#v9Nb*QF+A5P*-
zYXG-(<dbLkZyF|A22rNA)U{j5tO#P^#BZvFmIuodBqKk+$(cd=Ii$)qt7K|L-n`tT
zn^l%WPi=O#D@mHZU9wb5u^y=uA-`gNB+ME1sI9psa=mYlCXLk1Yi0D4AMvX=ND(Y0
zua%qM%Eae4ZRY0RGVy3>kAMSkY8cPRs6Iy_hLNe&)%JJePK|u9qx(?3cGjk<gA&u@
z$jh_{``dg5nXQ8oMkW>xEos=r!PnwrpBsyS^)Q^3iRX82VAnyD|4Mtm<b=<dJ<nzz
zlK5`KWo;Go{3@0&-}cd9MsVmm7=A%!_^!W%N`UmU#OhC3s;a(|XkUC)vLWxYWHWjl
zbl_z4XiHZC6a02)iO;V3NZ7$qMRnIvqJa*q?vpU<xD&%HA53|fSRnPD;)|PTA^lXi
zbcWQvR9;4p`(RvY>_9Ww9h}wO$5{(s8u|0P`Moyje96UQZ&c5NCMT+K1A2E*%Va9G
z&!wf~$Bi&*yK8ZBYQv1xq;02%m0UH%VM_1eFh_=4VqmRICcby*8+$F-aEiRLl}mJU
z2s=g|ESwBcyE(|je4(hF+P~QhxK;#H42(J)?GSGDUebf4Z*jD>hC5RjrK;!e&U5ar
zjIbW^tb9t-w_7DpD+G}jDe*aJ#htrZz263A4yZ17*F3e3l5{SEXNEFI@loo4K^yPi
zcfOZhJiO&;r-7=42#6#1UNZXLK2KAyn-SgALh}C~M%1`*1u1#Hw&29Drt1D3#+~gJ
zu+d@l=)Jr0I_HKWho!?P2REO`G&cS}U;dZj_XU~s<zL<U?2eM38^#sf3cJ5*+U7V5
z<hATP<>iz>!jt?L0gNz~i6>Rx{QrG2HdFsLZx<rh+`oRQApoMi$}oM8OqKjQS`Jo@
z#AFUWcH8`8!|y!xUFDzoN%F6zhO#$MJ;Hj@!G!umYl_p&?}}2z>#I%nyRyz_i+u(;
zbM8}ub{|IVv~MI_I>kY%iOf!{FMV;E=WzNinHH5ch4&`1wa(6#U0fo1Ok5aHY?&38
zoLW&wueXHmiOb~R)r<TqM3$*c{6<1fz%5gHLi9b6&H(&*gjd*G@P}(BWVmlSv*<=d
znOl*hk~Q=;lQ|KUJGf6@n19E8=YLyg=pHsr2Bhmfkcq4U4Z7J()<d1~q-ulZ$qtc;
zcC%v)`7J|5=sdWC|Mp@azepoNW-fChY|XDPtjtV}&1u4%$Vsxc%aO$HLAEB#kgeXF
zhK(*sSYs~R%8_;P7Y6!-G~6ysPg?8NGWl7Uv~K?YuA68{9iSt-5r+}|4+PZ`$5TtL
z_~jSfuMauAxcw?}5u-IE0zqTIk0Bp*Zc9r^VHOA1jGlHQD^w&ER95s*>e3`Slzt(r
z;w1VqSZ9TKCRw68(9%#Y(N{qOp%Z`T{u1BEY#~}s4uF&U?m}y$gQY?K{@aoZmBUdn
z-4A5ZzKZ&vY`*W@19_+2j6>r#DdMk`Ka@HGZM-C^t`X;$X{oDPQ{&#ghn4LrlS!mc
zA-8qDi*(;vCZ{+OK>Yi)DO;1qU9<aYcV*kB;@y%lTQqKs+>4azX57}YLHdsqPQ~UP
znEm_MpOo3q9Fhpc(Q#CxP*eZ;POB#V`0=&Y+3oALE2LtG*42`tB@U<NB2EeWtf?Wj
zZ{dP9DK{DG7M9-o`b@FJ-8j4U+RQ*)q$BxC97fyec~V8NSHS%1uYW2&<l9Gc_bRCh
z(=JI)Cyxc)SqF86pMB36^E2H~c>0vQUe&svBwxz+*r}>YUJUJ?{WE2f6Z4<r-SC0L
z$yCX`D9;$IyvfJ3TyOHN;J<~kzqEbl4EXW=#o`NY4w7O&{|9)x3(Kp%JT@6x*!sbp
zBVAVoMeiU_36!JsM#$%jL9f0%H~(#L^A&0D7LLAK^!Yh?kD!s~irmbJT=HK_>b{mK
zc23<a{odC276!SWUMiuwBFY{us9tHlf7P}Y#g&J~&7Cx5dRpTRA`VebzmZq>{DGG>
z&oZj#JJfZFpIk*cArb;FT}d}5jvia6Hx#J{o}^VnQONV(9vLCY>w+YSv!VJNz0z5P
z_GmtOY40;{nra!v&%D)0*ZqfFOco=TE1eQH`5Vj}!OmIimw9YH$$E5mT8PQw)T+80
zJ2{iSUIqE#FN$4udXuFhRYOvzI4t0k8Lw172p&9#4~cHw_0PhO1@{ckAxJw4L59}U
zipwA6pLsgI@2!6lPi!=g_YD4D5VuPNDc;}u+&ysYf?*r&Z+a%SyG<M>iqqvnVhP<+
z+t-m!Z=GkZ-g$p!qUGs5EYf|Yq}YUM4ChHHS!NOXZevTE42WNJUqSAiA|EZec!<Mf
zT_et>_?2EA=ewY1ZQGxhb1kn*@_r-EDy|V{b+!CWm*7phsqDeSt;_HCL7aXz;*g(G
zy)5C9>rm%}m8L}xxXh=<g_6``h~neKEvgRlv&?U*sx-Yv7cF>P_;r{B%92FFhT*(Y
z@mV><AvMA=_2lCNX2UjRHb%N1ZD7@#w{`p1!>3<aukJ}>k8R+zk~ZCug=FuXf7*07
zWY@QAT-q<&^5gO85~w4BxLp`&K|<Qb+w;w$inc6je&zHxlI@A1{69!p-yw^}i2B>h
zQP$&Mxs2?XVqlUnKdaGqWP{=`@r2TJ&cP|7)91~vZlqi@>2$8Hv36@E3`di=x;(Pv
z_^^`4HJwuVs-VK89@6He2Us&hYN2<U?fiy)503Mp-)yoy_r8@t#EIgt0KY&+saTv4
zIQ|Fpa=6ZY_x369lyZ-@9RBQ%-KF}&vI>)a@k<Xr3)xn2C2`_N$pGQV#-tC8$}b;0
z9^4Ny3Y*YS)brJZ$O;KG2|=i};$+*un}l9@x_Rq$t|4lg=7a>A200sfwfauaN$K;=
zwk0mC;rkDpmtrSTk%Iy5Ns&9m&G_(-VblHQp7x6MGQBH-dWmOM-F8=aX7Kzue#_47
Vs&=-W61WSgx?<$PZ;^Pp{vX{m!Ak%D

delta 9090
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
TtM+_om9=j{kg^#6cX0bZ3(#~V

diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin
index 605fd469dbca718faf65f787734906348e0d7cd9..15aca6ff03165ec4e7e902928dc4ab5db5a9eae0 100644
GIT binary patch
delta 46587
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
Zxxk{mRF(e<d;z70a4P}JXq2#>{|6(b{r3O>

delta 25568
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
b11w+(^Lt5&^&=O^cXdYcpU_8g)W!b?^qJh8

diff --git a/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin b/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin
index b97dc2696c77600dbc202f77e9a4346317f1f238..67abdd213051e450071c50abb64659671c46c63f 100644
GIT binary patch
delta 2214
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
AsQ>@~

delta 2199
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
Ef6JL3RR910

diff --git a/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin
index 151ad464fd80eff9c0061df81b2df1df8bce7487..92ed880f773badbbacde2ea6958e73e9d215df9d 100644
GIT binary patch
delta 1663
zcmb8uc|4SP9KdnU4C9zVt{O+<nNZAYYfY3ROJa<x5=*U$$v8GNWK`@>*+JUePt4NF
zRw|pjCk?_#qDG9-BIO!k*s#X2D91YXRofrCuUEgn-`~&g_xs~Juq-jKEK$s%fU)H!
zzQ2?aB$VTB+mx6~KjIflcx)DOiXx0>&SXS05fJF)08My>feCca5u@Dr>uJoOp*sJk
zsBq#?R^PeSU3;bO*@4mV{vRQjEr~8O$283Ks}By=+^?OFr9r-@?^3NSM3l_D4uw?+
zPk2#LpaMPB_tx{v-EXx<#(S%y)k(2w7_^R^x2W>jhp_f>Z5SO827u2HjCqHAM3;QJ
z{W$7^ES8*-YtLIOZ}p~G-)<K@j9ynrche9NVPQKEm7S#j?ym4g6JKH8e%i`1o0B{v
zxhHB(!RoXlD7?J#t%7<dQ+2VG^SU$^s|~X4<eOM?o8w5Oq>!NNRgi$92_>B4LBR|)
zmL(A|g^I&`C3f#LAQEBAvlsx6r_&CZ-BdiYT2OB-Q|r$xi@CPnd7+Xo6l&yB)BdNR
zzh2NGLY8V3vmL7irw^?G)zaT<nH?2HsgVr{M6LFs|19h@G+HabK;(=9xOs9Rr2Lqk
zwD01m(wMgN+#W2hN%sh!Y496Mts)K=4e`rtVUMIf06d=D@>001=JBB&<$h#V4$pv|
zLU(<g9sb=yTjhpHf%hlb{#yK*WJ1@Z19eJdTj<YiVP0iiL-Ju48F+d)VT0D19EYB0
zgXKT%gKIQ=%xaM+QrHP_MjA4B(3Zq)Oc<unZrYS9!~8Ne1ZXje=W^^PLj3}0j?Hc_
z>(4)Ob&Hdyh}g-Dv4|M)qIDHZ?Tpj!3NWYA+h5Ik%f1P9W8<2)j$^B3j(wP6q$RH@
z*pqVs0MEA_!!wZ-PW6y4*07mJ!F1#9*agT;AIO<o@_SICxAH(TjC&FSfTw3JnJ?$*
zxL4_pbNRk;N{@}HwSQ>uv)A2PN=Wf-WPg%YC8ZOnT67dnDkD*~G)r&hmXD0Ji^N_$
z)<l4Thf+RDmPI&#f`jU%r12Mtr^r2j4(xV6;NoY?*PyG{9p5I$8;>X_yqFGjFcH;3
zcqd)BhPP21Z|f#>`h7|*e(S~I%)?gkSX=MLNZQYfgE_BS2>E>%-2X)zQvE&AK7F%e
z-3RNH7W)MLUd_s!r3?ywtd>z=*Q@l2!dJT%F<TUnbX678c%~d!nr)We5L{9&K6XbT
zJn?1Hi?789k~LL<t8a(omaW(z3MfRt&`22y>P<u;WHjNtDPxtDLjO~y6!s2Dr&UnI
z*e+*EHEl>}8z4R%s>^EEmz8{HzV>^$Wf6isC<T0+W-lrNYU1F5hJ0%c(tV+yHO5sX
zWyJB2qW`_o&P`X)Sv#UK8ICCU#tTOP@>oz}dEkKi>uba!Y5;{`LyxN~BgW(;?+q1u
zZy5JuRUk_c)Z%Q@s^VxixkNej`K0*j0zxIt$04WZ&Y)i5T(2OK#B6KG3^mL3u`qtC
z+RMsA7mt~sFIhPKCG+|0%B?Glvvw;);YqT&nm~>AmQ*C+N&gjxQRF$4zoS;6+1wsy
zQ+~{{MTQa6%(j-cP*K2&G6rneP4<8_0&|HT9C$L6o<Alg5zIPm2z(254QsNJ_XB>g
zd89RhMX?7YLEd9BY5s7oSd+s0i|ww&n9-iE<{L4|;@L+#yB@uN%m3ow_>^;xAv65d
z!LuDCASqZ_RUyZ1g#+l)F<jY)s(banB>1ZvAj{Tr0}7C!Rm?Vn6P=ff9WMA4E)Q^G
zYmw5r-gV@8xgAwCaL2SeTSNf_C@`^ci_s4p$fJ>)^N#FZGQSJzO!pEJQrsMU5cLm8
yv;VLXojd|<b`n!MSa`VGWhpBn!c%c0qB1o*E&3aFW~$;kOWy>b*qt;0t?)OmaQV>y

delta 1599
zcma*mc{J2(7{GC_F=JPVvi}AV(T$jyETu>?%G}&kWQoYW6XrUy)wSmihEcLFS;8+y
zp{6X!G7@z&+@?ZK29Zb%uBB7=oI3a1_wUd5Iq&nwGqQ>tSw&Vou!ly=fQaU5I&H=v
zir7fkp>_~_m%^Ar747XPtf>#)l>`y+q-lp>Xs%abd!Xyympk^TXYwQ)Y5V6`wOG>T
z2E00^hMq1KZ2bo5K`+hgwzO5P@C_B5jm)V1lPI6Kl8h*FEDlI9!ZdlVLwMT35e0qj
zZ}QPwJkTy+@_{QcH73Jz?4i=wj_tbF<oTbghm>D{`Q3v7)Q`C+87C8`E;9c6G>pTE
zhxbiB*%L3*+L|~hb3E$pvrRS0=%#lH6Z4QQ>_$Uzkr7cWW!WW^AODH=TI*Kkc-Mx4
zrM%9d&{H`)RVCs*w>j3{`vqt`P@=^w#oWeh9$hKm;lx+dM0#T{M@qcZL)JzESJF-5
zuShM8{d=|HLqP%n9Y80(h-O_YS+6tgt~l3Et4c(VhKgy@B(gfMrY-!m#_ij;Sw9LI
z97R$(qSk9EZ7pp>0&7|FBQZp3eEzy&Lay$QHJ6qKZXawABnV&-HYW^~m3;9EsAyHY
zaN<QBeKlsWnJ#tOB0<@q*(tJdi}_=IQg6KpY@7TVK+J@k6Mm;u?&YoI>v`|alO6M|
z5-ilMQ8ZS}HLt3e;`uI3xf^4;mI#Gif&D^f^LaZblm+#xoOLXerV?j4{L5c&$SG2@
zA~a+x6wy8Xv5{e-Nv|{aRA|5(^mFmz#GD3tTx}b!7r?#slAMrgZ+q=stjr~%?xZi}
zRD_4rjr5}I8|)EGc%LXV@JM@8WxUg53Z*Ld`ZfkLDh1^4q$Q=9XMCW{Glr#8yDYJ;
z8w$325DuWNW1ahDZ?&nSL`G>#ZTPvnOc#Diwvl(Uymgrc4)e>}2am$C&3*uC=D&JB
z7N>E3%pa>Tc8*<SMo(-;UdoYBosl(p$g8xz^jE2rl!V@iv$0mYX>ig@C5+>P*YJ(L
zLhJH!!<#E&;ljjkl6)`(pkVJd9$xgo8^^lrIqb|6R#=3ZjhpjR*?<l%mydEjD8eH*
zCK1s>LKAkuv>tITG&!TXqMFyL^!Ddit5;`Bk@1k*AZ$eU&zq2{EPl?c{TJ13E^2Ej
zww6>q@M6U1_s1GFuLnyfhx`{i8_AeNt=;FoQ#f^KS%6al0kbCRQIHe%FpesntiXs9
zXX#^(7{~Td=9Kt)ur};H_#9)$^z{wM>@5IKg;3xQCtN+NDYh0<^##CMO;D6C?U<u0
z7djvK<LFZQ{AFLKZLG`pL2cChRVu!Tv0fLi)d(t=C=lg>ntYTqk0tcyp2=DuawJBm
z@UnEG2QDf-wBwf8Ey-5WhjY8k0LhjuO16~+HJc|x){q935GRqR3URmzL?cQFX4`h2
ztjQohwwRQdHq>Zn+36K;`$M^QE}Nwx=HU40x63ZqW<IfwjJ_&ykE~tDV}x;>PxUs@
zU-0nwNvW|>lI(l9sU32FrYN6)P>dTkbl(-q<j`~L-GMG(Kl7tc@D40B^_nqhDu-qI
z$PqYTOzk!WMx3P8&qHK_HYg-}n*bxKJ_a}evb`zbhAyUsr17U9znC8*>z=8pXlN08
zk1D#tlSL@|ZFo6eCjNg7F=yMgd#vR9REX#txsqg*^|l1x9Zht%)oHtseLPa1?>~ol
z08U{FRn8JrBOoW8lYenfILyZ2?t0i5*m&k1%9_>i`#bdBAvppi;aDDZ#vZ&uK`FWU
zLczjev8nZUTo_1taz;^prjVtTzr9VwZIBYU|0|n#rzUBvXV)Sp*eb2ADnj;PVD@(F
aU9b4^z6axN(6O?~(zgQ?b-)Yo3;zQmf!bC8

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c2eb29494546567df4029048eaa6875bb3d29621..39c32a683156b9c3078c3271366ff1ace74990b1 100644
GIT binary patch
delta 35
tcmV+;0Nnq|1j+=Em;`W6tmBcK)DT%!0x06!{pNFLl24MR!!(nC0m?7)5oZ7Z

delta 35
tcmV+;0Nnq|1j+=Em;`Tn+%b`y)DU(6UZ*&3bma0M0ava4a@Ui90m>Xj5QG2#

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 01406ff8..1bc2e43a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,41 +11,30 @@
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3cab4ae3-9bca-4cb9-b7a2-2861bcc36b52" name="Default Changelist" comment="">
+    <list default="true" id="3cab4ae3-9bca-4cb9-b7a2-2861bcc36b52" name="Default Changelist" comment="20200104">
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/cache.properties.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshots.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/fileSnapshotsToTreeSnapshotsIndex.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin" 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/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____local_jars___E__android_workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_jars___D__workspace_icsupport_app_libs_okio_2_4_3_jar_unspecified_jar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_25_1_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_25_1_0_jar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.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/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" 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/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/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/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/AudioService.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.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/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/AlarmWakeUp.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.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/Logger.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.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/NetworkObservable.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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/SimSignalUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/icsupport.iml" beforeDir="false" afterPath="$PROJECT_DIR$/icsupport.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/okio/okio.iml" beforeDir="false" afterPath="$PROJECT_DIR$/okio/okio.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.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$/library/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/library/build.gradle" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -84,97 +73,97 @@
   </component>
   <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/bean/StringMessage.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-209">
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <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/utils/NettyConnection.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3459">
-              <caret line="480" column="55" selection-start-line="480" selection-start-column="55" selection-end-line="480" selection-end-column="55" />
+            <state relative-caret-position="205">
+              <caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
               <folding>
-                <element signature="e#7211#8727#0" expanded="true" />
-                <element signature="e#8726#8727#0" expanded="true" />
-                <element signature="e#28402#28403#0" expanded="true" />
-                <element signature="e#28499#28500#0" expanded="true" />
-                <element signature="e#29332#29333#0" expanded="true" />
-                <element signature="e#29370#29371#0" expanded="true" />
-                <element signature="e#32566#32567#0" expanded="true" />
-                <element signature="e#32593#32594#0" expanded="true" />
-                <element signature="e#35757#35758#0" expanded="true" />
+                <element signature="e#4682#4683#0" expanded="true" />
+                <element signature="e#4771#4772#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
+        <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="-114">
-              <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+            <state relative-caret-position="130">
+              <caret line="44" column="3" selection-start-line="44" selection-start-column="3" selection-end-line="46" selection-end-column="48" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+        <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="190">
-              <caret line="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
+            <state relative-caret-position="24">
+              <caret line="579" column="25" selection-start-line="579" selection-start-column="25" selection-end-line="579" selection-end-column="25" />
+              <folding>
+                <element signature="imports" 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/bean/Alarm.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="38">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <state relative-caret-position="471">
+              <caret line="72" column="75" lean-forward="true" selection-start-line="72" selection-start-column="75" selection-end-line="72" selection-end-column="75" />
+              <folding>
+                <element signature="imports" 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/utils/AlarmWakeUp.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="133">
-              <caret line="12" column="36" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
+            <state relative-caret-position="228">
+              <caret line="581" column="50" selection-start-line="581" selection-start-column="50" selection-end-line="581" selection-end-column="50" />
+              <folding>
+                <element signature="imports" 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/service/KeepAlive.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+          <provider editor-type-id="android-manifest" />
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="229">
-              <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="258">
+              <caret line="140" column="88" selection-start-line="140" selection-start-column="88" selection-end-line="140" selection-end-column="88" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="513">
-              <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
+            <state relative-caret-position="177">
+              <caret line="50" column="43" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
+              <folding>
+                <element signature="e#17063#17104#0" expanded="true" />
+                <element signature="e#17243#17284#0" expanded="true" />
+                <element signature="e#17375#17416#0" expanded="true" />
+                <element signature="e#17510#17551#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/service/Deliver.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="143">
-              <caret line="43" column="24" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
+            <state relative-caret-position="228">
+              <caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -183,10 +172,13 @@
         </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/utils/CustomNotification.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1627">
-              <caret line="120" column="41" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" />
+            <state relative-caret-position="2033">
+              <caret line="107" column="42" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="107" selection-end-column="42" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -202,36 +194,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>FLAG_UPDATE_CURRENT</find>
-      <find>sc</find>
-      <find>134217728</find>
-      <find>EqcAlgorithmInterfaceMethod1</find>
-      <find>waitForWifiListReply</find>
-      <find>268435456</find>
-      <find>simState</find>
-      <find>PassData</find>
-      <find>setSignalStrength</find>
-      <find>268435462</find>
-      <find>getInstance</find>
-      <find>getStatusBarIconState</find>
-      <find>isscre</find>
-      <find>cachedir</find>
-      <find>getExternalCacheDir</find>
-      <find>NetworkObservable</find>
-      <find>setHostAndPort</find>
-      <find>port</find>
-      <find>connectServer</find>
-      <find>MyThread2</find>
-      <find>is_allowed_in_sleep_mode</find>
-      <find>onHeartAlarm</find>
-      <find>LocationClient</find>
-      <find>rx</find>
-      <find>queue</find>
-      <find>onStartCommand</find>
+      <find>ACTION_ALARM</find>
+      <find>heart</find>
+      <find>isHeartrRateExists</find>
       <find>ACTION_EQC_ALARM</find>
-      <find>newAPi</find>
-      <find>send_at_to_update_lbs</find>
-      <find>cmcm_call_eiot_into_powersave_mode</find>
+      <find>mProtocolAPI</find>
+      <find>AP00</find>
+      <find>strncpy</find>
+      <find>Echo</find>
+      <find>message</find>
+      <find>new_socket</find>
+      <find>send</find>
+      <find>mDeliver</find>
+      <find>setHeartAlarm</find>
+      <find>ACTION_STEP_COUNT_ALARM</find>
+      <find>SLEEP_ALARM</find>
+      <find>WAKE_ALARM</find>
+      <find>setAlarm</find>
+      <find>YUN_ALARM_CHANGE</find>
+      <find>SimSignalUtil</find>
+      <find>queue</find>
+      <find>SocketStatus</find>
+      <find>socketStatusListener</find>
+      <find>Stat</find>
+      <find>ProcessReceiver</find>
+      <find>CustomNotification</find>
+      <find>setWakeupAlarm</find>
+      <find>Open</find>
+      <find>ALARM</find>
+      <find>setExact</find>
+      <find>status</find>
     </findStrings>
     <replaceStrings>
       <replace>CMDSPLIT</replace>
@@ -246,9 +238,7 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/bean/serverStatus.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/location.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Config.java" />
@@ -264,12 +254,8 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Update.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/VoiceContent.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ParseUpdate.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/PassData.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java" />
-        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
@@ -277,23 +263,37 @@
         <option value="$PROJECT_DIR$/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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/MainActivity.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/LocationClient.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/adapter/protocolAPIHelper.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/utils/ServiceUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.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/bean/heartRateStatus.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/utils/AlarmWakeUp.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java" />
+        <option value="D:/incar/Downloads/test_srv.c" />
+        <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/service/Initialize.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.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/utils/RxSocket.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Logger.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/utils/CustomNotification.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CameraUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.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/SynchronousTime.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="459" />
-    <option name="y" value="295" />
+    <option name="x" value="521" />
+    <option name="y" value="34" />
     <option name="width" value="1278" />
     <option name="height" value="728" />
   </component>
@@ -350,31 +350,9 @@
               <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="values" type="ddeffd01:AndroidResFolderTypeNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="library" type="feadf853:AndroidModuleNode" />
-            </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
               <item name="library" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-            </path>
-            <path>
-              <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
-              <item name="library" type="feadf853:AndroidModuleNode" />
-              <item name="java" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="watch_lib" type="cbb59c9e:AndroidPsiDirectoryNode" />
             </path>
             <path>
               <item name="icsupport" type="1abcf292:AndroidViewProjectNode" />
@@ -394,24 +372,28 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="android.sdk.path" value="E:/Android/sdk" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../eqclauncher/library" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils" />
     <property name="not.eligible.for.single.variant.sync" value="true" />
     <property name="project.structure.last.edited" value="Dependencies" />
     <property name="project.structure.proportion" value="0.17" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
   </component>
+  <component name="PsdUISettings">
+    <option name="LAST_EDITED_BUILD_TYPE" value="release" />
+  </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.ic.protocol" />
       <recent name="com.ic.protocol.utils" />
+      <recent name="com.ic.protocol.service" />
+      <recent name="com.ic.protocol" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\workspace\icsupport\app\src\main\java\com\ic\protocol\utils" />
       <recent name="D:\workspace\icsupport\app" />
       <recent name="D:\workspace\icsupport\app\src\main\java\com\ic\protocol" />
       <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol\bean" />
       <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol\service" />
-      <recent name="E:\android_workspace\icsupport\app\src\main\java\com\ic\protocol" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -520,9 +502,10 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1858" height="1096" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49541286" visible="true" weight="0.22135706" />
+      <window_info id="Captures" order="0" sideWeight="0.50390625" side_tool="true" visible="true" weight="0.19299221" />
+      <window_info content_ui="combo" id="Project" order="1" sideWeight="0.49609375" visible="true" weight="0.19299221" />
       <window_info id="Structure" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" sideWeight="0.5045872" side_tool="true" weight="0.3293461" />
       <window_info id="Build Variants" order="4" side_tool="true" />
@@ -531,15 +514,15 @@
       <window_info id="Resources Explorer" order="7" />
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Run" order="0" />
-      <window_info active="true" anchor="bottom" id="Logcat" order="1" visible="true" weight="0.52286905" />
-      <window_info anchor="bottom" id="TODO" order="2" weight="0.32917964" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.2765073" />
+      <window_info active="true" anchor="bottom" id="Logcat" order="1" visible="true" weight="0.46777546" />
+      <window_info anchor="bottom" id="TODO" order="2" weight="0.32848233" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.42099792" />
       <window_info anchor="bottom" id="Terminal" order="4" weight="0.32744282" />
       <window_info anchor="bottom" id="Event Log" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="6" />
+      <window_info anchor="bottom" id="Version Control" order="6" weight="0.32952183" />
       <window_info anchor="bottom" id="Build" order="7" weight="0.32952183" />
       <window_info anchor="bottom" id="Android Profiler" order="8" />
-      <window_info anchor="bottom" id="Find" order="9" weight="0.4864865" />
+      <window_info anchor="bottom" id="Find" order="9" weight="0.35862786" />
       <window_info anchor="right" id="Capture Analysis" order="0" />
       <window_info anchor="right" id="Gradle" order="1" weight="0.3293461" />
       <window_info anchor="right" id="Theme Preview" order="2" />
@@ -561,11 +544,70 @@
           <properties />
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>298</line>
+          <properties />
+          <option name="timeStamp" value="41" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java</url>
+          <line>301</line>
+          <properties />
+          <option name="timeStamp" value="44" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.java</url>
+          <line>300</line>
+          <properties />
+          <option name="timeStamp" value="45" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java</url>
+          <line>25</line>
+          <properties />
+          <option name="timeStamp" value="46" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>129</line>
+          <properties />
+          <option name="timeStamp" value="47" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>128</line>
+          <properties />
+          <option name="timeStamp" value="48" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/protocolMainServer.java</url>
+          <line>124</line>
+          <properties />
+          <option name="timeStamp" value="49" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java</url>
+          <line>73</line>
+          <properties />
+          <option name="timeStamp" value="50" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Initialize.java</url>
+          <line>72</line>
+          <properties />
+          <option name="timeStamp" value="52" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="debuggerHistoryManager">
     <expressions id="watch">
+      <expression>
+        <expression-string>Build.VERSION.SDK_INT &gt;= 19</expression-string>
+        <language-id>JAVA</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
       <expression>
         <expression-string>&quot;33&quot;.split(&quot;#&quot;)</expression-string>
         <language-id>JAVA</language-id>
@@ -594,427 +636,449 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.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="-2570">
-          <caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" />
-          <folding>
-            <element signature="e#5048#5049#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="249">
+          <caret line="30" column="21" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Android/sdk/sources/android-25/android/provider/Settings.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileCache.java">
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="63" column="16" selection-start-line="63" selection-start-column="16" selection-end-line="63" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="171">
+          <caret line="9" column="30" lean-forward="true" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Android/sdk/sources/android-25/android/app/PendingIntent.java" />
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Update.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="447">
-          <caret line="247" column="30" selection-start-line="247" selection-start-column="30" selection-end-line="247" selection-end-column="30" />
+        <state relative-caret-position="228">
+          <caret line="12" column="3" lean-forward="true" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/VoiceContent.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/net/NetworkInfo.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="38" selection-start-line="38" selection-end-line="38" />
+        <state relative-caret-position="143">
+          <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#961#962#0" expanded="true" />
+            <element signature="e#1012#1013#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Intent.class">
+    <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="158">
-          <caret line="283" column="50" selection-start-line="283" selection-start-column="28" selection-end-line="283" selection-end-column="50" />
+        <state relative-caret-position="230">
+          <caret line="250" column="62" lean-forward="true" selection-start-line="250" selection-start-column="62" selection-end-line="250" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/String.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2109">
-          <caret line="170" column="15" selection-start-line="170" selection-start-column="15" selection-end-line="170" selection-end-column="15" />
-          <folding>
-            <element signature="e#4574#4575#0" expanded="true" />
-            <element signature="e#4625#4626#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-114">
+          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/PassData.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Config.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <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/ParseUpdate.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ConnectionListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="323" column="13" lean-forward="true" selection-start-line="323" selection-start-column="13" selection-end-line="323" selection-end-column="13" />
+        <state relative-caret-position="95">
+          <caret line="5" column="35" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="35" />
+        </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="493">
+          <caret line="601" column="8" selection-start-line="601" selection-start-column="8" selection-end-line="601" 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/service/base/AbstractInvokeHandlerService.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContextWrapper.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="222">
+          <caret line="368" column="18" selection-start-line="368" selection-start-column="18" selection-end-line="368" selection-end-column="18" />
+          <folding>
+            <element signature="e#10776#10777#0" expanded="true" />
+            <element signature="e#10827#10828#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/CheckSIM.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Intent.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="87">
-          <caret line="68" column="19" selection-start-line="68" selection-start-column="19" selection-end-line="68" selection-end-column="19" />
+        <state relative-caret-position="195">
+          <caret line="576" column="18" selection-start-line="576" selection-start-column="18" selection-end-line="576" selection-end-column="18" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#25167#25168#0" expanded="true" />
+            <element signature="e#25218#25219#0" expanded="true" />
+            <element signature="e#31946#31947#0" expanded="true" />
+            <element signature="e#31997#31998#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/AudioService.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/PendingIntent.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="85" column="33" selection-start-line="85" selection-start-column="33" selection-end-line="85" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="222">
+          <caret line="50" column="32" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest" />
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/AlarmManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="134" selection-start-line="134" selection-end-line="134" />
+        <state relative-caret-position="222">
+          <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/os/PowerManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="14" column="57" lean-forward="true" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
+        <state relative-caret-position="271">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+          <folding>
+            <element signature="e#407#408#0" expanded="true" />
+            <element signature="e#434#435#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="703">
-          <caret line="37" column="2" selection-start-line="37" selection-start-column="2" selection-end-line="37" selection-end-column="2" />
+        <state relative-caret-position="95">
+          <caret line="16" column="74" lean-forward="true" selection-start-line="16" selection-start-column="74" selection-end-line="16" selection-end-column="74" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#2697#2698#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="90" selection-start-line="2" selection-start-column="90" selection-end-line="2" selection-end-column="90" />
+        <state relative-caret-position="133">
+          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/util/Calendar.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
+        <state relative-caret-position="253">
+          <caret line="116" column="20" selection-start-line="116" selection-start-column="20" selection-end-line="116" selection-end-column="20" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#3672#3673#0" expanded="true" />
+            <element signature="e#3723#3724#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/pm/PackageManager.class">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Character.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="158" column="60" selection-start-line="158" selection-start-column="60" selection-end-line="158" selection-end-column="60" />
+        <state relative-caret-position="196">
+          <caret line="58" column="29" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICApplication.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ContextProxy.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="83" column="38" selection-start-line="83" selection-start-column="38" selection-end-line="83" selection-end-column="38" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="92">
+          <caret line="424" column="23" selection-start-line="428" selection-start-column="17" selection-end-line="428" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/library/src/main/java/com/eiot/watch_lib/LauncherCtrl.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Connection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2185">
-          <caret line="123" column="5" selection-start-line="123" selection-start-column="5" selection-end-line="123" selection-end-column="5" />
+        <state relative-caret-position="285">
+          <caret line="15" column="7" selection-start-line="15" selection-start-column="7" selection-end-line="15" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/DBHelper.java">
+    <entry file="file://D:/incar/Downloads/tcp_server.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="959" column="3" lean-forward="true" selection-start-line="959" selection-start-column="3" selection-end-line="959" selection-end-column="3" />
+        <state relative-caret-position="-4712">
+          <caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContentProvider.class">
+    <entry file="file://D:/incar/Downloads/test_srv.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
-          <folding>
-            <element signature="e#782#783#0" expanded="true" />
-            <element signature="e#833#834#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="95">
+          <caret line="407" column="51" lean-forward="true" selection-start-line="407" selection-start-column="51" selection-end-line="407" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/ICContentProvider.java">
+    <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="-301">
-          <caret line="137" column="83" selection-start-line="137" selection-start-column="83" selection-end-line="137" selection-end-column="83" />
+        <state relative-caret-position="-310">
+          <caret line="93" column="2" lean-forward="true" selection-start-line="93" selection-start-column="2" selection-end-line="93" selection-end-column="2" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/CrashHandler.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/TelephonyManager.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="56">
-          <caret line="98" selection-start-line="98" selection-end-line="108" selection-end-column="54" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#3004#3029#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="218">
+          <caret line="66" column="43" selection-start-line="66" selection-start-column="28" selection-end-line="66" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/ContextWrapper.class">
+    <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="320">
+          <caret line="220" column="43" lean-forward="true" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <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="216">
-          <caret line="165" lean-forward="true" selection-start-line="165" selection-end-line="165" />
+        <state relative-caret-position="282">
+          <caret line="90" column="70" lean-forward="true" selection-start-line="90" selection-start-column="70" selection-end-line="90" selection-end-column="70" />
           <folding>
-            <element signature="e#4410#4411#0" expanded="true" />
-            <element signature="e#4461#4462#0" expanded="true" />
+            <element signature="e#612#1023#0" expanded="true" />
+            <element signature="e#1022#1023#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/subjects/BehaviorSubject.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Util.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="154" column="16" selection-start-line="154" selection-start-column="16" selection-end-line="154" selection-end-column="16" />
+        <state relative-caret-position="196">
+          <caret line="375" column="24" selection-start-line="375" selection-start-column="24" selection-end-line="375" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/Constants.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1102">
-          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+        <state relative-caret-position="234">
+          <caret line="247" column="76" selection-start-line="247" selection-start-column="66" selection-end-line="247" selection-end-column="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/Connection.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="133">
-          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
+        <state relative-caret-position="350">
+          <caret line="25" column="62" selection-start-line="25" selection-start-column="62" selection-end-line="25" selection-end-column="62" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/BaseService.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/Observable.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        <state relative-caret-position="19">
+          <caret line="7927" selection-start-line="7927" selection-end-line="7927" />
+          <folding>
+            <element signature="e#412406#412407#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/observers/SafeSubscriber.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
+        <state relative-caret-position="161">
+          <caret line="138" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Runtime.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.0/d4a0c3bc36ac0ece84cdf7aa08b18c344b467238/rxjava-1.1.0-sources.jar!/rx/internal/schedulers/ScheduledAction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="59" selection-start-line="59" selection-end-line="59" />
+        </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="165">
-          <caret line="224" column="25" lean-forward="true" selection-start-line="224" selection-start-column="25" selection-end-line="224" selection-end-column="25" />
+        <state relative-caret-position="190">
+          <caret line="391" column="17" selection-start-line="391" selection-start-column="8" selection-end-line="391" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#2519#2520#0" expanded="true" />
+            <element signature="e#2555#2556#0" expanded="true" />
+            <element signature="e#7855#7856#0" expanded="true" />
+            <element signature="e#7889#7890#0" expanded="true" />
+            <element signature="e#10281#10282#0" expanded="true" />
+            <element signature="e#10316#10317#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/Enum.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        <state relative-caret-position="161">
+          <caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+          <folding>
+            <element signature="e#373#374#0" expanded="true" />
+            <element signature="e#424#425#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StringMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
-          <caret line="91" column="69" lean-forward="true" selection-start-line="91" selection-start-column="69" selection-end-line="91" selection-end-column="69" />
+        <state relative-caret-position="190">
+          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java">
+    <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="922">
-          <caret line="93" lean-forward="true" selection-start-line="93" selection-end-line="93" />
+        <state relative-caret-position="180">
+          <caret line="42" column="32" lean-forward="true" selection-start-line="42" selection-start-column="32" selection-end-line="42" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/MainActivity.java">
+    <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="159">
-          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+        <state relative-caret-position="228">
+          <caret line="15" column="50" lean-forward="true" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
         </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/utils/CameraUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="371">
+          <caret line="74" column="30" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="201" column="16" selection-start-line="201" selection-start-column="16" selection-end-line="201" selection-end-column="16" />
+        <state relative-caret-position="177">
+          <caret line="50" column="43" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
           <folding>
-            <element signature="e#3182#3183#0" expanded="true" />
-            <element signature="e#3271#3272#0" expanded="true" />
+            <element signature="e#17063#17104#0" expanded="true" />
+            <element signature="e#17243#17284#0" expanded="true" />
+            <element signature="e#17375#17416#0" expanded="true" />
+            <element signature="e#17510#17551#0" 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/utils/CustomNotification.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="693" selection-start-line="693" selection-end-line="693" />
+        <state relative-caret-position="2033">
+          <caret line="107" column="42" lean-forward="true" selection-start-line="86" selection-start-column="8" selection-end-line="107" selection-end-column="42" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/telephony/TelephonyManager.class">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/CustomDialog.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="95" column="24" selection-start-line="95" selection-start-column="24" selection-end-line="95" selection-end-column="24" />
+        <state relative-caret-position="228">
+          <caret line="119" column="21" selection-start-line="119" selection-start-column="21" selection-end-line="119" selection-end-column="21" />
           <folding>
-            <element signature="e#4052#4053#0" expanded="true" />
-            <element signature="e#4103#4104#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest" />
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="245" column="65" selection-start-line="245" selection-start-column="65" selection-end-line="245" selection-end-column="65" />
+        <state relative-caret-position="258">
+          <caret line="140" column="88" selection-start-line="140" selection-start-column="88" selection-end-line="140" selection-end-column="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/StringMessage.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="-209">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="161">
+          <caret line="70" column="25" selection-start-line="70" selection-start-column="25" selection-end-line="70" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/Deliver.java">
+    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/java/lang/String.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="43" column="24" selection-start-line="43" selection-start-column="24" selection-end-line="43" selection-end-column="24" />
+        <state relative-caret-position="161">
+          <caret line="170" column="15" selection-start-line="170" selection-start-column="15" selection-end-line="170" selection-end-column="15" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#4574#4575#0" expanded="true" />
+            <element signature="e#4625#4626#0" expanded="true" />
           </folding>
         </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="-1627">
-          <caret line="120" column="41" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" />
-        </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="513">
-          <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/service/KeepAlive.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="229">
-          <caret line="255" column="7" lean-forward="true" selection-start-line="255" selection-start-column="7" selection-end-line="255" selection-end-column="7" />
+        <state relative-caret-position="24">
+          <caret line="579" column="25" selection-start-line="579" selection-start-column="25" selection-end-line="579" selection-end-column="25" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.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="133">
-          <caret line="12" column="36" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="36" />
+        <state relative-caret-position="471">
+          <caret line="72" column="75" lean-forward="true" selection-start-line="72" selection-start-column="75" selection-end-line="72" selection-end-column="75" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/ic/protocol/bean/Alarm.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="38">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="57">
+          <caret line="23" column="42" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/app/Service.class">
+    <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="20" column="44" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="44" />
+        <state relative-caret-position="228">
+          <caret line="581" column="50" selection-start-line="581" selection-start-column="50" selection-end-line="581" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-25/android.jar!/android/content/Context.class">
+    <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="-114">
-          <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="28" />
+        <state relative-caret-position="130">
+          <caret line="44" column="3" selection-start-line="44" selection-start-column="3" selection-end-line="46" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <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/utils/NettyConnection.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3459">
-          <caret line="480" column="55" selection-start-line="480" selection-start-column="55" selection-end-line="480" selection-end-column="55" />
+        <state relative-caret-position="205">
+          <caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
           <folding>
-            <element signature="e#7211#8727#0" expanded="true" />
-            <element signature="e#8726#8727#0" expanded="true" />
-            <element signature="e#28402#28403#0" expanded="true" />
-            <element signature="e#28499#28500#0" expanded="true" />
-            <element signature="e#29332#29333#0" expanded="true" />
-            <element signature="e#29370#29371#0" expanded="true" />
-            <element signature="e#32566#32567#0" expanded="true" />
-            <element signature="e#32593#32594#0" expanded="true" />
-            <element signature="e#35757#35758#0" expanded="true" />
+            <element signature="e#4682#4683#0" expanded="true" />
+            <element signature="e#4771#4772#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/ic/protocol/LocationClient.java
index 3ec0e15f..c7b343c2 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/ic/protocol/LocationClient.java
@@ -339,18 +339,18 @@ public class LocationClient {
   }
   
   private void sendBatteryNotification() {
-//    if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) {
+    if (runtime.getHaveBatteryChange() && !runtime.getBatterychanging() && !this.batteryNotification) {
 //      connection.send(API.H05(runtime, "2"));
-//      this.batteryNotification = true;
-//    }
-//    if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) {
+      this.batteryNotification = true;
+    }
+    if (runtime.getBatteryLow() && !runtime.getBatterychanging() && !this.batteryLowNotification) {
 //      connection.send(API.H05(runtime, "1"));
-//      this.batteryLowNotification = true;
-//    }
-//    if (runtime.getBatterychanging()) {
-//      this.batteryNotification = false;
-//      this.batteryLowNotification = false;
-//    }
+      this.batteryLowNotification = true;
+    }
+    if (runtime.getBatterychanging()) {
+      this.batteryNotification = false;
+      this.batteryLowNotification = false;
+    }
   }
   
   private static StringMessage setNewKey(StringMessage paramStringMessage, String paramString) {
@@ -518,6 +518,7 @@ public class LocationClient {
     this.mLbsHelper.setOnWiFiInfoListener(new LBSHelper.OnWiFiInfoListener() {
           public void getWifiInfoCallBack(String param1String) {
 //            LocationClient.access$002(true);
+//            LocationClient.this.
             runtime.currentWifiInfo = param1String;
           }
         });
@@ -525,10 +526,10 @@ public class LocationClient {
   
   @TargetApi(Build.VERSION_CODES.FROYO)
   public void EqcAlgorithmInterfaceMethod3() {
-//    if (Deliver.is_active_location) {
-//      Deliver.is_active_location = false;
-//      getLocationWakeLock();
-//    }
+    if (Deliver.is_active_location) {
+      Deliver.is_active_location = false;
+      getLocationWakeLock();
+    }
     Settings.Secure.setLocationProviderEnabled(runtime.getContextProxy().getResolver(), GPS_PROVIDER, false);
     Single.just(null).observeOn(AndroidSchedulers.mainThread()).subscribe(new Action1<Object>() {
           public void call(Object param1Object) { LocationClient.this.nmeaListener.stopListen(); }
@@ -608,61 +609,61 @@ public class LocationClient {
   }
   
   public void resolveResult(int paramInt1, int paramInt2, int paramInt3, double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2, int paramInt4, float paramFloat3, long paramLong1, long paramLong2, double paramDouble4, double paramDouble5, int paramInt5, long paramLong3, int paramInt6) {
-//    int i = SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
-//    String str1 = runtime.getLatitude();
-//    String str2 = runtime.getLongitude();
-//    paramLong2 = runtime.getTimestamp();
-//    isLocationCallBack = false;
-//    if ((paramInt2 & true) == 1) {
-//      Logger.i("开机定位");
-//      performExecute(paramInt1, i, 0, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x2) >> 1 == 1) {
-//      Logger.i("周期定位");
-//      performExecute(paramInt1, i, 1, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x4) >> 2 == 1) {
-//      Logger.i("主动定位");
-//      performExecute(paramInt1, i, 2, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x8) >> 3 == 1) {
-//      Logger.i("SOS定位");
-//      performExecute(paramInt1, i, 3, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x10) >> 4 == 1) {
-//      Logger.i("获取位置信息");
-//      performExecute(paramInt1, i, 4, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x20) >> 5 == 1) {
-//      Logger.i("定时定位");
-//      performExecute(paramInt1, i, 5, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x40) >> 6 == 1) {
-//      Logger.i("实时定位");
-//      performExecute(paramInt1, i, 6, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x80) >> 7 == 1) {
-//      Logger.i("摇一摇");
-//      Runtime runtime1 = runtime;
-//      LocationClient locationClient = this;
-////      ServiceUtil.offerQueue(API.H15(runtime1, locationClient.mWifiInfo, locationClient.mCellInfo, 7));
-//    }
-//    if ((paramInt2 & 0x100) >> 8 == 1) {
-//      Logger.i("脱落报警");
-//      performExecute(paramInt1, i, 8, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x200) >> 9 == 1) {
-//      Logger.i("照相定位");
-//      performExecute(paramInt1, i, 9, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x400) >> 10 == 1) {
-//      Logger.i("获取经纬度");
-//      performExecute(paramInt1, i, 10, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
-//    if ((paramInt2 & 0x800) >> 11 == 1) {
-//      Logger.i("获取天气");
-//      performExecute(paramInt1, i, 11, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
-//    }
+    int i = SharPreferenceUtil.getPrefInt((runtime.getContextProxy()).context, LACATION_CYCLE, 3);
+    String str1 = runtime.getLatitude();
+    String str2 = runtime.getLongitude();
+    paramLong2 = runtime.getTimestamp();
+    isLocationCallBack = false;
+    if ((paramInt2 & 0x1) == 1) {
+      Logger.i("开机定位");
+      performExecute(paramInt1, i, 0, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x2) >> 1 == 1) {
+      Logger.i("周期定位");
+      performExecute(paramInt1, i, 1, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x4) >> 2 == 1) {
+      Logger.i("主动定位");
+      performExecute(paramInt1, i, 2, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x8) >> 3 == 1) {
+      Logger.i("SOS定位");
+      performExecute(paramInt1, i, 3, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x10) >> 4 == 1) {
+      Logger.i("获取位置信息");
+      performExecute(paramInt1, i, 4, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x20) >> 5 == 1) {
+      Logger.i("定时定位");
+      performExecute(paramInt1, i, 5, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x40) >> 6 == 1) {
+      Logger.i("实时定位");
+      performExecute(paramInt1, i, 6, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x80) >> 7 == 1) {
+      Logger.i("摇一摇");
+      Runtime runtime1 = runtime;
+      LocationClient locationClient = this;
+//      ServiceUtil.offerQueue(API.H15(runtime1, locationClient.mWifiInfo, locationClient.mCellInfo, 7));
+    }
+    if ((paramInt2 & 0x100) >> 8 == 1) {
+      Logger.i("脱落报警");
+      performExecute(paramInt1, i, 8, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x200) >> 9 == 1) {
+      Logger.i("照相定位");
+      performExecute(paramInt1, i, 9, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x400) >> 10 == 1) {
+      Logger.i("获取经纬度");
+      performExecute(paramInt1, i, 10, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
+    if ((paramInt2 & 0x800) >> 11 == 1) {
+      Logger.i("获取天气");
+      performExecute(paramInt1, i, 11, paramInt3, paramDouble1, paramDouble2, paramDouble3, paramFloat1, paramFloat2, paramInt4, paramFloat3, paramLong1, paramLong2, str1, str2, paramInt5, paramLong3, paramInt6);
+    }
   }
   
   public void start() {
@@ -738,6 +739,7 @@ public class LocationClient {
 
               this.lock.lock();
 //              LocationClient.access$1102(false);
+              LocationClient.mHasWifiResult=false;
               try {
                 if (KeepAlive.isConnected) {
                   this.condition.await(30000L, TimeUnit.MILLISECONDS);
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 b03653d7..55149faf 100644
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
@@ -8,203 +8,209 @@ import java.util.HashMap;
 public class protocolAPIHelper {
     private static final String TAG = "ICSrv." + protocolAPIHelper.class.getSimpleName();
 
-    private static final String CMDHEADER="IW";
-    private static final String CMDEND="#";
-    private static final String CMDSPLIT=",";
-    public enum CMD_TYPE{
-        AP00,
+    private static final String CMDHEADER = "IW";
+    private static final String CMDEND = "#";
+    private static final String CMDSPLIT = ",";
+    private CmdHandler cmdHandler=null;
+    public enum CMD_TYPE {
+        /*终端发起*/
+        AP00,//登录包
         BP00,
-        AP01,
+        AP01,//混合定位
         BP01,
-        AP02,
+        AP02,//多基站定位
         BP02,
-        AP92,
+        AP92,//CDMA 混合定位
         BP92,
-        AP03,
+        AP03,//心跳包
         BP03,
-        AP05,
+        AP05,//语音查询接收
         BP05,
-        AP07,
+        AP07,//语音上行
         BP07,
-        AP10,
+        AP10,//报警与地址回复
         BP10,
-        AP49,
+        AP49,//心率上传
         BP49,
-        APTM,
+        APTM,//基站校时及获取定位
         BPTM,
+        /* 服务器发起*/
         AP12,
-        BP12,
+        BP12,//SOS 号码设置
         AP14,
-        BP14,
+        BP14,//设置联系人白名单
         AP15,
-        BP15,
+        BP15,//设置定位周期
         AP16,
-        BP16,
+        BP16,//立即定位
         AP17,
-        BP17,
+        BP17,//恢复出厂设置
         AP18,
-        BP18,
+        BP18,//重启设备
         AP21,
-        BP21,
+        BP21,//设置计步开关
         AP28,
-        BP28,
+        BP28, //语音下行
         AP31,
-        BP31,
+        BP31,//关机
         AP33,
-        BP33,
+        BP33,//工作模式
         APXL,
-        BPXL,
+        BPXL,//测量血压
         AP84,
-        BP84,
+        BP84,//白名单开关
         AP85,
-        BP85,
+        BP85,//设置闹钟
         AP86,
-        BP86,
+        BP86,//心率血压测试周期
         AP89,
-        BP89,
+        BP89,//心率血压阀值设置
         UNKNOWN_CMD,
     }
 
-    private static HashMap<CMD_TYPE,String> cmdMap=null;
+    private static HashMap<CMD_TYPE, String> cmdMap = null;
 
     static {
-        cmdMap= new HashMap<CMD_TYPE, String>() ;
-        cmdMap.put(CMD_TYPE.AP00,"AP00");
-        cmdMap.put(CMD_TYPE.BP00,"BP00");
-        cmdMap.put(CMD_TYPE.AP01,"AP01");
-        cmdMap.put(CMD_TYPE.BP01,"BP01");
-        cmdMap.put(CMD_TYPE.AP02,"AP02");
-        cmdMap.put(CMD_TYPE.BP02,"BP02");
-        cmdMap.put(CMD_TYPE.AP92,"AP92");
-        cmdMap.put(CMD_TYPE.BP92,"BP92");
-        cmdMap.put(CMD_TYPE.AP03,"AP03");
-        cmdMap.put(CMD_TYPE.BP03,"BP03");
-        cmdMap.put(CMD_TYPE.AP05,"AP05");
-        cmdMap.put(CMD_TYPE.BP05,"BP05");
-        cmdMap.put(CMD_TYPE.AP07,"AP07");
-        cmdMap.put(CMD_TYPE.BP07,"BP07");
-        cmdMap.put(CMD_TYPE.AP10,"AP10");
-        cmdMap.put(CMD_TYPE.BP10,"BP10");
-        cmdMap.put(CMD_TYPE.AP49,"AP49");
-        cmdMap.put(CMD_TYPE.BP49,"BP49");
-        cmdMap.put(CMD_TYPE.APTM,"APTM");
-        cmdMap.put(CMD_TYPE.BPTM,"BPTM");
-        cmdMap.put(CMD_TYPE.AP12,"AP12");
-        cmdMap.put(CMD_TYPE.BP12,"BP12");
-        cmdMap.put(CMD_TYPE.AP14,"AP14");
-        cmdMap.put(CMD_TYPE.BP14,"BP14");
-        cmdMap.put(CMD_TYPE.AP15,"AP15");
-        cmdMap.put(CMD_TYPE.BP15,"BP15");
-        cmdMap.put(CMD_TYPE.AP16,"AP16");
-        cmdMap.put(CMD_TYPE.BP16,"BP16");
-        cmdMap.put(CMD_TYPE.AP17,"AP17");
-        cmdMap.put(CMD_TYPE.BP17,"BP17");
-        cmdMap.put(CMD_TYPE.AP18,"AP00");
-        cmdMap.put(CMD_TYPE.BP18,"BP18");
-        cmdMap.put(CMD_TYPE.AP21,"AP21");
-        cmdMap.put(CMD_TYPE.BP21,"BP21");
-        cmdMap.put(CMD_TYPE.AP28,"AP28");
-        cmdMap.put(CMD_TYPE.BP28,"BP28");
-        cmdMap.put(CMD_TYPE.AP31,"AP31");
-        cmdMap.put(CMD_TYPE.BP31,"BP31");
-        cmdMap.put(CMD_TYPE.AP33,"AP33");
-        cmdMap.put(CMD_TYPE.BP33,"BP33");
-        cmdMap.put(CMD_TYPE.APXL,"APXL");
-        cmdMap.put(CMD_TYPE.BPXL,"BPXL");
-        cmdMap.put(CMD_TYPE.AP84,"AP84");
-        cmdMap.put(CMD_TYPE.BP84,"BP84");
-        cmdMap.put(CMD_TYPE.AP85,"AP85");
-        cmdMap.put(CMD_TYPE.BP85,"BP85");
-        cmdMap.put(CMD_TYPE.AP86,"AP86");
-        cmdMap.put(CMD_TYPE.BP86,"BP86");
-        cmdMap.put(CMD_TYPE.AP89,"AP89");
-        cmdMap.put(CMD_TYPE.BP89,"BP89");
+        cmdMap = new HashMap<CMD_TYPE, String>();
+        cmdMap.put(CMD_TYPE.AP00, "AP00");
+        cmdMap.put(CMD_TYPE.BP00, "BP00");
+        cmdMap.put(CMD_TYPE.AP01, "AP01");
+        cmdMap.put(CMD_TYPE.BP01, "BP01");
+        cmdMap.put(CMD_TYPE.AP02, "AP02");
+        cmdMap.put(CMD_TYPE.BP02, "BP02");
+        cmdMap.put(CMD_TYPE.AP92, "AP92");
+        cmdMap.put(CMD_TYPE.BP92, "BP92");
+        cmdMap.put(CMD_TYPE.AP03, "AP03");
+        cmdMap.put(CMD_TYPE.BP03, "BP03");
+        cmdMap.put(CMD_TYPE.AP05, "AP05");
+        cmdMap.put(CMD_TYPE.BP05, "BP05");
+        cmdMap.put(CMD_TYPE.AP07, "AP07");
+        cmdMap.put(CMD_TYPE.BP07, "BP07");
+        cmdMap.put(CMD_TYPE.AP10, "AP10");
+        cmdMap.put(CMD_TYPE.BP10, "BP10");
+        cmdMap.put(CMD_TYPE.AP49, "AP49");
+        cmdMap.put(CMD_TYPE.BP49, "BP49");
+        cmdMap.put(CMD_TYPE.APTM, "APTM");
+        cmdMap.put(CMD_TYPE.BPTM, "BPTM");
+        cmdMap.put(CMD_TYPE.AP12, "AP12");
+        cmdMap.put(CMD_TYPE.BP12, "BP12");
+        cmdMap.put(CMD_TYPE.AP14, "AP14");
+        cmdMap.put(CMD_TYPE.BP14, "BP14");
+        cmdMap.put(CMD_TYPE.AP15, "AP15");
+        cmdMap.put(CMD_TYPE.BP15, "BP15");
+        cmdMap.put(CMD_TYPE.AP16, "AP16");
+        cmdMap.put(CMD_TYPE.BP16, "BP16");
+        cmdMap.put(CMD_TYPE.AP17, "AP17");
+        cmdMap.put(CMD_TYPE.BP17, "BP17");
+        cmdMap.put(CMD_TYPE.AP18, "AP00");
+        cmdMap.put(CMD_TYPE.BP18, "BP18");
+        cmdMap.put(CMD_TYPE.AP21, "AP21");
+        cmdMap.put(CMD_TYPE.BP21, "BP21");
+        cmdMap.put(CMD_TYPE.AP28, "AP28");
+        cmdMap.put(CMD_TYPE.BP28, "BP28");
+        cmdMap.put(CMD_TYPE.AP31, "AP31");
+        cmdMap.put(CMD_TYPE.BP31, "BP31");
+        cmdMap.put(CMD_TYPE.AP33, "AP33");
+        cmdMap.put(CMD_TYPE.BP33, "BP33");
+        cmdMap.put(CMD_TYPE.APXL, "APXL");
+        cmdMap.put(CMD_TYPE.BPXL, "BPXL");
+        cmdMap.put(CMD_TYPE.AP84, "AP84");
+        cmdMap.put(CMD_TYPE.BP84, "BP84");
+        cmdMap.put(CMD_TYPE.AP85, "AP85");
+        cmdMap.put(CMD_TYPE.BP85, "BP85");
+        cmdMap.put(CMD_TYPE.AP86, "AP86");
+        cmdMap.put(CMD_TYPE.BP86, "BP86");
+        cmdMap.put(CMD_TYPE.AP89, "AP89");
+        cmdMap.put(CMD_TYPE.BP89, "BP89");
     }
-    public protocolAPIHelper(){
-
 
+    public protocolAPIHelper(CmdHandler handler) {
 
+        cmdHandler=handler;
     }
 
-    private StringBuffer cmdbuf=new StringBuffer();
+    private StringBuffer cmdbuf = new StringBuffer();
+
     /*
     输入的字符串，如果有完整命令，返回 true
     否则返回 false
      */
-    public boolean isCmdStr(String msg){
-        int head_index=msg.indexOf(CMDHEADER);
-        if (head_index>=0){
-            int end_index=msg.indexOf("#",head_index);
-            if (end_index>=0)
-            {
+    public boolean isCmdStr(String msg) {
+        int head_index = msg.indexOf(CMDHEADER);
+        if (head_index >= 0) {
+            int end_index = msg.indexOf("#", head_index);
+            if (end_index >= 0) {
                 return true;
             }
         }
         return false;
     }
+
     private void log(String msg) {
-        Logger.log(TAG,msg);
+        Logger.log(TAG, msg);
     }
 
-    private void log(String function,String msg) {
-        Logger.log(TAG,function,msg);
+    private void log(String function, String msg) {
+        Logger.log(TAG, function, msg);
     }
+
     /*
     返回true 表示 cmd 全部解析成功
     返回false表示 cmd至少有一条解析失败，失败的数据归入buffer，下一次识别接着使用
     字符串通过#号进行识别。
     每个字符串如果发现 #，却又没有Header，“IW”则会被丢弃
      */
-    public boolean parserCmd(String cmd_msgbuf){
-        boolean iscmdComplete=false;
-        boolean ret=true;
-        String last_inCompletecmd="";
+    public boolean parserCmd(String cmd_msgbuf) {
+        boolean iscmdComplete = false;
+        boolean ret = true;
+        String last_inCompletecmd = "";
         cmdbuf.append(cmd_msgbuf);
         /*
         如果不是 #结尾，就认为 接收数据不全，置位。
          */
-        if (cmdbuf.toString().endsWith(CMDEND)){
-            iscmdComplete=true;
+        if (cmdbuf.toString().endsWith(CMDEND)) {
+            iscmdComplete = true;
         }
-        String [] cmdlist = cmd_msgbuf.split(CMDEND);
-        int listlen=cmdlist.length;
+        String[] cmdlist = cmd_msgbuf.split(CMDEND);
+        int listlen = cmdlist.length;
         /*
         如果解析出来的cmdlist不是空，且数据不是完整cmd则保留 最后一条数据到last_inCompletecmd
          */
-        if (cmdlist.length>0 && iscmdComplete==false){
-            listlen -=1;
+        if (cmdlist.length > 0 && iscmdComplete == false) {
+            listlen -= 1;
             last_inCompletecmd = cmdlist[listlen];
-            log("cmd not complete , "+last_inCompletecmd);
+            log("cmd not complete , " + last_inCompletecmd);
         }
-        for (int i = 0; i< listlen ; i++){
-            for(CMD_TYPE key: cmdMap.keySet()){
-               if ( cmdlist[i].startsWith(CMDHEADER+cmdMap.get(key))){
-                log("found cmd keyid=" + key+" ,keyname="+cmdMap.get(key)+" ,  "+cmdlist[i]);
-                if(key == CMD_TYPE.BP28){
-                    //如果是BP28则 后面的数据是音频，需要保留
-                    if ((i+1)<cmdlist.length) {
-                        //如果i+1 cmdlist确实在数组范围内，则可以进行数据处理
-                        handleCmd(key, cmdlist[i] + "#" + cmdlist[i + 1]);
-                        i++;
-                    }
+        for (int i = 0; i < listlen; i++) {
+            for (CMD_TYPE key : cmdMap.keySet()) {
+                if (cmdlist[i].startsWith(CMDHEADER + cmdMap.get(key))) {
+                    log("found cmd keyid=" + key + " ,keyname=" + cmdMap.get(key) + " ,  " + cmdlist[i]);
+                    if (key == CMD_TYPE.BP28) {
+                        //如果是BP28则 后面的数据是音频，需要保留
+                        if ((i + 1) < cmdlist.length) {
+                            //如果i+1 cmdlist确实在数组范围内，则可以进行数据处理
+                            if (cmdHandler!=null) cmdHandler.handleCmd(key, cmdlist[i] + "#" + cmdlist[i + 1]);
+                            i++;
+                        }
 
-                }else{
-                    handleCmd(key,cmdlist[i]);
+                    } else {
+                        if (cmdHandler!=null) cmdHandler.handleCmd(key, cmdlist[i]);
+                    }
                 }
-               }
             }
         }
 
-        cmdbuf=new StringBuffer().append(last_inCompletecmd);
+        cmdbuf = new StringBuffer().append(last_inCompletecmd);
         return ret;
     }
 
     /*登录*/
-    public static 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 static 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")
@@ -212,7 +218,7 @@ public class protocolAPIHelper {
                 .append(ds.getTotalStepCount()).append(CMDSPLIT).append(0/*rolltime*/).append(CMDEND).toString();
     }
 
-    public static String AP01(Runtime ds){
+    public static String AP01(Runtime ds) {
         //示例数据：IWAP01080524A2232.9806N11404.9355E000.1061830323.8706000908000102,
         // 460,0,9520,3671,
         // Home|74-DE-2B-44-88-8C|97& Home1|74-DE-2B-44-88-8C|97&Home2|74-DE-2B-44-88-8C|97& Home3|74-DE-2B-44-88-8C|97#
@@ -223,7 +229,8 @@ public class protocolAPIHelper {
                 .append(ds.getProtection()).append(ds.getWorkMode()).append(CMDSPLIT)
                 .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();
     }
-    public static 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)
@@ -234,28 +241,11 @@ public class protocolAPIHelper {
                 .append(CMDEND).toString();
     }
 
-    private boolean handleCmd(CMD_TYPE type,String cmd)
+    public interface CmdHandler
     {
-        boolean ret=true;
-
-        switch (type){
-            case BP00:
-                handleBP00(cmd);
-                break;
-            case BP01:
-                handleBP01(cmd);
-                break;
-            case BP03:
-                handleBP03(cmd);
-                break;
-            case BP28:
-                handleBP28(cmd);
-                break;
-
-        }
 
+         boolean handleCmd(CMD_TYPE type, String cmd);
 
-        return ret;
     }
 
     //处理 登录 BP00
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 354b1f7f..94123cec 100644
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/ic/protocol/bean/Runtime.java
@@ -55,7 +55,9 @@ public class Runtime {
   private String haveTry;
   
   private String host = "watch.jiai.pro";
-  
+
+  private String srvIP = "39.98.94.164";
+
   private String imei = "867155030001063";
   
   private String imei_cid = "";
@@ -84,7 +86,7 @@ public class Runtime {
   
   private String mccAndMnc;
   
-  private int port = 8090;
+  private int port = 20048;//8888;//8090;
   
   public String preCdmaInfo;
   
@@ -96,7 +98,7 @@ public class Runtime {
   
   private boolean shutdown;
   
-  private boolean testServerProp;
+  private boolean testServerProp=true;
   
   private long timestamp;
   
@@ -150,7 +152,7 @@ public class Runtime {
   
   public String getHaveTry() { return this.haveTry; }
   
-  public String getHost() { return this.testServerProp ? "121.42.192.174" : this.host; }
+  public String getHost() { return this.testServerProp ? srvIP : this.host; }
   
   public String getKey() { return this.key; }
   
diff --git a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java b/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
index 12c7ec00..a2950762 100644
--- a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
+++ b/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
@@ -13,7 +13,7 @@ public class heartRateStatus {
         HEARTRATE_TEST_FAILED,
     } ;
 
-    public boolean isHeartr8ateExists(){
+    public boolean isHeartrRateExists(){
         return true;
     }
 
diff --git a/app/src/main/java/com/ic/protocol/service/CheckSIM.java b/app/src/main/java/com/ic/protocol/service/CheckSIM.java
index 2d78532d..3742c753 100644
--- a/app/src/main/java/com/ic/protocol/service/CheckSIM.java
+++ b/app/src/main/java/com/ic/protocol/service/CheckSIM.java
@@ -11,6 +11,10 @@ import com.ic.protocol.bean.StringMessage;
 import com.ic.protocol.service.base.AbstractConnectionService;
 import com.ic.protocol.utils.Connection;
 
+import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
+import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;
+
 public class CheckSIM extends AbstractConnectionService {
   private static final String ACTION_SIM_STATE_CHANGED = "android.intent.action.SIM_STATE_CHANGED";
   
@@ -30,17 +34,18 @@ public class CheckSIM extends AbstractConnectionService {
   int[] simState = { 0, 0, 0, 0 };
   
   private boolean hasSimCard() {
-    int i = ((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState();
-    boolean bool = false;
-    switch (i) {
-      default:
-        bool = true;
-        break;
-      case 0:
-      case 1:
-        break;
-    } 
-    return bool;
+//    int i = ((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState();
+//    boolean bool = false;
+//    switch (i) {
+//      default:
+//        bool = true;
+//        break;
+//      case SIM_STATE_ABSENT:
+//      case SIM_STATE_UNKNOWN:
+//        break;
+//    }
+//    return bool;
+    return (((TelephonyManager)(this.mRuntime.getContextProxy()).context.getSystemService(Context.TELEPHONY_SERVICE)).getSimState() == SIM_STATE_READY);
   }
   @Override
   public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {
diff --git a/app/src/main/java/com/ic/protocol/service/Deliver.java b/app/src/main/java/com/ic/protocol/service/Deliver.java
index 8b8fad0a..04aab36b 100644
--- a/app/src/main/java/com/ic/protocol/service/Deliver.java
+++ b/app/src/main/java/com/ic/protocol/service/Deliver.java
@@ -132,9 +132,9 @@ public class Deliver extends AbstractConnectionService {
     String[] arrayOfString1;
     this.mConnection = paramConnection;
     this.mRuntime = paramRuntime;
-    String str5 = paramStringMessage.cmd();
-    if (str5.startsWith("SmsSet")) {
-      arrayOfString4 = str5.split(":");
+    String cmd = paramStringMessage.cmd();
+    if (cmd.startsWith("SmsSet")) {
+      arrayOfString4 = cmd.split(":");
       if (arrayOfString4.length > 1) {
 //        paramConnection.send(API.H13(paramRuntime, arrayOfString4[1]));
         if ("1".equals(arrayOfString4[1])) {
@@ -183,7 +183,7 @@ public class Deliver extends AbstractConnectionService {
       } 
       return true;
     } 
-    if (str5.equals("PUSH")) {
+    if (cmd.equals("PUSH")) {
       stringBuilder2 = new StringBuilder();
       stringBuilder2.append("response=");
 //      stringBuilder2.append(arrayOfString4.toString());
@@ -196,77 +196,77 @@ public class Deliver extends AbstractConnectionService {
 //          });
       return true;
     } 
-    switch (str5.hashCode()) {
+    switch (cmd.hashCode()) {
       default:
         i = -1;
         break;
       case 2010452830:
-        if (str5.equals("NewPicture")) {
+        if (cmd.equals("NewPicture")) {
           i = 5;
           break;
         } 
       case 1965687765:
-        if (str5.equals("Location")) {
+        if (cmd.equals("Location")) {
           i = 9;
           break;
         } 
       case 1474607358:
-        if (str5.equals("Check_bill")) {
+        if (cmd.equals("Check_bill")) {
           i = 3;
           break;
         } 
       case 1433513874:
-        if (str5.equals("NewVoice")) {
+        if (cmd.equals("NewVoice")) {
           i = 4;
           break;
         } 
       case 750870555:
-        if (str5.equals("RemoteWifiRate")) {
+        if (cmd.equals("RemoteWifiRate")) {
           i = 11;
           break;
         } 
       case 613936256:
-        if (str5.equals("RemoteHeartRate")) {
+        if (cmd.equals("RemoteHeartRate")) {
           i = 10;
           break;
         } 
       case 411981707:
-        if (str5.equals("Videojufenglogin")) {
+        if (cmd.equals("Videojufenglogin")) {
           i = 8;
           break;
         } 
       case -355520725:
-        if (str5.equals("RemoteCamera")) {
+        if (cmd.equals("RemoteCamera")) {
           i = 2;
           break;
         } 
       case -811859232:
-        if (str5.equals("GetVideoId")) {
+        if (cmd.equals("GetVideoId")) {
           i = 7;
           break;
         } 
       case -1391156271:
-        if (str5.equals("RemoteSetWifiRate")) {
+        if (cmd.equals("RemoteSetWifiRate")) {
           i = 12;
           break;
         } 
       case -1393994438:
-        if (str5.equals("Monitor")) {
+        if (cmd.equals("Monitor")) {
           i = 1;
           break;
         } 
       case -1754979095:
-        if (str5.equals("Update")) {
+        if (cmd.equals("Update")) {
           i = 0;
           break;
         } 
       case -1882613593:
-        if (str5.equals("OssFileDowload")) {
+        if (cmd.equals("OssFileDowload")) {
           i = 13;
           break;
         } 
       case -1893234925:
-        if (str5.equals("UrlDownloadPic")) {
+        if (cmd.equals("UrlDownloadPic")) {
           i = 6;
           break;
         } 
diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/ic/protocol/service/Initialize.java
new file mode 100644
index 00000000..38f7a1cb
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/service/Initialize.java
@@ -0,0 +1,108 @@
+package com.ic.protocol.service;
+
+import android.database.Cursor;
+
+import com.ic.protocol.Config;
+import com.ic.protocol.ICContentProvider;
+import com.ic.protocol.adapter.protocolAPIHelper;
+import com.ic.protocol.bean.StringMessage;
+import com.ic.protocol.service.base.AbstractConnectionService;
+import com.ic.protocol.utils.Connection;
+import com.ic.protocol.bean.Runtime;
+import com.ic.protocol.utils.DeviceInfoUtil;
+import com.ic.protocol.utils.Logger;
+import com.ic.protocol.utils.SharPreferenceUtil;
+import com.ic.protocol.utils.SimSignalUtil;
+
+import org.json.JSONObject;
+import org.json.JSONTokener;
+
+public class Initialize extends AbstractConnectionService {
+  private boolean hasChange = false;
+  
+  private SimSignalUtil mInstance;
+  
+  private int netWorkFlag;
+  private boolean initOK=false;
+  private int weatherOutTime = 30;
+  
+  public static boolean hasContacts(Runtime paramRuntime) {
+    Cursor cursor = (paramRuntime.getContextProxy()).context.getContentResolver().query(ICContentProvider.CONTACT_URI, null, null, null, null);
+    if (cursor != null) {
+      if (cursor.moveToNext()) {
+        cursor.close();
+        return true;
+      } 
+      cursor.close();
+    } 
+    return false;
+  }
+  
+  public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {
+    if (this.netWorkFlag > 5 && !this.hasChange) {
+      this.hasChange = true;
+      this.netWorkFlag = 0;
+    } else {
+      this.netWorkFlag++;
+    } 
+//    if (paramRuntime.getVideoID() == null)
+//      paramConnection.send(API.H139(paramRuntime));
+  }
+  
+  public void onAttach(Connection paramConnection, Runtime paramRuntime) { this.mInstance = SimSignalUtil.getInstance((paramRuntime.getContextProxy()).context); }
+  
+  public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) { return this.initOK ^ true; }
+  
+  public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
+    if (this.initOK)
+      return false; 
+    if (paramRuntime.IMSI() != null && !paramRuntime.IMSI().startsWith("46001"))
+      paramRuntime.IMSI().startsWith("46006"); 
+    int i = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_mode", 2);
+    int j = SharPreferenceUtil.getPrefInt((paramRuntime.getContextProxy()).context, "lacation_cycle", 3);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append(i);
+    stringBuilder.append("@");
+    stringBuilder.append(j);
+    Config.work_mode = stringBuilder.toString();
+    stringBuilder = new StringBuilder();
+    stringBuilder.append(" antioff =");
+    stringBuilder.append(Config.antioff);
+    Logger.i(stringBuilder.toString());
+    Config.sw_release_no = DeviceInfoUtil.getCustomId();
+    StringMessage stringMessage=new StringMessage(new String[]{protocolAPIHelper.AP00(paramRuntime)});
+    paramConnection.send(stringMessage);
+    return true;
+  }
+  
+  public void onDetach(Connection paramConnection, Runtime paramRuntime) { this.initOK = false; }
+  
+  public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
+    if (this.initOK)
+      return false; 
+    if (paramStringMessage.cmd().equals("Init")) {
+      this.initOK = true;
+//      try {
+//        paramRuntime.setKey(((JSONObject)(new JSONTokener(paramStringMessage.all()[1])).nextValue()).getString("KEY"));
+//      } catch (Exception e) {
+//        e.printStackTrace();
+//      }
+      if (!hasContacts(paramRuntime)) {
+//        paramConnection.send(API.H06(paramRuntime));
+        Logger.i("没有联系人");
+      } else {
+        Logger.i("有联系人");
+      } 
+//      EqcAlgorithmNative.native_EqcAlgorithmMethod3(1);
+      StringBuilder stringBuilder = new StringBuilder();
+      stringBuilder.append("imei_cid_key =");
+      stringBuilder.append(paramRuntime.IMEI_CID_KEY());
+      Logger.i(stringBuilder.toString());
+//      paramConnection.send(API.H139(paramRuntime));
+      this.nextService.processConnectionOpen(paramConnection, paramRuntime);
+    } 
+    return true;
+  }
+}
+
+
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 789261f9..6efb605a 100644
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/ic/protocol/service/KeepAlive.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.SystemClock;
+import android.util.Log;
 
 import com.eiot.watch_lib.LauncherCtrl;
 import com.ic.protocol.adapter.protocolAPIHelper;
@@ -22,7 +23,7 @@ import rx.functions.Action1;
 
 public class KeepAlive extends AbstractConnectionService {
   private static final long HEARTBEAT_TIMEOUT = 660000L;
-  
+  private static String TAG = KeepAlive.class.getSimpleName();
   public static boolean connectionError = false;
   
   public static boolean isConnected = false;
@@ -281,6 +282,7 @@ public class KeepAlive extends AbstractConnectionService {
 
   public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
     this.idleTimeMillis = SystemClock.elapsedRealtime();
+    Log.i(TAG,paramStringMessage.cmd());
     if ("heart".equals(paramStringMessage.cmd()) || "Link:OK".equals(paramStringMessage.cmd()) || "Shutdown:OK".equals(paramStringMessage.cmd()) || "Sport:OK".equals(paramStringMessage.cmd())) {
       if ("Shutdown:OK".equals(paramStringMessage.cmd()))
         paramRuntime.getContextProxy().shutdown(); 
@@ -297,7 +299,7 @@ public class KeepAlive extends AbstractConnectionService {
     public void onReceive(Context param1Context, Intent param1Intent) {
       boolean bool = param1Intent.getBooleanExtra("reboot", false);
       if (KeepAlive.this.mRuntime.getBatteryLow() && !KeepAlive.this.mRuntime.getBatterychanging() && !bool && !KeepAlive.this.mRuntime.isShutdown()){
-        //        KeepAlive.this.connection.send(API.H11(KeepAlive.this.mRuntime, "3"));
+//                KeepAlive.this.connection.send(new StringMessage(protocolAPIHelper.AP00(KeepAlive.this.mRuntime)));
       }
 
     }
diff --git a/app/src/main/java/com/ic/protocol/service/SynchronousTime.java b/app/src/main/java/com/ic/protocol/service/SynchronousTime.java
new file mode 100644
index 00000000..014fc1f4
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/service/SynchronousTime.java
@@ -0,0 +1,87 @@
+package com.ic.protocol.service;
+
+import android.os.SystemClock;
+
+import com.ic.protocol.adapter.protocolAPIHelper;
+import com.ic.protocol.bean.Runtime;
+import com.ic.protocol.bean.StringMessage;
+import com.ic.protocol.service.base.AbstractConnectionService;
+import com.ic.protocol.utils.Connection;
+import com.ic.protocol.utils.Logger;
+import com.ic.protocol.utils.NettyConnection;
+import com.ic.protocol.utils.TimeUtil;
+import  com.ic.protocol.bean.Runtime;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
+
+public class SynchronousTime extends AbstractConnectionService {
+  private boolean synchronousTimeOK = false;
+  
+  private void getCoder() {
+//    if (CoderFactory.getCoderFactoryInstance().getCoder() != null)
+//      Logger.i("成功获取");
+  }
+  
+  private void setDateAndTime(long paramLong) {
+    SystemClock.setCurrentTimeMillis(paramLong);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("设置时间");
+    stringBuilder.append(TimeUtil.getSystemTime());
+    Logger.i(stringBuilder.toString());
+  }
+  
+  public void onAlarmClock(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public void onAttach(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime) { return this.synchronousTimeOK ^ true; }
+
+  @Override
+  public boolean onConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
+    if (this.synchronousTimeOK)
+      return false; 
+    StringMessage stringMessage = new StringMessage( protocolAPIHelper.AP00(paramRuntime));
+//    byte[] arrayOfByte = (new StringMessageSocketEngine(paramRuntime.getHost(), paramRuntime.getPort() - 2)).request(stringMessage);
+    paramConnection.sendBlocking(stringMessage);
+//    if (arrayOfByte != null) {
+//      this.synchronousTimeOK = true;
+//      str = new String(arrayOfByte);
+//      StringBuilder stringBuilder = new StringBuilder();
+//      stringBuilder.append("成功返回");
+//      stringBuilder.append(str);
+//      Logger.i(stringBuilder.toString());
+//      str = str.substring(5);
+//      str = str.substring(0, str.length() - 1);
+//      SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd,HH:mm:ss");
+//      simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+08:00"));
+//      try {
+//        long l1 = simpleDateFormat.parse(str).getTime();
+//        long l2 = System.currentTimeMillis();
+//        StringBuilder stringBuilder1 = new StringBuilder();
+//        stringBuilder1.append("serviceTime=");
+//        stringBuilder1.append(l1);
+//        stringBuilder1.append("---localTime=");
+//        stringBuilder1.append(l2);
+//        Logger.i(stringBuilder1.toString());
+//        if (Math.abs(l1 - l2) > 60000L) {
+//          setDateAndTime(l1);
+//          return false;
+//        }
+//      } catch (ParseException str) {
+//        str.printStackTrace();
+//      }
+//      return false;
+//    }
+    return true;
+  }
+  
+  public void onDetach(Connection paramConnection, Runtime paramRuntime) {}
+  
+  public boolean onReceive(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) { return !this.synchronousTimeOK; }
+
+
+
+}
+
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 ec1f2284..57d731ae 100644
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -15,8 +15,10 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.PowerManager;
 import android.os.SystemClock;
+import android.util.Log;
 import android.widget.Toast;
 
+import com.ic.protocol.Constants;
 import com.ic.protocol.LocationClient;
 import com.ic.protocol.adapter.LBSHelper;
 import com.ic.protocol.adapter.protocolAPIHelper;
@@ -53,6 +55,10 @@ import java.util.TimerTask;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static com.ic.protocol.Constants.ACTION_EQC_ALARM;
+import static com.ic.protocol.Constants.HEART_ALARM;
+import static com.ic.protocol.Constants.SLEEP_ALARM;
+import static com.ic.protocol.Constants.WAKE_ALARM;
+import static com.ic.protocol.Constants.WEATHER_ALARM;
 
 public class protocolMainServer extends Service {
 
@@ -164,7 +170,7 @@ public class protocolMainServer extends Service {
 
     LocationClient locationClient;
 
-//    private Deliver mDeliver;
+    private Deliver mDeliver;
 
     private boolean mHaveSetWeatherAlarm;
 
@@ -190,6 +196,7 @@ public class protocolMainServer extends Service {
                 if (is_in_sleep_mode) {
 //                    CoreService.access$402(false);
 //                    CoreService.access$502(0);
+                    /*屏幕亮起时，如果在sleep模式，则唤醒各个进程*/
                     protocolMainServer.is_in_sleep_mode=false;
                     protocolMainServer.is_allowed_in_sleep_mode=0;
                     if (protocolMainServer.this.mKeepAlive != null)
@@ -198,9 +205,9 @@ public class protocolMainServer extends Service {
                 }
                 if (is_wifi_network_ok) {
 //                    CoreService.access$302(false);
+                    /*屏幕亮起时，如果wifi开启，则开启wifi*/
                     protocolMainServer.is_in_sleep_mode=false;
                     Util.turnOnWifiForConnect((protocolMainServer.this.runtime.getContextProxy()).context, protocolMainServer.this.runtime);
-                    return;
                 }
             } else if ("android.intent.action.SCREEN_OFF".equals(param1Intent.getAction()) && Util.isWifiIsOpen((protocolMainServer.this.runtime.getContextProxy()).context, protocolMainServer.this.runtime)) {
 //                CoreService.access$302(true);
@@ -220,18 +227,19 @@ public class protocolMainServer extends Service {
 
     private AbstractConnectionService getConnectionServiceChain() {
 //        DNS dNS = new DNS();
-//        SynchronousTime synchronousTime = new SynchronousTime();
+        SynchronousTime synchronousTime = new SynchronousTime();
 //        new ProcessEncryptionService();
-//        Initialize initialize = new Initialize();
-//        CheckSIM checkSIM = new CheckSIM();
+        Initialize initialize = new Initialize();
+        CheckSIM checkSIM = new CheckSIM();
         this.mKeepAlive = new KeepAlive();
-//        this.mDeliver = new Deliver();
+        this.mDeliver = new Deliver();
 //        dNS.setNext(synchronousTime);
-//        synchronousTime.setNext(initialize);
-//        initialize.setNext(checkSIM);
-//        checkSIM.setNext(this.mKeepAlive);
-//        this.mKeepAlive.setNext(this.mDeliver);
-        return mKeepAlive;
+        synchronousTime.setNext(initialize);
+        initialize.setNext(checkSIM);
+        checkSIM.setNext(this.mKeepAlive);
+        this.mKeepAlive.setNext(this.mDeliver);
+
+        return synchronousTime;
     }
 
     private void getDBFile() {
@@ -267,13 +275,20 @@ public class protocolMainServer extends Service {
         AlarmHelper.setCleanStepCountAlarm(this, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
     }
 
-    private void setSleepAlarm() {}
+    private void setSleepAlarm() {
+        /*每5分左右 休眠*/
+        AlarmHelper.setTimeAlarm(this, 0, 5, SLEEP_ALARM);
+    }
 
-    private void setWakeAlarm() {}
+    private void setWakeAlarm() {
+
+        /*每1 左右 唤醒自己*/
+        AlarmHelper.setTimeAlarm(this, 0, 1, WAKE_ALARM);
+    }
 
     private void setWeatherAlarm() {
         /*每6小时20分左右 更新一次 weather*/
-        AlarmHelper.setTimeAlarm(this, 6, (new Random()).nextInt(40) + 20, "com.enqualcomm.support.ACTION_WEATHER_ALARM");
+        AlarmHelper.setTimeAlarm(this, 6, (new Random()).nextInt(40) + 20, WEATHER_ALARM);
     }
 
     private void wakeUpFromSleep() {
@@ -389,7 +404,7 @@ public class protocolMainServer extends Service {
             stringBuilder.append(" paramInt2=");
             stringBuilder.append(paramInt2);
             Logger.i(stringBuilder.toString());
-            if ("com.enqualcomm.support.ACTION_ALARM".equals(paramIntent.getAction())) {
+            if (ACTION_ALARM.equals(paramIntent.getAction())) {
                 if (cmcm_call_eiot_into_powersave_mode() == 1) {
                     Logger.i("2 into powersave return");
                     return Service.START_NOT_STICKY;
@@ -400,15 +415,17 @@ public class protocolMainServer extends Service {
                     alarmCycle = SharPreferenceUtil.getPrefInt((this.runtime.getContextProxy()).context, "lacation_cycle", 3);
                 }
                 AlarmWakeUp.setAlarmWakeUpTime();
-                boolean bool = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();
-                if (!bool)
+                boolean screenon = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();
+                if (!screenon)
                     send_at_to_update_lbs();
-                if (Util.isConnectWifi((this.runtime.getContextProxy()).context) && !bool) {
+                if (Util.isConnectWifi((this.runtime.getContextProxy()).context) && !screenon) {
                     is_wifi_network_ok = true;
                     Util.turnOffWifiForSleep((this.runtime.getContextProxy()).context, this.runtime);
                 }
                 setAlarm(alarmCycle);
-                this.runtime.getContextProxy().sendBroadcast("com.enqualcomm.support.ACTION_EQC_ALARM", this.runtime);
+
+                //发送心跳间隔广播给其他应用
+                this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
                 this.locationClient.onAlarm(getWakeLock(alarmCycle));
                 this.connectionServiceChain.processAlarmClock(this.connection, this.runtime);
                 this.invokeHandlerServiceChain.processAlarmClock(this.connection, this.runtime);
@@ -419,7 +436,7 @@ public class protocolMainServer extends Service {
                 }
             } else {
                 StringBuilder stringBuilder1;
-                if ("com.enqualcomm.support.SLEEP_ALARM".equals(paramIntent.getAction())) {
+                if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) {
                     Logger.i("SLEEP_ALARM");
                     is_allowed_in_sleep_mode = 1;
                     FileOutputUtil.fileOutput(this, "alarmCycle", "SLEEP_ALARM  alarmCycle");
@@ -437,7 +454,7 @@ public class protocolMainServer extends Service {
                         return Service.START_STICKY;
                     }
                 } else {
-                    if ("com.enqualcomm.support.WAKE_ALARM".equals(paramIntent.getAction())) {
+                    if (Constants.WAKE_ALARM.equals(paramIntent.getAction())) {
                         if (is_in_sleep_mode) {
                             is_in_sleep_mode = false;
                             FileOutputUtil.fileOutput(this, "alarmCycle", "WAKE_ALARM  alarmCycle");
@@ -449,18 +466,18 @@ public class protocolMainServer extends Service {
                         setWakeAlarm();
                         return Service.START_STICKY;
                     }
-                    if ("com.enqualcomm.support.HEART_ALARM".equals(paramIntent.getAction())) {
+                    if (HEART_ALARM.equals(paramIntent.getAction())) {
                         if (this.mKeepAlive != null) {
                             this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
                             return Service.START_STICKY;
                         }
                     } else {
-                        if ("com.enqualcomm.support.ACTION_WEATHER_ALARM".equals(paramIntent.getAction())) {
+                        if (WEATHER_ALARM.equals(paramIntent.getAction())) {
 //                            this.mSendPairMessage.resetDownLoadConfig();
 //                            this.mSendPairMessage.startDownLoad(this.runtime, false);
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.ADD_DATAPOINTS".equals(paramIntent.getAction())) {
+                        if (Constants.ACTION_ALARM_ADD_DATAPOINTS.equals(paramIntent.getAction())) {
                             setUpLocationDataAlarm(28800000L);
                             if (this.upLoadDataPoints != null) {
                                 this.upLoadDataPoints.uploadCurrentLocation();
@@ -469,7 +486,7 @@ public class protocolMainServer extends Service {
                             Logger.i("upLoadDataPoints=null");
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.ACTION_STWORKMODE_ALARM".equals(paramIntent.getAction())) {
+                        if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) {
                             if (this.startAlarmCount >= 5) {
                                 alarmCycle = paramIntent.getIntExtra("lacation_cycle", 3);
                                 setAlarm(alarmCycle);
@@ -480,12 +497,8 @@ public class protocolMainServer extends Service {
                             FileOutputUtil.fileOutput(this, "alarmCycle", stringBuilder1.toString());
                             return Service.START_STICKY;
                         }
-                        if ("com.enqualcomm.support.UPDATE_SECRET_KEY".equals(paramIntent.getAction())) {
-//                            setUpdateSecretKeyAlarm();
-//                            this.invokeHandlerServiceChain.processUserRequest(paramIntent, this.connection, this.runtime);
-                            return Service.START_STICKY;
-                        }
-                        if ("com.enqualcomm.support.PASS_DATA".equals(paramIntent.getAction())) {
+
+                        if (Constants.ACTION_PASS_DATA_TO_CM_SERVICES.equals(paramIntent.getAction())) {
                             deliverDataToCmApp(paramIntent.getIntExtra("cmdId", 0), paramIntent.getStringExtra("cmdJsonData"));
                             return Service.START_STICKY;
                         }
@@ -536,7 +549,7 @@ public class protocolMainServer extends Service {
             i = 3;
         AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
         Intent intent = new Intent(this, protocolMainServer.class);
-        intent.setAction("com.enqualcomm.support.ACTION_ALARM");
+        intent.setAction(ACTION_ALARM);
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
         alarmManager.cancel(pendingIntent);
         long l = SystemClock.elapsedRealtime();
@@ -558,12 +571,25 @@ public class protocolMainServer extends Service {
         }
     }
 
-    public void setHeartAlarm() {}
+    public void setHeartAlarm() {
+        AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
+        Intent intent = new Intent(this, protocolMainServer.class);
+        intent.setAction(ACTION_ALARM);
+        PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
+        alarmManager.cancel(pendingIntent);
+        long l = SystemClock.elapsedRealtime();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("setHeartAlarm 20秒");
+        Logger.i(stringBuilder.toString());
+        int sleeptime=20;
+        Log.i(TAG,"setHeartAlarm");
+        alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + ( sleeptime * 1000), pendingIntent);
+    }
 
     public void setUpLocationDataAlarm(long paramLong) {
         AlarmManager alarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
         Intent intent = new Intent(this, protocolMainServer.class);
-        intent.setAction("com.enqualcomm.support.ADD_DATAPOINTS");
+        intent.setAction(Constants.ACTION_ALARM_ADD_DATAPOINTS);
         PendingIntent pendingIntent = PendingIntent.getService(this, 0, intent, FLAG_UPDATE_CURRENT);
         alarmManager.cancel(pendingIntent);
         alarmManager.setExact(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + paramLong, pendingIntent);
@@ -612,7 +638,7 @@ public class protocolMainServer extends Service {
     private WifiManager mWifiManager=null;
     private Config mConfig=null;
     private static Runtime mDevStat=null;
-    private protocolAPIHelper mProtocolAPI=null;
+//    private protocolAPIHelper mProtocolAPI=null;
 
 
     private void log(String msg) {
@@ -663,7 +689,7 @@ public class protocolMainServer extends Service {
             mDevStat =new Runtime();
             log("new mDevStat");
         }
-        if (mProtocolAPI == null) mProtocolAPI = new protocolAPIHelper();
+//        if (mProtocolAPI == null) mProtocolAPI = new protocolAPIHelper();
         if (mWifiManager == null) mWifiManager = (WifiManager)this.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         if (lbshelper==null) lbshelper = new LBSHelper(this,mWifiManager,mDevStat);
 
@@ -743,8 +769,8 @@ public class protocolMainServer extends Service {
     }
 
     public void testGpsData(){
-       mProtocolAPI.AP01(mDevStat);
-        log( mProtocolAPI.AP01(mDevStat));
+//       mProtocolAPI.AP01(mDevStat);
+//        log( mProtocolAPI.AP01(mDevStat));
     }
     private void stopTimer(){
         if (mTimer_keepalive !=null){
diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
index 5f4b8a5e..1885ff01 100644
--- a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
@@ -4,6 +4,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemClock;
+import android.util.Log;
 
 import com.ic.protocol.bean.Runtime;
 
@@ -23,6 +24,7 @@ public class AlarmWakeUp {
       stringBuilder.append(l);
       stringBuilder.append("---lastAlarmTime=");
       stringBuilder.append(lastAlarmTime);
+      Log.i("AlarmWakeUp",stringBuilder.toString());
       FileOutputUtil.fileOutput(context, "alarmWakeUp", stringBuilder.toString());
     } 
   }
diff --git a/app/src/main/java/com/ic/protocol/utils/CameraUtil.java b/app/src/main/java/com/ic/protocol/utils/CameraUtil.java
new file mode 100644
index 00000000..276f867f
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CameraUtil.java
@@ -0,0 +1,209 @@
+package com.ic.protocol.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Matrix;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.media.ToneGenerator;
+import android.os.Environment;
+import android.os.StatFs;
+import android.view.SurfaceView;
+import android.view.WindowManager;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
+  Context context;
+  
+  private Camera.PictureCallback jpegCallback = new Camera.PictureCallback() {
+      public void onPictureTaken(byte[] param1ArrayOfByte, Camera param1Camera) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("format=");
+        stringBuilder.append(CameraUtil.this.mPs.getPictureFormat());
+        Logger.i(stringBuilder.toString());
+        if (CameraUtil.this.mPs.getPictureFormat() == 256) {
+          String str = CameraUtil.this.savePicture(param1ArrayOfByte);
+          if (str != null) {
+            Intent intent = new Intent(CameraUtil.this.context, com.ic.protocol.service.protocolMainServer.class);
+            intent.setAction("com.enqualcomm.support.ACTION_REMOTE_CAMERA");
+            intent.putExtra("filepath", str);
+            intent.putExtra("number", CameraUtil.this.mNumber);
+            CameraUtil.this.context.startService(intent);
+          } else {
+            Logger.i("空间不足,保存失败");
+          } 
+        } 
+        CameraUtil.this.releaseCamera();
+      }
+    };
+  
+  private Camera mCamera;
+  
+  String mNumber;
+  
+  private int mOrientation;
+  
+  private Camera.Parameters mPs;
+  
+  private Camera.ShutterCallback shutterCallback = new Camera.ShutterCallback() {
+      public void onShutter() { Logger.i("shutterCallback"); }
+    };
+  
+  private SurfaceTexture surfaceTexture;
+  
+  private ToneGenerator tone;
+  
+  public CameraUtil(Context paramContext) { this.context = paramContext; }
+  
+  private Camera openFacingBackCamera() {
+    Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+    int i = Camera.getNumberOfCameras();
+    Camera camera = null;
+    byte b = 0;
+    while (b < i) {
+      Camera.getCameraInfo(b, cameraInfo);
+
+      if (cameraInfo.facing == 0) {
+        try {
+          camera = Camera.open(b);
+        } catch (RuntimeException e) {
+          e.printStackTrace();
+        }
+      }
+      b++;
+    } 
+    return camera;
+  }
+  
+  private void releaseCamera() {
+    if (this.mCamera != null)
+      try {
+        if (this.surfaceTexture != null)
+          this.surfaceTexture.setOnFrameAvailableListener(null); 
+        this.mCamera.setPreviewTexture(null);
+        this.mCamera.stopPreview();
+      } catch (Exception exception) {
+        exception.printStackTrace();
+      }  
+    this.mCamera.release();
+  }
+  
+  private String savePicture(byte[] paramArrayOfByte) {
+    String str = null;
+    try {
+      if (Environment.getExternalStorageState().equals("mounted")) {
+        if ((new StatFs(Environment.getExternalStorageDirectory().toString())).getAvailableBytes() < paramArrayOfByte.length)
+          return null; 
+        str = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append(str);
+        stringBuilder.append("/RemoteCamera.jpg");
+        str = stringBuilder.toString();
+        Bitmap bitmap2 = BitmapFactory.decodeByteArray(paramArrayOfByte, 0, paramArrayOfByte.length);
+        Bitmap bitmap1 = bitmap2;
+        if ((this.context.getResources().getConfiguration()).orientation == 1) {
+          Matrix matrix = new Matrix();
+          matrix.reset();
+          matrix.postRotate(this.mOrientation);
+          bitmap1 = Bitmap.createBitmap(bitmap2, 0, 0, bitmap2.getWidth(), bitmap2.getHeight(), matrix, true);
+        } 
+        File file = new File(str);
+        if (!file.exists())
+          file.createNewFile(); 
+        BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file));
+        bitmap1.compress(Bitmap.CompressFormat.JPEG, 100, bufferedOutputStream);
+        bufferedOutputStream.flush();
+        bufferedOutputStream.close();
+      } 
+      return str;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    } 
+  }
+  
+  private void takePicture(Context paramContext) {
+    if (this.mCamera != null) {
+      SurfaceView surfaceView = new SurfaceView(paramContext);
+      try {
+        this.mCamera.setPreviewDisplay(surfaceView.getHolder());
+        this.mPs = this.mCamera.getParameters();
+        this.mPs.setPictureSize(640, 480);
+        Logger.i("CameraUtil---setCameraDisplayOrientation");
+        setCameraDisplayOrientation(paramContext, 0, this.mCamera);
+        this.mCamera.setParameters(this.mPs);
+        Logger.i("CameraUtil---startPreview");
+        this.surfaceTexture = new SurfaceTexture(10);
+        this.surfaceTexture.setOnFrameAvailableListener(this);
+        this.mCamera.setPreviewTexture(this.surfaceTexture);
+        this.mCamera.startPreview();
+        this.mCamera.enableShutterSound(false);
+        (new Thread(new Runnable() {
+              public void run() {
+                try {
+                  CameraUtil.this.mCamera.takePicture(CameraUtil.this.shutterCallback, null, CameraUtil.this.jpegCallback);
+                  Thread.sleep(5000L);
+                  return;
+                } catch (Exception exception) {
+                  exception.printStackTrace();
+                  CameraUtil.this.releaseCamera();
+                  return;
+                } 
+              }
+            })).start();
+        return;
+      } catch (Exception e) {
+        e.printStackTrace();
+        releaseCamera();
+      } 
+    } 
+  }
+  
+  public int getDisplayRotation(Context paramContext) {
+    int i = ((WindowManager)paramContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("getDisplayRotation rotation=");
+    stringBuilder.append(i);
+    Logger.i(stringBuilder.toString());
+    switch (i) {
+      default:
+        return 0;
+      case 3:
+        return 270;
+      case 2:
+        return 180;
+      case 1:
+        return 90;
+      case 0:
+        break;
+    } 
+    return 0;
+  }
+  
+  public void getPictur(String paramString) {
+    this.mCamera = openFacingBackCamera();
+    takePicture(this.context);
+    this.mNumber = paramString;
+  }
+  
+  public void onFrameAvailable(SurfaceTexture paramSurfaceTexture) { Logger.i("onFrameAvailable"); }
+  
+  public void setCameraDisplayOrientation(Context paramContext, int paramInt, Camera paramCamera) {
+    Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+    Camera.getCameraInfo(paramInt, cameraInfo);
+    paramInt = getDisplayRotation(paramContext);
+    if (cameraInfo.facing == 1) {
+      paramInt = (360 - (cameraInfo.orientation + paramInt) % 360) % 360;
+    } else {
+      paramInt = (cameraInfo.orientation - paramInt + 360) % 360;
+    } 
+    paramCamera.setDisplayOrientation(paramInt);
+    this.mOrientation = paramInt;
+  }
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java b/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
index 619f06f3..5ed8a981 100644
--- a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
+++ b/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
@@ -106,74 +106,74 @@ public class ContextProxy {
   }
   
   private void initAlarmAndSilent() {
-//    Calendar calendar2 = Calendar.getInstance();
-//    calendar2.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    Cursor cursor2 = this.context.getContentResolver().query(EQCContentProvider.ALARM_URI, null, null, null, null);
-//    byte b2 = 3;
-//    byte b1 = 5;
-//    char c = '\002';
-//    if (cursor2 != null) {
-//      while (cursor2.moveToNext()) {
-//        if ("ON".equals(cursor2.getString(4))) {
-//          String str2 = cursor2.getString(1);
-//          String str1 = cursor2.getString(c);
-//          String str3 = cursor2.getString(b2);
-//          String str4 = cursor2.getString(b1);
-//          calendar2.set(11, Integer.parseInt(str2.substring(c, 4)));
-//          calendar2.set(12, Integer.parseInt(str2.substring(b1, 7)));
-//          char[] arrayOfChar = str1.toCharArray();
-//          int i = arrayOfChar.length;
-//          byte b = 1;
-//          while (b < i) {
-//            c = arrayOfChar[b] - '/';
-//            calendar2.set(7, c);
-//            long l1 = calendar2.getTimeInMillis();
-//            if (l1 <= l)
-//              l1 += 604800000L;
-//            PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            b++;
-//            c = '\002';
-//            b1 = 5;
-//            b2 = 3;
-//          }
-//        }
-//      }
-//      cursor2.close();
-//    }
-//    Calendar calendar1 = Calendar.getInstance();
-//    calendar1.set(13, 0);
-//    Cursor cursor1 = this.context.getContentResolver().query(EQCContentProvider.NOTICE_URL, null, null, null, null);
-//    if (cursor1 != null) {
-//      while (cursor1.moveToNext()) {
-//        String str1 = cursor1.getString(1);
-//        String str2 = cursor1.getString(2);
-//        String str3 = cursor1.getString(3);
-//        String str4 = cursor1.getString(4);
-//        String str5 = cursor1.getString(5);
-//        String str6 = cursor1.getString(6);
-//        String str7 = cursor1.getString(6);
-//        if (str1 != null) {
-//          String str8 = str1.substring(0, 4);
-//          String str9 = str1.substring(4, 6);
-//          String str10 = str1.substring(6, 8);
-//          String str11 = str1.substring(8, 10);
-//          String str12 = str1.substring(10, 12);
-//          calendar1.set(1, Integer.valueOf(str8).intValue());
-//          calendar1.set(2, Integer.valueOf(str9).intValue());
-//          calendar1.set(5, Integer.valueOf(str10).intValue());
-//          calendar1.set(11, Integer.valueOf(str11).intValue());
-//          calendar1.set(12, Integer.valueOf(str12).intValue());
-//          long l1 = calendar1.getTimeInMillis();
-//          if (l1 > l) {
-//            PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//          }
-//        }
-//      }
-//      cursor1.close();
-//    }
+    Calendar calendar2 = Calendar.getInstance();
+    calendar2.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    Cursor cursor2 = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
+    byte b2 = 3;
+    byte b1 = 5;
+    char c = '\002';
+    if (cursor2 != null) {
+      while (cursor2.moveToNext()) {
+        if ("ON".equals(cursor2.getString(4))) {
+          String str2 = cursor2.getString(1);
+          String str1 = cursor2.getString(c);
+          String str3 = cursor2.getString(b2);
+          String str4 = cursor2.getString(b1);
+          calendar2.set(Calendar.HOUR_OF_DAY, Integer.parseInt(str2.substring(c, 4)));
+          calendar2.set(Calendar.MINUTE, Integer.parseInt(str2.substring(b1, 7)));
+          char[] arrayOfChar = str1.toCharArray();
+          int i = arrayOfChar.length;
+          byte b = 1;
+          while (b < i) {
+            c = (char)(arrayOfChar[b] - '/');
+            calendar2.set(Calendar.DAY_OF_WEEK, c);
+            long l1 = calendar2.getTimeInMillis();
+            if (l1 <= l)
+              l1 += 604800000L;
+            PendingIntent pendingIntent = getPendingIntent(str2, str1, str3, str4, c);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            b++;
+            c = '\002';
+            b1 = 5;
+            b2 = 3;
+          }
+        }
+      }
+      cursor2.close();
+    }
+    Calendar calendar1 = Calendar.getInstance();
+    calendar1.set(Calendar.SECOND, 0);
+    Cursor cursor1 = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);
+    if (cursor1 != null) {
+      while (cursor1.moveToNext()) {
+        String str1 = cursor1.getString(1);
+        String str2 = cursor1.getString(2);
+        String str3 = cursor1.getString(3);
+        String str4 = cursor1.getString(4);
+        String str5 = cursor1.getString(5);
+        String str6 = cursor1.getString(6);
+        String str7 = cursor1.getString(6);
+        if (str1 != null) {
+          String year = str1.substring(0, 4);
+          String month = str1.substring(4, 6);
+          String str10 = str1.substring(6, 8);
+          String str11 = str1.substring(8, 10);
+          String str12 = str1.substring(10, 12);
+          calendar1.set(Calendar.YEAR, Integer.valueOf(year).intValue());
+          calendar1.set(Calendar.MONTH, Integer.valueOf(month).intValue());
+          calendar1.set(Calendar.DAY_OF_MONTH, Integer.valueOf(str10).intValue());
+          calendar1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(str11).intValue());
+          calendar1.set(Calendar.MINUTE, Integer.valueOf(str12).intValue());
+          long l1 = calendar1.getTimeInMillis();
+          if (l1 > l) {
+            PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+          }
+        }
+      }
+      cursor1.close();
+    }
   }
   
   public LocationManager getLocationManager() { return this.locationManager; }
@@ -199,219 +199,219 @@ public class ContextProxy {
   }
   
   public void resolverAlarm(ArrayList<Alarm> paramArrayList) {
-//    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
-//    char c = '\001';
-//    if (cursor != null) {
-//      while (cursor.moveToNext()) {
-//        if ("ON".equals(cursor.getString(4))) {
-//          String str1 = cursor.getString(c);
-//          String str2 = cursor.getString(2);
-//          String str3 = cursor.getString(3);
-//          String str4 = cursor.getString(5);
-//          char[] arrayOfChar = str2.toCharArray();
-//          int i = arrayOfChar.length;
-//          byte b = 1;
-//          while (b < i) {
-//            c = arrayOfChar[b];
-//            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));
-//            b++;
-//            c = '\001';
-//          }
-//        }
-//      }
-//      cursor.close();
-//    }
-//    Calendar calendar = Calendar.getInstance();
-//    calendar.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    for (Alarm alarm : paramArrayList) {
-//      long l1 = l;
-//      if ("ON".equals(alarm.status)) {
-//        int i = Integer.parseInt(alarm.time.substring(2, 4));
-//        int j = Integer.parseInt(alarm.time.substring(5, 7));
-//        calendar.set(11, i);
-//        calendar.set(12, j);
-//        char[] arrayOfChar = alarm.week.toCharArray();
-//        i = arrayOfChar.length;
-//        j = 1;
-//        while (true) {
-//          l1 = l;
-//          if (j < i) {
-//            c = arrayOfChar[j] - '/';
-//            calendar.set(7, c);
-//            long l2 = calendar.getTimeInMillis();
-//            l1 = l2;
-//            if (l2 <= l)
-//              l1 = l2 + 604800000L;
-//            PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            j++;
-//            continue;
-//          }
-//          break;
-//        }
-//      }
-//      l = l1;
-//    }
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.ALARM_URI, null, null, null, null);
+    char c = '\001';
+    if (cursor != null) {
+      while (cursor.moveToNext()) {
+        if ("ON".equals(cursor.getString(4))) {
+          String str1 = cursor.getString(c);
+          String str2 = cursor.getString(2);
+          String str3 = cursor.getString(3);
+          String str4 = cursor.getString(5);
+          char[] arrayOfChar = str2.toCharArray();
+          int i = arrayOfChar.length;
+          byte b = 1;
+          while (b < i) {
+            c = arrayOfChar[b];
+            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, c - '/'));
+            b++;
+            c = '\001';
+          }
+        }
+      }
+      cursor.close();
+    }
+    Calendar calendar = Calendar.getInstance();
+    calendar.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    for (Alarm alarm : paramArrayList) {
+      long l1 = l;
+      if ("ON".equals(alarm.status)) {
+        int i = Integer.parseInt(alarm.time.substring(2, 4));
+        int j = Integer.parseInt(alarm.time.substring(5, 7));
+        calendar.set(Calendar.HOUR_OF_DAY, i);
+        calendar.set(Calendar.MINUTE, j);
+        char[] arrayOfChar = alarm.week.toCharArray();
+        i = arrayOfChar.length;
+        j = 1;
+        while (true) {
+          l1 = l;
+          if (j < i) {
+            c = ( char)(arrayOfChar[j] - '/');
+            calendar.set(Calendar.DAY_OF_WEEK, c);
+            long l2 = calendar.getTimeInMillis();
+            l1 = l2;
+            if (l2 <= l)
+              l1 = l2 + 604800000L;
+            PendingIntent pendingIntent = getPendingIntent(alarm.time, alarm.week, alarm.ring, alarm.name, c);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            j++;
+            continue;
+          }
+          break;
+        }
+      }
+      l = l1;
+    }
   }
   
   public void resolverNotice(ArrayList<NoticeContent> paramArrayList) {
-//    Cursor cursor = this.context.getContentResolver().query(EQCContentProvider.NOTICE_URL, null, null, null, null);
-//    if (cursor != null) {
-//      while (cursor.moveToNext()) {
-//        String str1 = cursor.getString(1);
-//        String str2 = cursor.getString(2);
-//        String str3 = cursor.getString(3);
-//        String str4 = cursor.getString(4);
-//        String str5 = cursor.getString(5);
-//        String str6 = cursor.getString(6);
-//        String str7 = cursor.getString(6);
-//        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));
-//      }
-//      cursor.close();
-//    }
-//    for (NoticeContent noticeContent : paramArrayList) {
-//      String str1 = noticeContent.noticeTime;
-//      String str2 = noticeContent.noticeName;
-//      String str3 = noticeContent.noticeNumber;
-//      String str4 = noticeContent.noticeID;
-//      String str5 = noticeContent.noticeCategory;
-//      String str6 = noticeContent.noticeFrequency;
-//      String str7 = noticeContent.noticeContent;
-//      Calendar calendar = Calendar.getInstance();
-//      long l = System.currentTimeMillis();
-//      calendar.set(13, 0);
-//      if (str1 != null) {
-//        String str8 = str1.substring(0, 4);
-//        String str9 = str1.substring(4, 6);
-//        String str10 = str1.substring(6, 8);
-//        String str11 = str1.substring(8, 10);
-//        String str12 = str1.substring(10, 12);
-//        calendar.set(1, Integer.valueOf(str8).intValue());
-//        calendar.set(2, Integer.valueOf(str9).intValue() - 1);
-//        calendar.set(5, Integer.valueOf(str10).intValue());
-//        calendar.set(11, Integer.valueOf(str11).intValue());
-//        calendar.set(12, Integer.valueOf(str12).intValue());
-//        long l1 = calendar.getTimeInMillis();
-//        if (l1 >= l) {
-//          PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
-//          AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//        }
-//      }
-//    }
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.NOTICE_URL, null, null, null, null);
+    if (cursor != null) {
+      while (cursor.moveToNext()) {
+        String str1 = cursor.getString(1);
+        String str2 = cursor.getString(2);
+        String str3 = cursor.getString(3);
+        String str4 = cursor.getString(4);
+        String str5 = cursor.getString(5);
+        String str6 = cursor.getString(6);
+        String str7 = cursor.getString(6);
+        this.alarmManager.cancel(getPendingIntent(str1, str2, str3, str4, str5, str6, str7));
+      }
+      cursor.close();
+    }
+    for (NoticeContent noticeContent : paramArrayList) {
+      String str1 = noticeContent.noticeTime;
+      String str2 = noticeContent.noticeName;
+      String str3 = noticeContent.noticeNumber;
+      String str4 = noticeContent.noticeID;
+      String str5 = noticeContent.noticeCategory;
+      String str6 = noticeContent.noticeFrequency;
+      String str7 = noticeContent.noticeContent;
+      Calendar calendar = Calendar.getInstance();
+      long l = System.currentTimeMillis();
+      calendar.set(Calendar.SECOND, 0);
+      if (str1 != null) {
+        String str8 = str1.substring(0, 4);
+        String str9 = str1.substring(4, 6);
+        String str10 = str1.substring(6, 8);
+        String str11 = str1.substring(8, 10);
+        String str12 = str1.substring(10, 12);
+        calendar.set(Calendar.YEAR, Integer.valueOf(str8).intValue());
+        calendar.set(Calendar.MONTH, Integer.valueOf(str9).intValue() - 1);
+        calendar.set(Calendar.DAY_OF_MONTH, Integer.valueOf(str10).intValue());
+        calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(str11).intValue());
+        calendar.set(Calendar.MINUTE, Integer.valueOf(str12).intValue());
+        long l1 = calendar.getTimeInMillis();
+        if (l1 >= l) {
+          PendingIntent pendingIntent = getPendingIntent(str1, str2, str3, str4, str5, str6, str7);
+          AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+        }
+      }
+    }
   }
   
   public void resolverSilent(ArrayList<Silent> paramArrayList) {
-//    Calendar calendar1 = Calendar.getInstance();
-//    calendar1.set(13, 0);
-//    Calendar calendar2 = Calendar.getInstance();
-//    calendar2.set(13, 0);
-//    long l = System.currentTimeMillis();
-//    Cursor cursor = this.context.getContentResolver().query(EQCContentProvider.SILENT_URI, null, null, null, null);
-//    char c = '\013';
-//    int j = 5;
-//    int k = 4;
-//    if (cursor != null) {
-//      char c1 = Character.MIN_VALUE;
-//      while (cursor.moveToNext()) {
-//        if ("ON".equals(cursor.getString(k))) {
-//          String str1 = cursor.getString(1);
-//          String str2 = cursor.getString(2);
-//          String str3 = cursor.getString(3);
-//          if (!c1) {
-//            int n = Integer.parseInt(str1.substring(2, k));
-//            int i1 = Integer.parseInt(str1.substring(j, 7));
-//            calendar1.set(c, n);
-//            calendar1.set(12, i1);
-//            n = Integer.parseInt(str2.substring(2, k));
-//            i1 = Integer.parseInt(str2.substring(j, 7));
-//            calendar2.set(c, n);
-//            calendar2.set(12, i1);
-//          }
-//          char[] arrayOfChar = str3.toCharArray();
-//          int m = arrayOfChar.length;
-//          byte b = 1;
-//          char c2 = k;
-//          k = j;
-//          j = c;
-//          while (b < m) {
-//            j = arrayOfChar[b] - '/';
-//            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, j));
-//            c = c1;
-//            if (c1 == Character.MIN_VALUE) {
-//              calendar1.set(7, j);
-//              long l1 = calendar1.getTimeInMillis();
-//              calendar2.set(7, j);
-//              long l2 = calendar2.getTimeInMillis();
-//              c = c1;
-//              if (l1 <= l) {
-//                c = c1;
-//                if (l2 > l)
-//                  c = '\001';
-//              }
-//            }
-//            b++;
-//            j = 11;
-//            k = 5;
-//            c2 = '\004';
-//            c1 = c;
-//          }
-//          c = j;
-//          j = k;
-//          k = c2;
-//        }
-//      }
-//      cursor.close();
-//      c = c1;
-//    } else {
-//      c = Character.MIN_VALUE;
-//    }
-//    Iterator iterator = paramArrayList.iterator();
-//    int i;
-//    for (i = 0; iterator.hasNext(); i = k) {
-//      Silent silent = (Silent)iterator.next();
-//      k = i;
-//      if ("ON".equals(silent.status)) {
-//        j = Integer.parseInt(silent.start.substring(2, 4));
-//        k = Integer.parseInt(silent.start.substring(5, 7));
-//        calendar1.set(11, j);
-//        calendar1.set(12, k);
-//        j = Integer.parseInt(silent.end.substring(2, 4));
-//        k = Integer.parseInt(silent.end.substring(5, 7));
-//        calendar2.set(11, j);
-//        calendar2.set(12, k);
-//        char[] arrayOfChar = silent.week.toCharArray();
-//        int m = arrayOfChar.length;
-//        j = 1;
-//        while (true) {
-//          k = i;
-//          if (j < m) {
-//            k = arrayOfChar[j] - '/';
-//            calendar1.set(7, k);
-//            long l1 = calendar1.getTimeInMillis();
-//            calendar2.set(7, k);
-//            long l2 = calendar2.getTimeInMillis();
-//            if (l1 <= l)
-//              if (l2 <= l) {
-//                l1 += 604800000L;
-//              } else {
-//                i = 1;
-//              }
-//            PendingIntent pendingIntent = getPendingIntent(silent.start, silent.end, silent.week, k);
-//            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
-//            j++;
-//            continue;
-//          }
-//          break;
-//        }
-//      }
-//    }
-//    if (c != '\000' && i == 0) {
-//      Intent intent = new Intent(this.context, com.enqualcomm.support.CoreService.class);
-//      intent.setAction("com.enqualcomm.icare.ACTION_ISSILENCE");
-//      intent.putExtra("SilentData", "silent:cancel");
-//      this.context.startService(intent);
-//    }
+    Calendar calendar1 = Calendar.getInstance();
+    calendar1.set(Calendar.SECOND, 0);
+    Calendar calendar2 = Calendar.getInstance();
+    calendar2.set(Calendar.SECOND, 0);
+    long l = System.currentTimeMillis();
+    Cursor cursor = this.context.getContentResolver().query(ICContentProvider.SILENT_URI, null, null, null, null);
+    char c = '\013';
+    int j = 5;
+    int k = 4;
+    if (cursor != null) {
+      char c1 = Character.MIN_VALUE;
+      while (cursor.moveToNext()) {
+        if ("ON".equals(cursor.getString(k))) {
+          String str1 = cursor.getString(1);
+          String str2 = cursor.getString(2);
+          String str3 = cursor.getString(3);
+          if (!(c1==Character.MIN_VALUE)) {
+            int n = Integer.parseInt(str1.substring(2, k));
+            int i1 = Integer.parseInt(str1.substring(j, 7));
+            calendar1.set(c, n);
+            calendar1.set(Calendar.MINUTE, i1);
+            n = Integer.parseInt(str2.substring(2, k));
+            i1 = Integer.parseInt(str2.substring(j, 7));
+            calendar2.set(c, n);
+            calendar2.set(Calendar.MINUTE, i1);
+          }
+          char[] arrayOfChar = str3.toCharArray();
+          int m = arrayOfChar.length;
+          byte b = 1;
+          char c2 = (char)k;
+          k = j;
+          j = c;
+          while (b < m) {
+            j = arrayOfChar[b] - '/';
+            this.alarmManager.cancel(getPendingIntent(str1, str2, str3, j));
+            c = c1;
+            if (c1 == Character.MIN_VALUE) {
+              calendar1.set(Calendar.DAY_OF_WEEK, j);
+              long l1 = calendar1.getTimeInMillis();
+              calendar2.set(Calendar.DAY_OF_WEEK, j);
+              long l2 = calendar2.getTimeInMillis();
+              c = c1;
+              if (l1 <= l) {
+                c = c1;
+                if (l2 > l)
+                  c = '\001';
+              }
+            }
+            b++;
+            j = 11;
+            k = 5;
+            c2 = '\004';
+            c1 = c;
+          }
+          c = (char)j;
+          j = k;
+          k = c2;
+        }
+      }
+      cursor.close();
+      c = c1;
+    } else {
+      c = Character.MIN_VALUE;
+    }
+    Iterator iterator = paramArrayList.iterator();
+    int i;
+    for (i = 0; iterator.hasNext(); i = k) {
+      Silent silent = (Silent)iterator.next();
+      k = i;
+      if ("ON".equals(silent.status)) {
+        j = Integer.parseInt(silent.start.substring(2, 4));
+        k = Integer.parseInt(silent.start.substring(5, 7));
+        calendar1.set(Calendar.HOUR_OF_DAY, j);
+        calendar1.set(Calendar.MINUTE, k);
+        j = Integer.parseInt(silent.end.substring(2, 4));
+        k = Integer.parseInt(silent.end.substring(5, 7));
+        calendar2.set(Calendar.HOUR_OF_DAY, j);
+        calendar2.set(Calendar.MINUTE, k);
+        char[] arrayOfChar = silent.week.toCharArray();
+        int m = arrayOfChar.length;
+        j = 1;
+        while (true) {
+          k = i;
+          if (j < m) {
+            k = arrayOfChar[j] - '/';
+            calendar1.set(Calendar.DAY_OF_WEEK, k);
+            long l1 = calendar1.getTimeInMillis();
+            calendar2.set(Calendar.DAY_OF_WEEK, k);
+            long l2 = calendar2.getTimeInMillis();
+            if (l1 <= l)
+              if (l2 <= l) {
+                l1 += 604800000L;
+              } else {
+                i = 1;
+              }
+            PendingIntent pendingIntent = getPendingIntent(silent.start, silent.end, silent.week, k);
+            AlarmHelper.setAlarm(this.alarmManager, l1, pendingIntent);
+            j++;
+            continue;
+          }
+          break;
+        }
+      }
+    }
+    if (c != '\000' && i == 0) {
+      Intent intent = new Intent(this.context, com.ic.protocol.service.protocolMainServer.class);
+      intent.setAction("com.enqualcomm.icare.ACTION_ISSILENCE");
+      intent.putExtra("SilentData", "silent:cancel");
+      this.context.startService(intent);
+    }
   }
   
   public void sendBroadcast(String cmd, Runtime dev) {
diff --git a/app/src/main/java/com/ic/protocol/utils/CustomDialog.java b/app/src/main/java/com/ic/protocol/utils/CustomDialog.java
new file mode 100644
index 00000000..1cc16445
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CustomDialog.java
@@ -0,0 +1,178 @@
+package com.ic.protocol.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class CustomDialog extends Dialog {
+  public CustomDialog(Context paramContext) { super(paramContext); }
+  
+  public CustomDialog(Context paramContext, int paramInt) { super(paramContext, paramInt); }
+  
+  public static class Builder {
+    private int app_id;
+    
+    private View contentView;
+    
+    private Context context;
+    
+    private CustomDialog mDialog;
+    
+    private String message;
+    
+    private OnClickListener negativeButtonClickListener;
+
+    private String negativeButtonText;
+
+    private OnClickListener positiveButtonClickListener;
+
+    private String positiveButtonText;
+
+    private String title;
+
+    public Builder(Context param1Context) { this.context = param1Context; }
+
+    private CustomDialog getDialogInstance() {
+//      this.mDialog = new CustomDialog(this.context, 2131689630);
+//      View view = (LayoutInflater)this.context.getSystemService("layout_inflater");
+//      if (this.app_id == 2) {
+//        view = view.inflate(2131361824, null);
+//      } else {
+//        view = view.inflate(2131361825, null);
+//      }
+//      this.mDialog.addContentView(view, new ViewGroup.LayoutParams(-1, -2));
+//      ((TextView)view.findViewById(2131230876)).setText(this.title);
+//      if (this.positiveButtonText != null) {
+//        if (this.app_id != 2) {
+//          ((ImageButton)view.findViewById(2131230836)).setImageResource(2131165276);
+//          if (this.positiveButtonClickListener != null) {
+//            final CustomDialog finalDialog1 = this.mDialog;
+//            ((ImageButton)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                  public void onClick(View param2View) { CustomDialog.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//                });
+//          }
+//        } else if (this.positiveButtonClickListener != null) {
+//          final CustomDialog finalDialog1 = this.mDialog;
+//          ((Button)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomDialog.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230836).setVisibility(8);
+//      }
+//      if (this.negativeButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230825)).setImageResource(2131165273);
+//        if (this.negativeButtonClickListener != null) {
+//          final CustomDialog finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230825)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomDialog.Builder.this.negativeButtonClickListener.onClick(finalDialog1, -2); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230825).setVisibility(8);
+//      }
+//      if (this.message != null) {
+//        ((TextView)view.findViewById(2131230822)).setText(this.message);
+//      } else if (this.contentView != null) {
+//        ((LinearLayout)view.findViewById(2131230793)).removeAllViews();
+//        ((LinearLayout)view.findViewById(2131230793)).addView(this.contentView, new ViewGroup.LayoutParams(-1, -1));
+//      }
+//      this.mDialog.setContentView(view);
+      return this.mDialog;
+    }
+    
+    public CustomDialog create() { // Byte code:
+      //   0: aload_0
+      //   1: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   4: ifnonnull -> 37
+      //   7: ldc com/enqualcomm/support/util/CustomDialog
+      //   9: monitorenter
+      //   10: aload_0
+      //   11: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   14: ifnonnull -> 25
+      //   17: aload_0
+      //   18: aload_0
+      //   19: invokespecial getDialogInstance : ()Lcom/enqualcomm/support/util/CustomDialog;
+      //   22: putfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   25: ldc com/enqualcomm/support/util/CustomDialog
+      //   27: monitorexit
+      //   28: goto -> 37
+      //   31: astore_1
+      //   32: ldc com/enqualcomm/support/util/CustomDialog
+      //   34: monitorexit
+      //   35: aload_1
+      //   36: athrow
+      //   37: aload_0
+      //   38: getfield mDialog : Lcom/enqualcomm/support/util/CustomDialog;
+      //   41: areturn
+      // Exception table:
+      //   from	to	target	type
+      //   10	25	31	finally
+      //   25	28	31	finally
+      //   32	35	31	finally }
+      return mDialog;
+    }
+    public Builder setApp(int param1Int) {
+      this.app_id = param1Int;
+      return this;
+    }
+    
+    public Builder setContentView(View param1View) {
+      this.contentView = param1View;
+      return this;
+    }
+    
+    public Builder setMessage(int param1Int) {
+      this.message = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setMessage(String param1String) {
+      this.message = param1String;
+      return this;
+    }
+    
+    public Builder setNegativeButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = (String)this.context.getText(param1Int);
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setNegativeButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = param1String;
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = (String)this.context.getText(param1Int);
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = param1String;
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int) {
+      this.title = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setTitle(String param1String) {
+      this.title = param1String;
+      return this;
+    }
+  }
+
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/CustomNotification.java b/app/src/main/java/com/ic/protocol/utils/CustomNotification.java
new file mode 100644
index 00000000..5092852a
--- /dev/null
+++ b/app/src/main/java/com/ic/protocol/utils/CustomNotification.java
@@ -0,0 +1,216 @@
+package com.ic.protocol.utils;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class CustomNotification extends Dialog {
+  public CustomNotification(Context paramContext) { super(paramContext); }
+  
+  public CustomNotification(Context paramContext, int paramInt) { super(paramContext, paramInt); }
+  
+  public static class Builder {
+    private View contentView;
+    
+    private String content_messgae;
+    
+    private Context context;
+    
+    private CustomNotification mDialog;
+    
+    private String message;
+    
+    private int msg_count;
+    
+    private OnClickListener negativeButtonClickListener;
+
+    private String negativeButtonText;
+
+    private OnClickListener positiveButtonClickListener;
+
+    private String positiveButtonText;
+
+    private int time;
+
+    private String title;
+
+    private int titleImg;
+
+    private View.OnTouchListener viewOnTouchListener;
+
+    public Builder(Context param1Context) { this.context = param1Context; }
+
+    private CustomNotification getDialogInstance() {
+//      this.mDialog = new CustomNotification(this.context, 2131689630);
+//      View view = ((LayoutInflater)this.context.getSystemService("layout_inflater")).inflate(2131361841, null);
+//      this.mDialog.addContentView(view, new ViewGroup.LayoutParams(-1, -2));
+//      ((ImageView)view.findViewById(2131230809)).setImageResource(this.titleImg);
+//      ((TextView)view.findViewById(2131230876)).setText(this.title);
+//      if (this.time <= 0) {
+//        ((TextView)view.findViewById(2131230875)).setText(this.context.getText(2131624052));
+//      } else {
+//        StringBuilder stringBuilder = new StringBuilder();
+//        stringBuilder.append(String.valueOf(this.time));
+//        stringBuilder.append(this.context.getText(2131624054));
+//        String str = stringBuilder.toString();
+//        ((TextView)view.findViewById(2131230875)).setText(str);
+//      }
+//      if (this.positiveButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230836)).setImageResource(2131165276);
+//        if (this.positiveButtonClickListener != null) {
+//          final CustomNotification finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230836)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomNotification.Builder.this.positiveButtonClickListener.onClick(finalDialog, -1); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230836).setVisibility(View.GONE);
+//      }
+//      if (this.negativeButtonText != null) {
+//        ((ImageButton)view.findViewById(2131230825)).setImageResource(2131165273);
+//        if (this.negativeButtonClickListener != null) {
+//          final CustomNotification finalDialog1 = this.mDialog;
+//          ((ImageButton)view.findViewById(2131230825)).setOnClickListener(new View.OnClickListener() {
+//                public void onClick(View param2View) { CustomNotification.Builder.this.negativeButtonClickListener.onClick(finalDialog1, -2); }
+//              });
+//        }
+//      } else {
+//        view.findViewById(2131230825).setVisibility(8);
+//      }
+//      if (this.message != null)
+//        if (this.msg_count > 0) {
+//          StringBuilder stringBuilder = new StringBuilder();
+//          stringBuilder.append(this.message);
+//          stringBuilder.append("(");
+//          stringBuilder.append(String.valueOf(this.msg_count));
+//          stringBuilder.append(")");
+//          String str = stringBuilder.toString();
+//          ((TextView)view.findViewById(2131230822)).setText(str);
+//        } else {
+//          ((TextView)view.findViewById(2131230822)).setText(this.message);
+//        }
+//      if (this.content_messgae != null)
+//        ((TextView)view.findViewById(2131230793)).setText(this.content_messgae);
+//      if (this.viewOnTouchListener != null)
+//        view.setOnTouchListener(new View.OnTouchListener() {
+//              public boolean onTouch(View param2View, MotionEvent param2MotionEvent) {
+//                CustomNotification.Builder.this.viewOnTouchListener.onTouch(param2View, param2MotionEvent);
+//                return true;
+//              }
+//            });
+//      this.mDialog.setContentView(view);
+      return this.mDialog;
+    }
+    
+    public CustomNotification create() { // Byte code:
+      //   0: aload_0
+      //   1: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   4: ifnonnull -> 37
+      //   7: ldc com/enqualcomm/support/util/CustomNotification
+      //   9: monitorenter
+      //   10: aload_0
+      //   11: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   14: ifnonnull -> 25
+      //   17: aload_0
+      //   18: aload_0
+      //   19: invokespecial getDialogInstance : ()Lcom/enqualcomm/support/util/CustomNotification;
+      //   22: putfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   25: ldc com/enqualcomm/support/util/CustomNotification
+      //   27: monitorexit
+      //   28: goto -> 37
+      //   31: astore_1
+      //   32: ldc com/enqualcomm/support/util/CustomNotification
+      //   34: monitorexit
+      //   35: aload_1
+      //   36: athrow
+      //   37: aload_0
+      //   38: getfield mDialog : Lcom/enqualcomm/support/util/CustomNotification;
+      //   41: areturn
+      // Exception table:
+      //   from	to	target	type
+      //   10	25	31	finally
+      //   25	28	31	finally
+      //   32	35	31	finally }
+      return mDialog;
+    }
+    public Builder setContentMessage(String param1String) {
+      this.content_messgae = param1String;
+      return this;
+    }
+    
+    public Builder setContentView(View param1View) {
+      this.contentView = param1View;
+      return this;
+    }
+    
+    public Builder setLayoutViewClick(View.OnTouchListener param1OnTouchListener) {
+      this.viewOnTouchListener = param1OnTouchListener;
+      return this;
+    }
+    
+    public Builder setMessage(int param1Int) {
+      this.message = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setMessage(String param1String) {
+      this.message = param1String;
+      return this;
+    }
+    
+    public Builder setMessage(String param1String, int param1Int) {
+      this.message = param1String;
+      this.msg_count = param1Int;
+      return this;
+    }
+    
+    public Builder setNegativeButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = (String)this.context.getText(param1Int);
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setNegativeButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.negativeButtonText = param1String;
+      this.negativeButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(int param1Int, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = (String)this.context.getText(param1Int);
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setPositiveButton(String param1String, DialogInterface.OnClickListener param1OnClickListener) {
+      this.positiveButtonText = param1String;
+      this.positiveButtonClickListener = param1OnClickListener;
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int) {
+      this.title = (String)this.context.getText(param1Int);
+      return this;
+    }
+    
+    public Builder setTitle(int param1Int1, int param1Int2, int param1Int3) {
+      this.titleImg = param1Int1;
+      this.title = (String)this.context.getText(param1Int2);
+      this.time = param1Int3;
+      return this;
+    }
+    
+    public Builder setTitle(String param1String) {
+      this.title = param1String;
+      return this;
+    }
+  }
+}
+
diff --git a/app/src/main/java/com/ic/protocol/utils/Logger.java b/app/src/main/java/com/ic/protocol/utils/Logger.java
index f8a974fb..93cb87ad 100644
--- a/app/src/main/java/com/ic/protocol/utils/Logger.java
+++ b/app/src/main/java/com/ic/protocol/utils/Logger.java
@@ -33,7 +33,7 @@ public class Logger {
   }
 
   public static void i(Object var0) {
-    if (DEBUG) {
+    if (DEBUG && var0 !=null) {
       String var1 = getFunctionName();
       if (var1 != null) {
         StringBuilder sb = new StringBuilder();
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 25c12988..f6db7c14 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
@@ -3,6 +3,7 @@ package com.ic.protocol.utils;
 import android.os.SystemClock;
 
 
+import com.ic.protocol.adapter.protocolAPIHelper;
 import com.ic.protocol.bean.StringMessage;
 
 import java.net.InetAddress;
@@ -14,20 +15,56 @@ import java.util.concurrent.Executors;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
+import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;
 
-public class NettyConnection implements Connection {
+
+public class NettyConnection implements Connection ,RxSocket.SocketConnectionListener{
   private static long realtime_old;
   private static final String TAG = NettyConnection.class.getSimpleName();
 
   ExecutorService executorService = Executors.newSingleThreadExecutor();
-  
-  private final ConnectionListener listener;
+
+  private protocolAPIHelper API=null;
+  private ConnectionListener listener=null;
   
   private int timeout = 60;
   
   public NettyConnection(ConnectionListener paramConnectionListener) {
     this.listener = paramConnectionListener;
-
+    RxSocket.getInstance().setConnectionListener(this);
+    if (API == null) API=new protocolAPIHelper(
+            new protocolAPIHelper.CmdHandler() {
+                @Override
+                public boolean handleCmd(protocolAPIHelper.CMD_TYPE type, String cmd) {
+
+                        boolean ret=true;
+
+                        switch (type){
+                            case BP00:
+//              API.handleBP00(cmd);
+                                handle_cmd("Link:OK",cmd);
+                                break;
+                            case BP01:
+//              API.handleBP01(cmd);
+                                handle_cmd("定位AP01",cmd);
+                                break;
+                            case BP03:
+//              API.handleBP03(cmd);
+                                handle_cmd("heart",cmd);
+                                break;
+                            case BP28:
+//              API.handleBP28(cmd);
+                                handle_cmd("语音BP28",cmd);
+                                break;
+
+                        }
+
+                        return ret;
+
+                }
+            }
+    );
   }
   
   private void connectImpl(String host, int port) {
@@ -36,8 +73,8 @@ public class NettyConnection implements Connection {
   }
   
   public void close() {
-
-
+      listener =null;
+      RxSocket.getInstance().setConnectionListener(null);
   }
   
   public void connect(final String host, final int port) {
@@ -45,8 +82,8 @@ public class NettyConnection implements Connection {
     if (l - realtime_old < 3000L)
       return; 
     realtime_old = l;
-    Logger.i("connect1");
-    disconnect();
+    Logger.i("connect1 "+host+":"+port);
+//    disconnect();
     this.executorService.execute(new Runnable() {
           public void run() {
             NettyConnection.this.connectImpl(host, port);
@@ -133,12 +170,12 @@ public class NettyConnection implements Connection {
 
 
   public boolean isServerConnected(){
-    return (RxSocket.getInstance().getSocketStatus()==RxSocket.SocketStatus.CONNECTED)?true:false;
+    return (RxSocket.getInstance().getSocketStatus()== CONNECTED)?true:false;
   }
   public boolean sendMsg(String  cmd) {
 
 
-    if(!isServerConnected())
+    if(!isServerConnected()|| cmd==null || cmd.isEmpty())
     {
       return false;
     }
@@ -161,9 +198,17 @@ public class NettyConnection implements Connection {
     return true;
   }
 
-
   public int getTimeout() { return this.timeout; }
-  
+
+
+  private void handle_cmd(String cmd,String msg){
+      if (NettyConnection.this.listener!=null){
+          String[] msgArr=new String[]{cmd,msg};
+          StringMessage stringMessage=new StringMessage(msgArr);
+          stringMessage.refresh(msg);
+          NettyConnection.this.listener.onReceive(stringMessage );
+      }
+  }
   public void open() {
 
       //监听Socket的收包
@@ -175,11 +220,9 @@ public class NettyConnection implements Connection {
                           //这里，应该去处理这个消息
                           String msg=new String(bytes);
                           log("get Msg :"+msg+" (size)" + bytes.length);
-                          if (NettyConnection.this.listener!=null){
-                              NettyConnection.this.listener.onReceive(
-                                      new StringMessage(msg)
-                              );
-                          }
+
+                          API.parserCmd(msg);
+
                       },
                       throwable -> {
 
@@ -195,6 +238,15 @@ public class NettyConnection implements Connection {
               .observeOn(AndroidSchedulers.mainThread())
               .subscribe(socketStatus -> {
                   log("socketStatus:" + socketStatus.name());
+                  if (socketStatus.name().equals("CONNECTED")){
+                      if (NettyConnection.this.listener!=null){
+                          NettyConnection.this.listener.onConnectionOpen();
+                      }
+                  }else if (socketStatus.name().equals("DIS_CONNECT")) {
+                      if (NettyConnection.this.listener!=null){
+                          NettyConnection.this.listener.onConnectionClose();
+                      }
+                  }
               });
 
   }
@@ -207,10 +259,25 @@ public class NettyConnection implements Connection {
   }
   
   public boolean sendBlocking(StringMessage paramStringMessage) {
-    Logger.i(paramStringMessage.toString());
+    Logger.i(paramStringMessage.isFromCache());
+      sendMsg(paramStringMessage.isFromCache());
     return true;
     }
   
   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/NetworkObservable.java b/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
index 929a8c46..ab0a27b6 100644
--- a/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
+++ b/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
@@ -26,30 +26,42 @@ public class NetworkObservable {
           stringBuilder.append(",network_is_from_no_to_yes=");
           stringBuilder.append(NetworkObservable.this.network_is_from_no_to_yes);
           Logger.i(stringBuilder.toString());
+
+          // 如果 服务器socket没有连接，且 网络没有变化
           if (!KeepAlive.isConnected && !NetworkObservable.this.network_is_from_no_to_yes) {
+
+            //如果网络关闭 则 检查执行下一个网络对象，此时没有转换网络状态
             if (NetworkObservable.this.network_is_down) {
               NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(3));
 //              NetworkObservable.access$002(NetworkObservable.this, false);
               NetworkObservable.this.network_is_from_no_to_yes=false;
             } else {
+
+              //如果网络已经开启，则设置网络状态从关闭到开启，并检查执行下一个网络对象
               NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(2));
 //              NetworkObservable.access$002(NetworkObservable.this, true);
               NetworkObservable.this.network_is_from_no_to_yes=true;
             } 
-          } else if (NetworkObservable.this.network_is_from_no_to_yes) {
+          } else if (!KeepAlive.isConnected && NetworkObservable.this.network_is_from_no_to_yes) {
+
+            //如果网络转换已经成功，则只需检查执行下一个网络对象
             NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(1));
           } else if (KeepAlive.isConnected) {
+            //如果 网络服务器已经连接，则无需转换网络
 //            NetworkObservable.access$002(NetworkObservable.this, false);
             NetworkObservable.this.network_is_from_no_to_yes=false;
-          } 
+          }
+
+          //所有检测都通过，就证明网络连接成功，network_is_down 自然就是false
 //          NetworkObservable.access$102(NetworkObservable.this, false);
           NetworkObservable.this.network_is_down=false;
-          return;
-        } 
-        Logger.i("网络断开");
+
+        } else {
+          Logger.i("网络断开");
 //        NetworkObservable.access$102(NetworkObservable.this, true);
-        NetworkObservable.this.network_is_down=true;
-        NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(0));
+          NetworkObservable.this.network_is_down = true;
+          NetworkObservable.this.objectPublishSubject.onNext(Integer.valueOf(0));
+        }
       }
     };
   
diff --git a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java b/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
index 579d8434..4669f455 100644
--- a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
@@ -17,6 +17,7 @@ import android.view.MotionEvent;
 import android.view.View;
 
 
+import com.ic.protocol.R;
 import com.ic.protocol.bean.Contact;
 import com.ic.protocol.service.AudioService;
 
@@ -27,6 +28,9 @@ import rx.Subscriber;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;
+import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;
+
 public class ProcessReceiver extends BroadcastReceiver {
   private static final int MICRO_CHAT = 2;
   
@@ -121,11 +125,11 @@ public class ProcessReceiver extends BroadcastReceiver {
   }
   
   private void screenOn(Context paramContext) {
-//    final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(268435462, "target");
-//    wakeLock.acquire();
-//    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
-//          public void call(Long param1Long) { wakelock.release(); }
-//        });
+    final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, "target");
+    wakelock.acquire();
+    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+          public void call(Long param1Long) { wakelock.release(); }
+        });
   }
   
   public void initCustomNotification(final Context context, final Contact contact, final String content_msg, int paramInt) {
@@ -303,79 +307,79 @@ public class ProcessReceiver extends BroadcastReceiver {
   }
   
   public void initNotification(Contact paramContact, Context paramContext) {
-//    String str = paramContact.name;
-//    Uri uri = RingtoneManager.getDefaultUri(2);
-//    NotificationCompat.Builder builder = (new NotificationCompat.Builder(paramContext)).setSmallIcon(2131165361).setContentTitle(paramContext.getString(2131624065)).setWhen(System.currentTimeMillis()).setAutoCancel(true);
-//    StringBuilder stringBuilder = new StringBuilder();
-//    stringBuilder.append(paramContext.getString(2131624074));
-//    stringBuilder.append("  ");
-//    stringBuilder.append(str);
-//    stringBuilder.append(paramContext.getString(2131624075));
-//    Notification notification = builder.setContentText(stringBuilder.toString()).setTicker(paramContext.getString(2131624069)).setSound(uri).build();
-//    this.mNotificationManager = (NotificationManager)paramContext.getSystemService("notification");
-//    this.mNotificationManager.notify(1, notification);
+    String str = paramContact.name;
+    Uri uri = RingtoneManager.getDefaultUri(2);
+    NotificationCompat.Builder builder = (new NotificationCompat.Builder(paramContext)).setSmallIcon(R.drawable.toast_error).setContentTitle(paramContext.getString(R.string.app_name)).setWhen(System.currentTimeMillis()).setAutoCancel(true);
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append(paramContext.getString(R.string.app_name));
+    stringBuilder.append("  ");
+    stringBuilder.append(str);
+    stringBuilder.append(paramContext.getString(R.string.app_name));
+    Notification notification = builder.setContentText(stringBuilder.toString()).setTicker(paramContext.getString(R.string.app_name)).setSound(uri).build();
+    this.mNotificationManager = (NotificationManager)paramContext.getSystemService(Context.NOTIFICATION_SERVICE);
+    this.mNotificationManager.notify(1, notification);
   }
   
   public void onReceive(Context paramContext, Intent paramIntent) {
-//    Contact contact;
-//    String str = paramIntent.getAction();
-//    StringBuilder stringBuilder = new StringBuilder();
-//    stringBuilder.append("action==");
-//    stringBuilder.append(str);
-//    Logger.i(stringBuilder.toString());
-//    if ("com.enqualcomm.support.ACTION_STEP_COUNT_ALARM".equals(str)) {
+    Contact contact;
+    String str = paramIntent.getAction();
+    StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("action==");
+    stringBuilder.append(str);
+    Logger.i(stringBuilder.toString());
+    if ("com.enqualcomm.support.ACTION_STEP_COUNT_ALARM".equals(str)) {
 //      EqcAlgorithmNative.native_EqcAlgorithm_Gsensor_clear_step();
-//      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
-//      return;
-//    }
-//    if ("com.enqualcomm.imessage.RESUME_ACTION".equals(str)) {
-//      SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
-//      return;
-//    }
-//    if ("com.enqualcomm.support.DIALOG".equals(str)) {
-//      contact = (Contact)paramIntent.getParcelableExtra("contact");
-//      SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-//      boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-//      if (contact != null && !bool) {
-//        if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-//          initMyDialog(paramContext, contact, 1);
-//          playNotificationVoice(paramContext);
-//        }
-//        screenOn(paramContext);
-//        return;
-//      }
-//    } else if ("com.enqualcomm.imessage.SOS_ACTION".equals(str)) {
-//      if (contact.getIntExtra("sos_end", 0) == 0) {
+      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, "com.enqualcomm.support.ACTION_STEP_COUNT_ALARM");
+      return;
+    }
+    if ("com.enqualcomm.imessage.RESUME_ACTION".equals(str)) {
+      SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
+      return;
+    }
+    if ("com.enqualcomm.support.DIALOG".equals(str)) {
+      contact = (Contact)paramIntent.getParcelableExtra("contact");
+      SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+      boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+      if (contact != null && !bool) {
+        if (!DeviceInfoUtil.isTopActivity(paramContext)) {
+          initMyDialog(paramContext, contact, 1);
+          playNotificationVoice(paramContext);
+        }
+        screenOn(paramContext);
+        return;
+      }
+    } else if ("com.enqualcomm.imessage.SOS_ACTION".equals(str)) {
+      if (paramIntent.getIntExtra("sos_end", 0) == 0) {
 //        EqcAlgorithmNative.native_EqcAlgorithmMethod3(8);
-//        sendStheartRateBroadcast(paramContext, "com.eqc.heartrate.action.SILENT_START", 3);
-//        return;
-//      }
-//    } else {
-//      String str1;
-//      if ("com.enqualcomm.support.ACTION_REMOTE_CAMERA".equals(contact.getAction())) {
-//        str1 = contact.getStringExtra("key_remote_number");
-//        (new CameraUtil(paramContext)).getPictur(str1);
-//        return;
-//      }
-//      if ("com.enqualcomm.support.CloseUnreadMsg".equals(str1.getAction()) || "android.intent.action.BATTERY_LOW".equals(str1.getAction())) {
+        sendStheartRateBroadcast(paramContext, "com.eqc.heartrate.action.SILENT_START", 3);
+        return;
+      }
+    } else {
+      String str1;
+      if ("com.enqualcomm.support.ACTION_REMOTE_CAMERA".equals(paramIntent.getAction())) {
+        str1 = paramIntent.getStringExtra("key_remote_number");
+        (new CameraUtil(paramContext)).getPictur(str1);
+        return;
+      }
+      if ("com.enqualcomm.support.CloseUnreadMsg".equals(paramIntent.getAction()) || "android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {
 //        if (mCustomDialog != null && mCustomDialog.isShowing())
 //          mCustomDialog.dismiss();
 //        if (this.mCustomNotification != null && this.mCustomNotification.isShowing())
 //          this.mCustomNotification.dismiss();
-//        return;
-//      }
-//      if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
-//        Contact contact1 = (Contact)str1.getParcelableExtra("contact");
-//        contact1.extra = str1.getStringExtra("date");
-//        boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
-//        if (contact1 != null && !bool) {
-//          initMyDialog(paramContext, contact1, 2);
-//          playNotificationVoice(paramContext);
-//          screenOn(paramContext);
-//          return;
-//        }
-//      }
-//    }
+        return;
+      }
+      if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
+        Contact contact1 = (Contact)paramIntent.getParcelableExtra("contact");
+        contact1.extra = paramIntent.getStringExtra("date");
+        boolean bool = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+        if (contact1 != null && !bool) {
+          initMyDialog(paramContext, contact1, 2);
+          playNotificationVoice(paramContext);
+          screenOn(paramContext);
+          return;
+        }
+      }
+    }
   }
   
   public void sendStheartRateBroadcast(Context paramContext, String paramString, int paramInt) {
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 82c797cb..9fd0e85f 100644
--- a/app/src/main/java/com/ic/protocol/utils/RxSocket.java
+++ b/app/src/main/java/com/ic/protocol/utils/RxSocket.java
@@ -72,6 +72,7 @@ public class RxSocket {
     private ReadThread readThread = null;
     private boolean isReadThreadAlive = true;
     private SocketReconnectCallback socketReconnectCallback = null;
+    private SocketConnectionListener conectionListener = null;
 
     /*  方法
     * */
@@ -83,6 +84,9 @@ public class RxSocket {
         return connectStatus;
     }
 
+    public void setConnectionListener(SocketConnectionListener callback){
+        conectionListener=callback;
+    }
     /**
      * 建立Socket连接，只是尝试建立一次
      * @param ip    IP or 域名
@@ -131,10 +135,11 @@ public class RxSocket {
                         isReadThreadAlive = true;
                         readThread = new ReadThread(ip,port);
                         readThread.start();
+
                         socketReconnectCallback = new SocketReconnectCallback() {
                             @Override
                             public void onSuccess() {
-                                LogUtils.i(OpenLog,TAG,"connectRx:"+"CONNECTED");
+                                LogUtils.i(OpenLog, TAG, "connectRx:" + "CONNECTED");
                                 socketStatus = SocketStatus.CONNECTED;
                                 subscriber.onNext(true);
                                 subscriber.onCompleted();
@@ -142,11 +147,12 @@ public class RxSocket {
 
                             @Override
                             public void onFail(String msg) {
-                                LogUtils.i(OpenLog,TAG,"connectRx:"+msg);
+                                LogUtils.i(OpenLog, TAG, "connectRx:" + msg);
                                 subscriber.onNext(false);
                                 subscriber.onCompleted();
                             }
                         };
+
                     }
                 })
                 .subscribeOn(Schedulers.newThread())
@@ -298,6 +304,10 @@ public class RxSocket {
                         LogUtils.e(OpenLog, TAG, "ReadThread:init:" + e.getMessage());
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail1");
+
+//                        if( conectionListener !=null) {
+//                            conectionListener.onConnectionClose("SocketConnectFail");
+//                        }
                     }
                 }
                 //读取
@@ -317,6 +327,10 @@ public class RxSocket {
                                         socketChannel.register(selector, SelectionKey.OP_READ);
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onSuccess();
+
+                                        if( conectionListener !=null) {
+                                            conectionListener.onConnectionOpen();
+                                        }
                                     } catch (Exception e) {
                                         isReadThreadAlive = false;
                                         socketStatus = SocketStatus.DIS_CONNECT;
@@ -324,6 +338,10 @@ public class RxSocket {
                                         LogUtils.e(OpenLog, TAG, "ReadThread:finish:" + e.getMessage());
                                         if (socketReconnectCallback!=null)
                                             socketReconnectCallback.onFail("SocketConnectFail2");
+
+//                                        if( conectionListener !=null) {
+//                                            conectionListener.onConnectionClose("SocketConnectFail2");
+//                                        }
                                     }
                                 }
                             } else if (key.isReadable()) {
@@ -336,6 +354,10 @@ public class RxSocket {
                                     connectStatus.onNext(SocketStatus.DIS_CONNECT);
                                     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];
@@ -354,6 +376,10 @@ public class RxSocket {
                         LogUtils.e(OpenLog, TAG, "ReadThread:read:" + e.getMessage());
                         if (socketReconnectCallback!=null)
                             socketReconnectCallback.onFail("SocketConnectFail4");
+
+//                        if( conectionListener !=null) {
+//                            conectionListener.onConnectionClose("SocketConnectFail4");
+//                        }
                     }
                 }
             }
@@ -370,4 +396,10 @@ public class RxSocket {
         void onSuccess();
         void onFail(String msg);
     }
+
+    public interface SocketConnectionListener {
+        void onConnectionClose(String errMsg);
+
+        void onConnectionOpen();
+    }
 }
diff --git a/library/build.gradle b/library/build.gradle
index bb3252b5..e25ddfe4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -14,6 +14,9 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            debuggable = false
+        }
+        compileOptions {
         }
     }
 }
-- 
2.17.1