n(0(Y@1$7w
z$ikFG#w^CciCip&d#^ZbI}P2S6W5MAcVOH;z4y>}W`D1dPJv@Chf^)>Jkogx^We!T
z>|D^u?TqoPu4T+*XmaV*_TqXXXBLlfKqZwADSEmOwU@4rMVQ1qjhw+Z{pi)GbzopCn0NDY}to~X!ZT<}!
z@4rA>8atbL7(4$vrzOe13$u53Hn#gW*QETPgZ~H5Cinkk53+!N4CO!9V-Y+FwcNgc
z{_-1_)0JPG+gN^&`w^tIXv(A)pKZ`}=g2rxd!}0pIv^6@{p~tMx9G8pi!;edjT&T*!fU)I)A3(u=K2U6OZDJUguwke)(#0M|>Eo*~vC5P*
z*T>ggHj>!X>#!`XOOfA2pYekvsVW0MgqceYF-o5?7JN$yag<6oiZv27CL|XG3p3#bU6E|eB~&FxQ~7^jK^llbt*78dB`}&MFW|H
zNb^fT;WZFc1^Z`D)RaA$E%-%L2#-VUTAMZ*`TjBcIEKbF6c4R^b!WuWJPZ{U8^?;D
zvDrtJO}vCKng*12JfhM^I3tY_sw|Wic@ojril^0eF6v=Uo`Wq2Gd^EY7t|$^&N-eF
zoC6@RGM?Ltj*l)JpDsX)I>p;{wG`tqwQ!w-rLs`)V|Q(S-y2l^j631crB6yOIuBD)
zIy^(ygvm^C9!-@+vKaSt)-OTgM#`DBxKkEWiV1W6g=Re9C>5KtQLMDW?E}&)x|h%`
zLBI~bBoP8iaKsmx2GJy^E0<}q_%l6G-`z>X#4{|4WS$3i;3%wqyBF^^;RW3xFgUv??xt8#WTTzHgWqTK
z{mfLMKtmh7bykbe0UdIE=+dtG+03Vn_N$H5EBg&bTSW80m`9gP>yL-6O}kR(z`CUu
z2@BvVS&%EP_m1+3C{S?xqJccdUgIl1iJVk(;%E73UVJ0k(77CJ2LJ){m)OLcnaU5eJVqWMCk?yB@6jjA$=a_f
z&_it=5}byZi;OkD<-V5u?X|PA=fjNO6u>a&7P4MS5f*YIA?W2zxnOgY4hO1&$I^WK
zi3U;{U=qoUOg$fbc8&+v=#!gh@mgZC$=CuFsTS{+jw|TgtDnnNMYetHY0FtM()LCw
zTB<7%w4h(eOt4rx*=#h7rE8=r0C!C5`s$A9IJlB8(x(%5r4+Q;vKhC?AybFGlF(Ds8U`?5j`Q`j8(3T0ig)2o@2i}b|jrEc&f}zZ62F?RKKn5
zz4cpowea6MGnh=?4}
z`1_Aey}iLyJ$WTBy}cFJ?sPr13p~nJ)2AC*XI^j7
z<9C`G@lT0&Wk3Z0f)OZ>_V$p{Kf1HeAlk91^>$fDnAhZB7SofF`pQOT%rh46HhO+b
zMME~zw9+g^>0eU(Oy%sL;JjiGnyE8A@Z{jkks5fi8>(DX8S5p$si#mfu2+9wjn*(Z
zywF3Xg2jgyh%
zyw}3d^6L2~moJU@Du+=*I!zP0E_hQjQJy?zGqq2p@^w$ONd~y(hE6>h`cw4t7CTvm
zT;&P6nq#FwREx{c#vbm;5K^-HV_0u_aa&YN74(7BAPueTtO4T?^VBum3|%WP`r8@Vlh+ZbdPZV;oi
zVX1rAbf35O)1!cUq%2hEd?|HNT*kNx?kH`e-s(VIbQU_-k<*rrZ8$P~(3v7^X2l{E
z^_`UnvHdBPp~F;Bo`_1eA`@0$r@>vP#(xwKcq#bNF*_ohEgh4~wGb9Xf=3ri&37nj0uCRk6)mn~{HZ2}3u~fIBSLe#_2jdar3+lmT
zj?zFOmeVNVRrq2brP*EK2(=ce)xDkpv@`65msIK|x>{Zq)X`+%2VZzC1UO_jsj01V
zx&3*ro;rc@jnw0K<@-XoU2^ZLx8|-4SDUT6(j&Jb+i_-6;p$XzH_g}vHwHRO61tNU
z@d18+XCDqnbd-SRBYS0Z_p>}3nBv9otQelEnodDeLWc5nYIW*C>S{2RZA8prT
z=*rOtj_tH+Itc|WZMSyv{*h%+PlTl_at`-GiUq1wAvspJyfEolpBuemPMm}uq!5m$
zFqUQ3LF(3)6Idg)>0t^!hExxocw!EC^M`|>HR??f4k$i}N?nbR(eJ_DJ10r;Nh!z7
zk@L(j(;UTRuF%tj4^Oy8*vGGa&vYMc9w7hH!Ocgq%E&DyWQU!J9;OJ`s9%|<<3`iR
z&MeF;Kx0=}b<(mE$IBXX__3HIT_rMZ9P!Y3>In`zY}~7PR`(&hH{-T
z6>@Rp*8yjbQKBx1Frmi*+2{
zq&7JFa79*aLd}xwpt%6vVXusAdeXA7x^oD#fRM$Zw8}BLNfX)0E1A~9(*}F*Q7gHz
z>jZn>um-AB-P0a7{T|W$n1EH%D%@zBW&Gnbv&S@<#R|O#YJ8pR$m>DKi~#RPsBwMy
zPc(m~T+tgB-%&>5w#ZWly`vZ4B1wmgV@Y935#vN@^+IW?U3N|i|I}z`L>;}oSm6aD
zLEpwA<9Q{Z0#J4d!Tv%G13+2AC`QC23o^Vh04eaBvxUV+xp)lW+^uE*Nh!=6ZlCBTC
z6duR?6~MkYiE`{!!ed>imGripBf3XEg98&{&bjD^`qrsY9vuzCdJz;QmRElnR$*}2_s?5
zb$HHolmmMkI%)ztOmWz_u99@|RAVs=`{f`T=gh+;_Iw`9evGb*y{ly#U2l!C9o(<;
zn_HJ!`kU`}6kV>Nsg5J`x?DZXKx>ygxwxWkfE
zmN{A@GTNy*a+YcpL$kW}ZcVTFYTt(L!0;aqbw4g!L!P*eh&KP$$1Hz7f~zU?sjEjdz1~gtu2_VOMtw9!#bTYJ9lnWD&)A~R+)Ot_{CjO{q%1Xx
zhUTg560z+HUA~)i=|t)`X#Pt(tVfPVZoIC{jOjvJOzDpuzvq`f4%BwTp7x~Ghhu-I
z=FZZJP|#LQlUJc9XdT6A9VadM_xyGeL0JZz*Nd=@R?Ii|$0SImUwijxNwp;6?YoB+6hsVu*8$ihKJE-b=|>A_pqU>D9}&%j%<-OOxuT>kx21R$?6E`h7411k^JNPaxGKcO?JVDt
zf-;K8Lv9+ZCV|N>>C+l;EDq{I>w*c1Y%_)3vSCBqJ%vXen5LfYYnC3r0BsTMJpR?R
zfApEqMs0_K5o%mD?d%G(5n}Ycn|OXbBf_bJ88{FN(M4^uo`|7Cn|R0D}VpeuGqZ@T*W72XaHItM(U>{dqDZm$tPhN|;@
z;Adt-Wbn69CJ@GafnDaL<0LKi1iA6RaFUh94d4@*!xXQwr9;GqH{BrA^kG#krsh|`
zX=Dw;OX4q+4LVLlbaE-D;aZL&aqYAte73Xb#3uIlXOjTuK4u4txan^zmB$LWRxZ3Y
z+T6yX`8IpjrlUtJEt-`9pk3TK3e6cJN(r^a0=s6aAw6nmrQ&!Hemhnh2=#vUBU-FzY^67;|V&Rzo5C8uO3s
zwK)>%qbk+@82_mx+Yu`n(|K@b>RRMnD-R<1YXWkuOK*fvv1$vhl$f|X62#(Zt~sR_
zn@>;H^OiCRcI409v`>fpBLj=g=rikLS0NKsAQVsIs#$2cIJ);T1j;`ybc5oOfz?I#
z+erVmde&~Es8C!K1w~^-i)?}9GdqrYBJZvt0UN<_YskA6Kmfl1`4V%(yN_|m_U$G
zi$49w)Nn|qI}(F8R340`&Cp~=?^i2sL$1Zqgn^;3b{bc5%8|i~x~IuNakCF?f0KO6
zR#OJpiG{Hgn+wz^+f~%Oja4+5R-dyV_zpS_p#!IwqB>1xj-;_z3|)YmCS&B>jl`hP
zFk@A@%6L(SkIsI5YHp{3E;m^257P_AbV;qG-@0s6^AlU}Eytrv5|e3+=qVjKAiNBB
zMV;cEfS+Rhs?Q0D+)H}o#V76VHTvBe<$c~_@<=LQax=|?FE|{ev950L{;@m5b@~q6
zAV5Q#cUw%j)Fg^a&19_`GB>71*%|5EGI;6^#9m+aX6B;uZ
zgh(FwaO6#L0r+iN%>UQ~Ti+K)equ)Y$K2EB^acEWayX-AOe5&Z`+N6VT1;eDcbobf
zN)AmhGme4Yz-#{~OSRqrg2{ut=!Mpkk(fLvOXb?8y<~?9JV0mp4XIN7TJJ44QtL_p
zE3^Ml_RVmh%u{jTbVscZ8_TpgVcJ!?C2o9wT$Z9~
zFg;1JNYw~dh~0{RJd2K-zuY7&+e6?6gUEjIjMW2Yyxzu~-?>QW*gT|Soj!!NJV6XC
zIUiHa7?!0HyU%@3y_7;j($LKOGo41i_%Vo|>zkphR!NTI2Og$RZ$ACJxr_7$R~g~H
z%Y|$_DtF|DoleHGrW?~Hn}0*PJ51SX<0owdP3dCjZA(@<_9zg}q3XaM==@tXFV3T1
zBa3rgQInc4eiT1u3I9t(B_)}1HM@x`k=V53td3Zw6+*w&RA6;Wo!MTb3;rqXi+n@Aj{&m4;A(^crp?Hs3bB(%azM}Z_-xMm>@%8IXm6V*}EwqZ_bB3q7
zntj@}2OPicQ%zgUN4eG#JjH0t0y1>&7@?wO1EDv!sPrc4m;9-$7tfN?v8z_`Q*64F
z!(df@i_u~=h6SG&(XVo(U{fFX?K=0AzQ`U6-5&(p-mH*Lmc(MpRg#P-oBWFYu1eb?
z{_G2=)Th$?l2~NHn9ZT6}cx2*k3dQ!@#gp-ZzW6M%$
z9HK0hmFW_T6)#D5Liwwn&HCI{3+|vUY7iK&%pDWz2J%l5$SQp1XBh)IoJq3H!Vd8JNX~f=O;6l@ca>qU9
zRBo8@6ycK^xRt87k6898X_zwe7Dm^}U|)g`gq+#Seu~l`U2*$CnKWWuCdt7CKocQq
zX^e*_+kNXy7m-dp66`$m>pToRnAR_<&`^NDS{gFfFa8xiy0x*_Mmz`6zWWhQyp^3n
zyccWf9bPqi$J(VghxH+<7<(m|G1&*McnJU3FyIy3RsIjdK+&<_;N`rl;m}_Tg4T0&
z(XICff#M<38>8YO$oK1C_rcI#_rWy-=U)p#cE+S$bJ=lwGReH_#-NrBzr&%i;vvG*
zBWE_tUM5%e(6gc9Vbl}Z-{zSiV{&ST#fsmEoG)v_Xu;JV@Kyd;H1~rA^4$jNy%_R+
z74m%u>RnjWh+X{&DdF=yAwczJljgZg@}^7g<}+ijOZP^E`8k*6`BUyHR^}x;;X^**
z<5xl_)p3{FtV8^rL&}{1)%&l6kDmoy%CjP5N4IEpIlg+FK9R0-bk7g=oDngnG-9y|
zm|5-~%g-8CUz0g;!;TRQFN~zI1$m{Nbu@}<<%-x9zRh+i>1cnmL>Ky;u)JF+s3GDr
zazq4Y1&fN!1BiTaD>$S*LHU(Ou?5CijJAU_l1tc{u;)g+r_PNDuI
z#MK!At6L4h4Xe0Aw?m+JT!%<3dCNGH7H5`9*1e%A$*oPM*9|c8$CAHT8wvabx|JeOX|m%fjbF!F|Szr+6d>pD;#
z>^<YO>a;KB5#8|r5xU4NZf9leUe!D$>0%Igs(bpz)rY0myj4yvqbZW@J$k4cxc@ZrD5E!TqkY`N|p|Hg@z-jo$Dx
z-&C{#ITpuXYvugfBQ{U#@D26_y7xb_$=qff~;eCfz|v6f*9ggA12GnJbA8iHyF!vz51q<{s(~LAVia`5rCmz#*fb7HL&H=Gh?Q{mT^34J|a{R5`aR*M-oHu8m
zcl(>~{y&vm2|QG5A8wO1j2X+7vPH~TBU6N|5rY!4W{WflVVJSYzGrJu+9uuHFvb>x
z7)iDvy7sNqWvnT8?74G3Mp|^g`^^02oSEM|&;OnCo^8(ioJXK>*v7QVqZmAB&sy0S
za_^XLSXZB?P2V
z@JcTHgxJbgtZmj4I-$*YV*8@3Us9$W+v|df-dR2+
zHEG<5(awoei;_z!cN`O6BPSTSYz^^Zeldq}{5VsJMsdf>omnU-L|E%
zabAea9!{z$5)%wVx^v~$><`Q5Zl2$E(g?@j|7A+eYmqSb?vg*dB82aRTyEW-s38~m
zVU1Q0QCA{)`a1jeoKGtpS*-HIHR{Zhwc%aN%(6X^yHrB=-fxpno)@DCoU}9|*5T-x
z5Nb7b9$+E)7`7p44=}Niw`2%R+#UPix4U7Iu%J%;B75t32;~)Z;5sAUu%lSYpLfY|
zVS?z4qgPuzneTteamJ3r^>-(?pXFJnb7%mTZqdt`%QNU
zpZ7E7nN>F05Z~`tKFSGD!%tpOhupTdP0ReJzhLV=jdV+@PlK~A$dZLc$3Z7Ne$N4q
z-e>Xb3ZbGd7MgsXvf9yc`*6|mDOvR7Z4TJq&`x1FvjbU^mV+yd%MHd%lNQ!wy#iBJ
zE!7idZbR|Z!rS_Vc&r&kx+&jtI;SJYpGC!Y2vJ{DCyY5&oj>1~}Z
z1Szg99)1@eZIJBP?b2O(f>r;ba+G9^r@#E~$
zwCI+Xp5e9bx4GlYOP+>TKA0S>#dst9=H6I{B)?BTb6yLLI^rfN+SntFMoGFW-$zP*
z5@UG*11U~sbyN!nQ^P;>b8e>m;oKf@`KZyOoZf6Mak&}9j{5}cvh9H9AHP!6NnNovPe1&fbzvD5l4w?|9LhJ%y!;xO!%Xn{s6n
ze-}bqdO4NbsZP)48!}A79`UJxW8EPtxc&|iJ9$!h=^3_(lb3rwpLuv;NiEP(d(^xb
z&d2#iS+d;6qVb7BpT2PG!Z^q*Zw1fc3{RV6;Fc54PtdrQuVh?DXT@gu~^rpbY56xvLpS0+i%z&-SvXwL0_@+!D>BBG_|6&d!V5
zf1iXtH**5N@88*|TZcux9MzvciJ83A?>SP)q<|Pxcayhj6CpSu53*~&lWu}VdMvPM
zo6IFm~-
zz^E$xxE~a{3ODc|5f_f6wyt7xE3{{MOBPDG{G#tJH=z*S3Hz+LcN;DavMadh&oTB>
z0tI$PD$bq{MpySyy^(=jnv*;VNnix)T)^ie>avTv)+YXM)&H7DT^JY?oe=EDyk$|xJKV;V8q($gf#lz9@2As)^ZHi_rW3E
z_f^3DnP8LspTq}u;CY%HW?Um=i2}Y?VaNHkDr56C*$tFf7tb~G{35n0p~mkwu@S2av|7<4`Ip|^NP5Yjx#VSo7bHDe(&(da2U
zuiP#PxJ@RFtshw7sULTS-(hSrc{LE3RC+=UK8On%+t^>ctmac;+Ro
zyKec<_nWJkEv8v7YB;$#e5qL-mJJghKpF-MT8#v7xSGO+a@r%pN-#~N+k$y$-o_-
zc_AoCZR#VV4*~OqdP~ikA*8sHl+{W#gdAoCjuzW@Kz44O{zW}xP{F=!QVp1H1bnS!
zfqhH;J`D^Y0KkU8sIME;P1#_-Dh`BctpO+=L!JE^|MhKM+V_Ad5CFCYfQ6&Z(pc+p
zU|UmxK(I9c)L!cBH`Mibu&wz(K-d}pJ~K6f=tus#^<+(ic9nEJ1`_VPE_Bqh$&<)ZiPu14z8Q`k=%2xRady~g%YZ<_0^;O3ES28ru)z)Hw>*}i*{@=xZ
zx*=>HNB~?|G+;w!|4+pqJz2DVplu7A&y;~72^z2=der2@bpzZ+KWr??wMFp1R() {
@@ -1292,7 +1295,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
private void checkIsRest() {
int desktop_clear = Settings.Global.getInt(getContentResolver(), "desktop_clear", 0);
int aihuaUnlock = Settings.Global.getInt(getContentResolver(), "Aihua_unlock_state", 0);
- if ((!JGYUtils.getInstance().getDeviceIsLocked()|| aihuaUnlock == 1) && desktop_clear != 1) {
+ if ((!JGYUtils.getInstance().getDeviceIsLocked() || aihuaUnlock == 1) && desktop_clear != 1) {
Settings.Global.putInt(getContentResolver(), "desktop_clear", 1);
JGYUtils.getInstance().cleanAoleLauncher3Cache();
}
@@ -1983,7 +1986,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onDestroy();
}
- LocalBroadcastManager.getInstance(this).unregisterReceiver(mMessageReceiver);
}
public LauncherAccessibilityDelegate getAccessibilityDelegate() {
diff --git a/src/com/aoleyun/os/base/BaseApplication.java b/src/com/aoleyun/os/base/BaseApplication.java
index 5e86a4f..528ba2b 100644
--- a/src/com/aoleyun/os/base/BaseApplication.java
+++ b/src/com/aoleyun/os/base/BaseApplication.java
@@ -1,337 +1,32 @@
package com.aoleyun.os.base;
-import android.annotation.SuppressLint;
import android.app.Application;
-import android.content.Context;
import android.util.Log;
import com.aoleyun.os.manager.ConnectManager;
-import com.aoleyun.os.uiuiutils.ToastUtil;
-import com.aoleyun.os.uiuiutils.Utils;
import com.aoleyun.os.network.NetInterfaceManager;
-import com.aoleyun.os.network.UrlAddress;
+import com.aoleyun.os.push.PushManager;
import com.aoleyun.os.uiuiutils.JGYUtils;
import com.aoleyun.os.uiuiutils.TimeUtils;
+import com.aoleyun.os.uiuiutils.ToastUtil;
import com.arialyy.aria.core.Aria;
-import com.tencent.android.tpush.XGIOperateCallback;
-import com.tencent.android.tpush.XGPushConfig;
-import com.tencent.android.tpush.XGPushManager;
import com.tencent.mmkv.MMKV;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
-import io.reactivex.Observer;
-import io.reactivex.disposables.Disposable;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
public class BaseApplication extends Application {
private static final String TAG = BaseApplication.class.getSimpleName();
- @SuppressLint("StaticFieldLeak")
- private static BaseApplication app;
- @SuppressLint("StaticFieldLeak")
- private static Context context;
-
- public static BaseApplication getInstance() {
- return app;
- }
-
- public static Context getContext() {
- return context;
- }
@Override
public void onCreate() {
super.onCreate();
- app = this;
- context = this;
String rootDir = MMKV.initialize(this);
Log.e(TAG, "onCreate: " + rootDir);
+
+ PushManager.init(this);
JGYUtils.init(this);
TimeUtils.init(this);
Aria.init(this);
NetInterfaceManager.init(this);
ToastUtil.init(this);
ConnectManager.init(this);
-
- initPush();
}
-
- private void initPush() {
-
- }
-
- private void initAliasObservable() {
- Log.e(TAG, "initAliasObservable: ");
- Observable.create(new ObservableOnSubscribe() {
- @Override
- public void subscribe(ObservableEmitter emitter) throws Exception {
- onAliasResult = new OnAliasResult() {
- @Override
- public void onResult(int code) {
- Log.e("initAliasObservable", "onResult: " + code);
- emitter.onNext(code);
- }
- };
- }
- }).throttleLast(1, TimeUnit.HOURS)
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
-
- }
-
- @Override
- public void onNext(Integer integer) {
- Log.e("initAliasObservable", "onNext: " + integer);
- String s = "alias:\t";
- switch (integer) {
- case 0:
- Log.e("jiguangInterface", s + "Alias绑定成功");
- break;
- case 6001:
- Log.e("jiguangInterface", s + "无效的设置");
- break;
- case 6011:
- Log.e("jiguangInterface", s + "短时间内操作过于频繁");
- break;
- case 6013:
- Log.e("jiguangInterface", s + "用户设备时间轴异常");
- ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + s + "code:6013");
- break;
- case 6022:
- Log.e("jiguangInterface", s + "alias 操作正在进行中");
- break;
- //需要重新设置
- case 6002:
- Log.e("jiguangInterface", s + "设置超时，请重试");
- setJpushAlias();
- break;
- case 6014:
- Log.e("jiguangInterface", s + "服务器繁忙,建议重试");
- setJpushAlias();
- break;
- case 6020:
- Log.e("jiguangInterface", s + "建议过一段时间再设置");
- setJpushAlias();
- break;
- case 6024:
- Log.e("jiguangInterface", s + "服务器内部错误");
- setJpushAlias();
- break;
- case 6017:
- case 6027:
- Log.e("jiguangInterface", s + "别名绑定的设备数超过限制");
- cleanJpushAlias();
- setJpushAlias();
- break;
- default:
- break;
- }
-
- }
-
- @Override
- public void onError(Throwable e) {
-
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
-
-// public void onAliasOperatorResult(JPushMessage jPushMessage) {
-// if (jPushMessage == null) {
-// return;
-// }
-// int errorCode = jPushMessage.getErrorCode();
-// onAliasResult.onResult(errorCode);
-// }
-
- public static void setJpushAlias() {
- Log.e("jiguangInterface", "30s后重新设置alias");
-// JPushInterface.setAlias(context, TagAliasOperatorHelper.sequence++, Utils.getSerial());
- }
-
- private void initTagObservable() {
- Log.e(TAG, "initTagObservable: ");
- Observable.create(new ObservableOnSubscribe() {
- @Override
- public void subscribe(ObservableEmitter emitter) {
- onTagResult = new OnTagResult() {
- @Override
- public void onResult(int code) {
- Log.e("initTagObservable", "onResult: " + code);
- emitter.onNext(code);
- }
- };
- }
- }).throttleLast(1, TimeUnit.HOURS)
- .subscribe(new Observer() {
- @Override
- public void onSubscribe(Disposable d) {
-
- }
-
- @Override
- public void onNext(Integer integer) {
- Log.e("initTagObservable", "onNext: " + integer);
- String s = "tags:\t";
- switch (integer) {
- case 0:
- Log.e("jiguangInterface", s + "Tag绑定成功");
- break;
- case 6001:
- Log.e("jiguangInterface", s + "无效的设置");
- break;
- case 6005:
- Log.e("jiguangInterface", s + "某一个 tag 字符串不合法");
- ToastUtil.show("设备标签不合法,联系管理员修改\t" + "code:6005");
- break;
- case 6006:
- Log.e("jiguangInterface", s + "某一个 tag 超长");
- ToastUtil.show("设备标签过长,联系管理员修改\t" + "code:6006");
- break;
- case 6007:
- Log.e("jiguangInterface", s + "tags 数量超出限制");
- ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6007");
- break;
- case 6008:
- Log.e("jiguangInterface", s + "tag 超出总长度限制");
- ToastUtil.show("设备标签超出总长度限制,联系管理员修改\t" + "code:6008");
- break;
- case 6011:
- Log.e("jiguangInterface", s + "短时间内操作过于频繁");
- break;
- case 6013:
- Log.e("jiguangInterface", s + "用户设备时间轴异常");
- ToastUtil.show("用户设备时间轴异常,修改后重新登陆\t" + "code:6013");
- break;
- case 6018:
- Log.e("jiguangInterface", s + "Tags 过多");
- cleanJpushTag();
- ToastUtil.show("设备标签数量超出限制,联系管理员修改\t" + "code:6018");
- break;
- case 6021:
- Log.e("jiguangInterface", s + "tags 操作正在进行中");
- break;
- //需要重新设置
- case 6002:
- Log.e("jiguangInterface", s + "设置超时，请重试");
- setJpushTags();
- break;
- case 6014:
- Log.e("jiguangInterface", s + "服务器繁忙,建议重试");
- setJpushTags();
- break;
- case 6020:
- Log.e("jiguangInterface", s + "建议过一段时间再设置");
- setJpushTags();
- break;
- case 6024:
- Log.e("jiguangInterface", s + "服务器内部错误");
- setJpushTags();
- break;
- default:
- break;
- }
- }
-
- @Override
- public void onError(Throwable e) {
-
- }
-
- @Override
- public void onComplete() {
-
- }
- });
- }
-
-// public void onTagOperatorResult(JPushMessage jPushMessage) {
-// if (jPushMessage == null) {
-// return;
-// }
-// int errorCode = jPushMessage.getErrorCode();
-// onTagResult.onResult(errorCode);
-// }
-
- public static void setJpushTags() {
- Log.e("jiguangInterface", "30s后重新设置tags");
-// HTTPInterface.setJpushTags(context);
- }
-
- private static OnAliasResult onAliasResult;
-
- interface OnAliasResult {
- void onResult(int code);
- }
-
- private static OnTagResult onTagResult;
-
- interface OnTagResult {
- void onResult(int code);
- }
-
- private String key = "MGM3YmE1YTE2MjJkYmE3OGQ1YmQwMGNjOjFjOTJiODVjZjM0ODhiNTJkNDQyNDJlOA==";
-
- synchronized public void cleanJpushAlias() {
- //alias的绑定的设备超过10个，但是alias应该是一个设备对应一个，在重置设备后jpush的regid会变动，所以需要清除
- //https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device/#_5
- OkHttpClient client = new OkHttpClient();
- Request request = new Request.Builder()
- .url(UrlAddress.DELETE_JPUSH_ALIAS + Utils.getSerial())
- .header("Authorization", key)
- .delete()
- .build();
- Call call = client.newCall(request);
- call.enqueue(new Callback() {
- @Override
- public void onFailure(@NotNull Call call, @NotNull IOException e) {
- Log.e("cleanJpushAlias", "onFailure: " + e.getMessage());
- }
-
- @Override
- public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
- Log.e("cleanJpushAlias", "onResponse: " + response.toString());
- Log.e(TAG, "onResponse: " + "清除Alias成功");
- }
- });
- }
-
- synchronized public void cleanJpushTag() {
- OkHttpClient client = new OkHttpClient();
- Request request = new Request.Builder()
- .url(UrlAddress.DELETE_JPUSH_TAG + Utils.getSerial())
- .header("Authorization", key)
- .delete()
- .build();
- Call call = client.newCall(request);
- call.enqueue(new Callback() {
- @Override
- public void onFailure(@NotNull Call call, @NotNull IOException e) {
- Log.e("cleanJpushTag", "onFailure: " + e.getMessage());
- }
-
- @Override
- public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
- Log.e("cleanJpushTag", "onResponse: " + response.toString());
- Log.e(TAG, "onResponse: " + "清除Tag成功");
- }
- });
- }
-
}
diff --git a/src/com/aoleyun/os/comm/CommonConfig.java b/src/com/aoleyun/os/comm/CommonConfig.java
new file mode 100644
index 0000000..d9a605b
--- /dev/null
+++ b/src/com/aoleyun/os/comm/CommonConfig.java
@@ -0,0 +1,6 @@
+package com.aoleyun.os.comm;
+
+public class CommonConfig {
+ public static final String MMKV_ID = "InterProcessKV";
+
+}
diff --git a/src/com/aoleyun/os/jpush/ExampleApplication.java b/src/com/aoleyun/os/jpush/ExampleApplication.java
deleted file mode 100644
index 0106f47..0000000
--- a/src/com/aoleyun/os/jpush/ExampleApplication.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.app.Application;
-
-/**
- * For developer startup JPush SDK
- *
- * 一般建议在自定义 Application 类里初始化。也可以在主 Activity 里。
- */
-public class ExampleApplication extends Application {
- private static final String TAG = "JIGUANG-Example";
-
- @Override
- public void onCreate() {
- Logger.d(TAG, "[ExampleApplication] onCreate");
- super.onCreate();
-
-// JPushInterface.setDebugMode(true); // 设置开启日志,发布时请关闭日志
-// JPushInterface.init(this); // 初始化 JPush
- }
-}
diff --git a/src/com/aoleyun/os/jpush/ExampleUtil.java b/src/com/aoleyun/os/jpush/ExampleUtil.java
deleted file mode 100644
index 9de70b0..0000000
--- a/src/com/aoleyun/os/jpush/ExampleUtil.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.os.Looper;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class ExampleUtil {
- public static final String PREFS_NAME = "JPUSH_EXAMPLE";
- public static final String PREFS_DAYS = "JPUSH_EXAMPLE_DAYS";
- public static final String PREFS_START_TIME = "PREFS_START_TIME";
- public static final String PREFS_END_TIME = "PREFS_END_TIME";
- public static final String KEY_APP_KEY = "JPUSH_APPKEY";
-
- public static boolean isEmpty(String s) {
- if (null == s)
- return true;
- if (s.length() == 0)
- return true;
- if (s.trim().length() == 0)
- return true;
- return false;
- }
- /**
- * 只能以 “+” 或者 数字开头；后面的内容只能包含 “-” 和 数字。
- * */
- private final static String MOBILE_NUMBER_CHARS = "^[+0-9][-0-9]{1,}$";
- public static boolean isValidMobileNumber(String s) {
- if(TextUtils.isEmpty(s)) return true;
- Pattern p = Pattern.compile(MOBILE_NUMBER_CHARS);
- Matcher m = p.matcher(s);
- return m.matches();
- }
- // 校验Tag Alias 只能是数字,英文字母和中文
- public static boolean isValidTagAndAlias(String s) {
- Pattern p = Pattern.compile("^[\u4E00-\u9FA50-9a-zA-Z_!@#$&*+=.|]+$");
- Matcher m = p.matcher(s);
- return m.matches();
- }
-
- // 取得AppKey
- public static String getAppKey(Context context) {
- Bundle metaData = null;
- String appKey = null;
- try {
- ApplicationInfo ai = context.getPackageManager().getApplicationInfo(
- context.getPackageName(), PackageManager.GET_META_DATA);
- if (null != ai)
- metaData = ai.metaData;
- if (null != metaData) {
- appKey = metaData.getString(KEY_APP_KEY);
- if ((null == appKey) || appKey.length() != 24) {
- appKey = null;
- }
- }
- } catch (NameNotFoundException e) {
-
- }
- return appKey;
- }
-
- // 取得版本号
- public static String GetVersion(Context context) {
- try {
- PackageInfo manager = context.getPackageManager().getPackageInfo(
- context.getPackageName(), 0);
- return manager.versionName;
- } catch (NameNotFoundException e) {
- return "Unknown";
- }
- }
-
- public static void showToast(final String toast, final Context context)
- {
- new Thread(new Runnable() {
-
- @Override
- public void run() {
- Looper.prepare();
-// Toast.makeText(context, toast, Toast.LENGTH_SHORT).show();
- Looper.loop();
- }
- }).start();
- }
-
- public static boolean isConnected(Context context) {
- ConnectivityManager conn = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo info = conn.getActiveNetworkInfo();
- return (info != null && info.isConnected());
- }
-
- public static String getImei(Context context, String imei) {
- String ret = null;
- try {
- TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- ret = telephonyManager.getDeviceId();
- } catch (Exception e) {
- Logger.e(ExampleUtil.class.getSimpleName(), e.getMessage());
- }
- if (isReadableASCII(ret)){
- return ret;
- } else {
- return imei;
- }
- }
-
- private static boolean isReadableASCII(CharSequence string){
- if (TextUtils.isEmpty(string)) return false;
- try {
- Pattern p = Pattern.compile("[\\x20-\\x7E]+");
- return p.matcher(string).matches();
- } catch (Throwable e){
- return true;
- }
- }
-
-// public static String getDeviceId(Context context) {
-// return JPushInterface.getUdid(context);
-// }
-}
diff --git a/src/com/aoleyun/os/jpush/LocalBroadcastManager.java b/src/com/aoleyun/os/jpush/LocalBroadcastManager.java
deleted file mode 100644
index ae2ef04..0000000
--- a/src/com/aoleyun/os/jpush/LocalBroadcastManager.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * Created by efan on 2017/4/14.
- */
-
-public final class LocalBroadcastManager {
- private static final String TAG = "JIGUANG-Example";
- private static final boolean DEBUG = false;
- private final Context mAppContext;
- private final HashMap> mReceivers = new HashMap>();
- private final HashMap> mActions = new HashMap>();
- private final ArrayList mPendingBroadcasts = new ArrayList();
- static final int MSG_EXEC_PENDING_BROADCASTS = 1;
- private final Handler mHandler;
- private static final Object mLock = new Object();
- private static LocalBroadcastManager mInstance;
-
- public static LocalBroadcastManager getInstance(Context context) {
- Object var1 = mLock;
- synchronized (mLock) {
- if (mInstance == null) {
- mInstance = new LocalBroadcastManager(context.getApplicationContext());
- }
-
- return mInstance;
- }
- }
-
- private LocalBroadcastManager(Context context) {
- this.mAppContext = context;
- this.mHandler = new Handler(context.getMainLooper()) {
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 1:
- LocalBroadcastManager.this.executePendingBroadcasts();
- break;
- default:
- super.handleMessage(msg);
- }
-
- }
- };
- }
-
- public void registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
- HashMap var3 = this.mReceivers;
- synchronized (this.mReceivers) {
- ReceiverRecord entry = new ReceiverRecord(filter, receiver);
- ArrayList filters = (ArrayList) this.mReceivers.get(receiver);
- if (filters == null) {
- filters = new ArrayList(1);
- this.mReceivers.put(receiver, filters);
- }
-
- filters.add(filter);
-
- for (int i = 0; i < filter.countActions(); ++i) {
- String action = filter.getAction(i);
- ArrayList entries = (ArrayList) this.mActions.get(action);
- if (entries == null) {
- entries = new ArrayList(1);
- this.mActions.put(action, entries);
- }
-
- entries.add(entry);
- }
-
- }
- }
-
- public void unregisterReceiver(BroadcastReceiver receiver) {
- HashMap var2 = this.mReceivers;
- synchronized (this.mReceivers) {
- ArrayList filters = (ArrayList) this.mReceivers.remove(receiver);
- if (filters != null) {
- for (int i = 0; i < filters.size(); ++i) {
- IntentFilter filter = (IntentFilter) filters.get(i);
-
- for (int j = 0; j < filter.countActions(); ++j) {
- String action = filter.getAction(j);
- ArrayList receivers = (ArrayList) this.mActions.get(action);
- if (receivers != null) {
- for (int k = 0; k < receivers.size(); ++k) {
- if (((ReceiverRecord) receivers.get(k)).receiver == receiver) {
- receivers.remove(k);
- --k;
- }
- }
-
- if (receivers.size() <= 0) {
- this.mActions.remove(action);
- }
- }
- }
- }
-
- }
- }
- }
-
- public boolean sendBroadcast(Intent intent) {
- HashMap var2 = this.mReceivers;
- synchronized (this.mReceivers) {
- String action = intent.getAction();
- String type = intent.resolveTypeIfNeeded(this.mAppContext.getContentResolver());
- Uri data = intent.getData();
- String scheme = intent.getScheme();
- Set categories = intent.getCategories();
- boolean debug = (intent.getFlags() & 8) != 0;
- if (debug) {
- Logger.v("LocalBroadcastManager", "Resolving type " + type + " scheme " + scheme + " of intent " + intent);
- }
-
- ArrayList entries = (ArrayList) this.mActions.get(intent.getAction());
- if (entries != null) {
- if (debug) {
- Logger.v("LocalBroadcastManager", "Action list: " + entries);
- }
-
- ArrayList receivers = null;
-
- int i;
- for (i = 0; i < entries.size(); ++i) {
- ReceiverRecord receiver = (ReceiverRecord) entries.get(i);
- if (debug) {
- Logger.v("LocalBroadcastManager", "Matching against filter " + receiver.filter);
- }
-
- if (receiver.broadcasting) {
- if (debug) {
- Logger.v("LocalBroadcastManager", " Filter\'s target already added");
- }
- } else {
- int match = receiver.filter.match(action, type, scheme, data, categories, "LocalBroadcastManager");
- if (match >= 0) {
- if (debug) {
- Logger.v("LocalBroadcastManager", " Filter matched! match=0x" + Integer.toHexString(match));
- }
-
- if (receivers == null) {
- receivers = new ArrayList();
- }
-
- receivers.add(receiver);
- receiver.broadcasting = true;
- } else if (debug) {
- String reason;
- switch (match) {
- case -4:
- reason = "category";
- break;
- case -3:
- reason = "action";
- break;
- case -2:
- reason = "data";
- break;
- case -1:
- reason = "type";
- break;
- default:
- reason = "unknown reason";
- }
-
- Logger.v("LocalBroadcastManager", " Filter did not match: " + reason);
- }
- }
- }
-
- if (receivers != null) {
- for (i = 0; i < receivers.size(); ++i) {
- ((ReceiverRecord) receivers.get(i)).broadcasting = false;
- }
-
- this.mPendingBroadcasts.add(new BroadcastRecord(intent, receivers));
- if (!this.mHandler.hasMessages(1)) {
- this.mHandler.sendEmptyMessage(1);
- }
-
- return true;
- }
- }
-
- return false;
- }
- }
-
- public void sendBroadcastSync(Intent intent) {
- if (this.sendBroadcast(intent)) {
- this.executePendingBroadcasts();
- }
-
- }
-
- private void executePendingBroadcasts() {
- while (true) {
- BroadcastRecord[] brs = null;
- HashMap i = this.mReceivers;
- synchronized (this.mReceivers) {
- int br = this.mPendingBroadcasts.size();
- if (br <= 0) {
- return;
- }
-
- brs = new BroadcastRecord[br];
- this.mPendingBroadcasts.toArray(brs);
- this.mPendingBroadcasts.clear();
- }
-
- for (int var6 = 0; var6 < brs.length; ++var6) {
- BroadcastRecord var7 = brs[var6];
-
- for (int j = 0; j < var7.receivers.size(); ++j) {
- ((ReceiverRecord) var7.receivers.get(j)).receiver.onReceive(this.mAppContext, var7.intent);
- }
- }
- }
- }
-
- private static class BroadcastRecord {
- final Intent intent;
- final ArrayList receivers;
-
- BroadcastRecord(Intent _intent, ArrayList _receivers) {
- this.intent = _intent;
- this.receivers = _receivers;
- }
- }
-
- private static class ReceiverRecord {
- final IntentFilter filter;
- final BroadcastReceiver receiver;
- boolean broadcasting;
-
- ReceiverRecord(IntentFilter _filter, BroadcastReceiver _receiver) {
- this.filter = _filter;
- this.receiver = _receiver;
- }
-
- public String toString() {
- StringBuilder builder = new StringBuilder(128);
- builder.append("Receiver{");
- builder.append(this.receiver);
- builder.append(" filter=");
- builder.append(this.filter);
- builder.append("}");
- return builder.toString();
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/aoleyun/os/jpush/Logger.java b/src/com/aoleyun/os/jpush/Logger.java
deleted file mode 100644
index a9dfe7f..0000000
--- a/src/com/aoleyun/os/jpush/Logger.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.util.Log;
-
-/**
- * Created by efan on 2017/4/13.
- */
-
-public class Logger {
-
- //设为false关闭日志
- private static final boolean LOG_ENABLE = true;
-
- public static void i(String tag, String msg){
- if (LOG_ENABLE){
- Log.i(tag, msg);
- }
- }
- public static void v(String tag, String msg){
- if (LOG_ENABLE){
- Log.v(tag, msg);
- }
- }
- public static void d(String tag, String msg){
- if (LOG_ENABLE){
- Log.d(tag, msg);
- }
- }
- public static void w(String tag, String msg){
- if (LOG_ENABLE){
- Log.w(tag, msg);
- }
- }
- public static void e(String tag, String msg){
- if (LOG_ENABLE){
- Log.e(tag, msg);
- }
- }
-
-}
diff --git a/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java b/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
deleted file mode 100644
index 8b0a136..0000000
--- a/src/com/aoleyun/os/jpush/MyJPushMessageReceiver.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.content.Context;
-
-import com.aoleyun.os.base.BaseApplication;
-
-/**
- * 自定义JPush message 接收器,包括操作tag/alias的结果返回(仅仅包含tag/alias新接口部分)
- * */
-//public class MyJPushMessageReceiver extends JPushMessageReceiver {
-//
-// @Override
-// public void onTagOperatorResult(Context context, JPushMessage jPushMessage) {
-// TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage);
-// super.onTagOperatorResult(context, jPushMessage);
-// BaseApplication.getInstance().onTagOperatorResult(jPushMessage);
-// }
-// @Override
-// public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){
-// TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage);
-// super.onCheckTagOperatorResult(context, jPushMessage);
-// }
-// @Override
-// public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) {
-// TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage);
-// super.onAliasOperatorResult(context, jPushMessage);
-// BaseApplication.getInstance().onAliasOperatorResult(jPushMessage);
-// }
-//
-// @Override
-// public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) {
-// TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage);
-// super.onMobileNumberOperatorResult(context, jPushMessage);
-// }
-//
-// @Override
-// public void onMessage(Context context, CustomMessage customMessage) {
-// super.onMessage(context, customMessage);
-// }
-//}
diff --git a/src/com/aoleyun/os/jpush/MyReceiver.java b/src/com/aoleyun/os/jpush/MyReceiver.java
deleted file mode 100644
index f2236c5..0000000
--- a/src/com/aoleyun/os/jpush/MyReceiver.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import com.aoleyun.os.network.HTTPInterface;
-import com.aoleyun.os.service.MainService;
-import com.aoleyun.os.uiuiutils.ForegroundAppUtil;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Iterator;
-
-/**
- * 自定义接收器
- *
- * 如果不定义这个 Receiver，则：
- * 1) 默认用户会打开主界面
- * 2) 接收不到自定义消息
- */
-//public class MyReceiver extends BroadcastReceiver {
-// private static final String TAG = "JIGUANG-Example";
-//
-// @Override
-// public void onReceive(Context context, Intent intent) {
-// try {
-// Bundle bundle = intent.getExtras();
-// Logger.d(TAG, "[MyReceiver] onReceive - " + intent.getAction() + ", extras: " + printBundle(bundle));
-//
-// if (JPushInterface.ACTION_REGISTRATION_ID.equals(intent.getAction())) {
-// String regId = bundle.getString(JPushInterface.EXTRA_REGISTRATION_ID);
-// Logger.d(TAG, "[MyReceiver] 接收Registration Id : " + regId);
-// //send the Registration Id to your server...
-//
-// } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
-// Logger.d(TAG, "[MyReceiver] 接收到推送下来的自定义消息: " + bundle.getString(JPushInterface.EXTRA_MESSAGE));
-// processCustomMessage(context, bundle);
-//
-// } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
-// Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知");
-// int notifactionId = bundle.getInt(JPushInterface.EXTRA_NOTIFICATION_ID);
-// Logger.d(TAG, "[MyReceiver] 接收到推送下来的通知的ID: " + notifactionId);
-//
-// } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
-// Logger.d(TAG, "[MyReceiver] 用户点击打开了通知");
-//
-// //打开自定义的Activity
-// Intent i = new Intent(context, TestActivity.class);
-// i.putExtras(bundle);
-// //i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-// context.startActivity(i);
-//
-// } else if (JPushInterface.ACTION_CONNECTION_CHANGE.equals(intent.getAction())) {
-// boolean connected = intent.getBooleanExtra(JPushInterface.EXTRA_CONNECTION_CHANGE, false);
-// Logger.w(TAG, "[MyReceiver]" + intent.getAction() + " connected state change to " + connected);
-// } else {
-// Logger.d(TAG, "[MyReceiver] Unhandled intent - " + intent.getAction());
-// }
-// } catch (Exception e) {
-//
-// }
-//
-// }
-//
-// // 打印所有的 intent extra 数据
-// private static String printBundle(Bundle bundle) {
-// StringBuilder sb = new StringBuilder();
-// for (String key : bundle.keySet()) {
-// if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)) {
-// sb.append("\nkey:" + key + ", value:" + bundle.getInt(key));
-// } else if (key.equals(JPushInterface.EXTRA_CONNECTION_CHANGE)) {
-// sb.append("\nkey:" + key + ", value:" + bundle.getBoolean(key));
-// } else if (key.equals(JPushInterface.EXTRA_EXTRA)) {
-// if (TextUtils.isEmpty(bundle.getString(JPushInterface.EXTRA_EXTRA))) {
-// Logger.i(TAG, "This message has no Extra data");
-// continue;
-// }
-//
-// try {
-// JSONObject json = new JSONObject(bundle.getString(JPushInterface.EXTRA_EXTRA));
-// Iterator it = json.keys();
-//
-// while (it.hasNext()) {
-// String myKey = it.next();
-// sb.append("\nkey:" + key + ", value: [" +
-// myKey + " - " + json.optString(myKey) + "]");
-// }
-// } catch (JSONException e) {
-// Logger.e(TAG, "Get message extra JSON error!");
-// }
-//
-// } else {
-// sb.append("\nkey:" + key + ", value:" + bundle.get(key));
-// }
-// }
-// return sb.toString();
-// }
-//
-// private static final String SEND_RUNNING_APP = "2";
-// //应用锁
-// private static final String UPDATE_APP_LOCK = "39";
-//
-//
-// //send msg to MainActivity
-// private void processCustomMessage(Context context, Bundle bundle) {
-//// if (Launcher.isForeground) {
-//// String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
-//// String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-//// Intent msgIntent = new Intent(Launcher.MESSAGE_RECEIVED_ACTION);
-//// msgIntent.putExtra(Launcher.KEY_MESSAGE, message);
-//// if (!ExampleUtil.isEmpty(extras)) {
-//// try {
-//// JSONObject extraJson = new JSONObject(extras);
-//// if (extraJson.length() > 0) {
-//// msgIntent.putExtra(Launcher.KEY_EXTRAS, extras);
-//// }
-//// } catch (JSONException e) {
-////
-//// }
-////
-//// }
-//// LocalBroadcastManager.getInstance(context).sendBroadcast(msgIntent);
-//// }
-//
-// String message = bundle.getString(JPushInterface.EXTRA_MESSAGE);
-// String title = bundle.getString(JPushInterface.EXTRA_TITLE);
-// String type = bundle.getString(JPushInterface.EXTRA_CONTENT_TYPE);
-// String extras = bundle.getString(JPushInterface.EXTRA_EXTRA);
-//
-// switch (message) {
-// case SEND_RUNNING_APP:
-// getRunningApp(context);
-// break;
-// case UPDATE_APP_LOCK:
-// HTTPInterface.getAppPasswd();
-// break;
-// default:
-// break;
-// }
-// }
-//
-// private void getRunningApp(Context context) {
-// HTTPInterface.sendRunningApp(context);
-// }
-//
-//}
diff --git a/src/com/aoleyun/os/jpush/PushService.java b/src/com/aoleyun/os/jpush/PushService.java
deleted file mode 100644
index 06cdefd..0000000
--- a/src/com/aoleyun/os/jpush/PushService.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.aoleyun.os.jpush;
-
-
-//public class PushService extends JCommonService {
-//
-//}
diff --git a/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java b/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
deleted file mode 100644
index 55f9394..0000000
--- a/src/com/aoleyun/os/jpush/TagAliasOperatorHelper.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.aoleyun.os.jpush;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.aoleyun.os.uiuiutils.ToastUtil;
-
-import java.util.Locale;
-import java.util.Set;
-
-/**
- * 处理tagalias相关的逻辑
- * */
-//public class TagAliasOperatorHelper {
-// private static final String TAG = "JIGUANG-TagAliasHelper";
-// public static int sequence = 1;
-// /**增加*/
-// public static final int ACTION_ADD = 1;
-// /**覆盖*/
-// public static final int ACTION_SET = 2;
-// /**删除部分*/
-// public static final int ACTION_DELETE = 3;
-// /**删除所有*/
-// public static final int ACTION_CLEAN = 4;
-// /**查询*/
-// public static final int ACTION_GET = 5;
-//
-// public static final int ACTION_CHECK = 6;
-//
-// public static final int DELAY_SEND_ACTION = 1;
-//
-// public static final int DELAY_SET_MOBILE_NUMBER_ACTION = 2;
-//
-// private Context context;
-//
-// private static TagAliasOperatorHelper mInstance;
-// private TagAliasOperatorHelper(){
-// }
-// public static TagAliasOperatorHelper getInstance(){
-// if(mInstance == null){
-// synchronized (TagAliasOperatorHelper.class){
-// if(mInstance == null){
-// mInstance = new TagAliasOperatorHelper();
-// }
-// }
-// }
-// return mInstance;
-// }
-// public void init(Context context){
-// if(context != null) {
-// this.context = context.getApplicationContext();
-// }
-// }
-// private SparseArray