From 74a0f631e2e477f115ee0a7e8f7f222e1501c8f9 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Tue, 10 Jan 2023 18:09:07 +0800 Subject: [PATCH] =?UTF-8?q?version:2.8=20fix:=E4=BF=AE=E5=A4=8D=E6=97=A0?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=BF=9E=E6=8E=A5=E6=97=B6=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=20update:=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 101 +++- app/keystore/TeclastMTK.jks | Bin 0 -> 2342 bytes app/keystore/TeclastUnisoc.keystore | Bin 0 -> 2709 bytes .../TeclastUnisocUserDebug.jks} | Bin app/{src/keys => keystore}/Unisoc.jks | Bin app/{src/keys => keystore}/mtkAndroid11.jks | Bin app/{src/keys => keystore}/xueshibaoos.jks | Bin app/{src/keys => keystore}/zhanxun.keystore | Bin app/src/main/AndroidManifest.xml | 3 +- .../fuying/sn/activity/SplashActivity.java | 1 - .../fuying/sn/activity/main/MainAContact.java | 3 - .../sn/activity/main/MainAPresenter.java | 26 +- .../fuying/sn/activity/main/MainActivity.java | 27 +- .../com/fuying/sn/base/BaseApplication.java | 1 + .../fuying/sn/desktop/RunningAppManager.java | 33 +- .../com/fuying/sn/manager/AmapManager.java | 4 + .../com/fuying/sn/manager/ConnectManager.java | 24 +- .../com/fuying/sn/manager/ControlManager.java | 9 +- .../sn/network/NetInterfaceManager.java | 537 ++++++++---------- .../com/fuying/sn/network/UrlAddress.java | 14 - .../com/fuying/sn/network/api/Applog.java | 19 - .../sn/receiver/APKinstallReceiver.java | 2 +- .../com/fuying/sn/receiver/BootReceiver.java | 12 - .../sn/service/main/MainSPresenter.java | 255 +-------- .../fuying/sn/service/main/MainService.java | 127 +---- .../com/fuying/sn/tpush/MessageReceiver.java | 59 +- .../java/com/fuying/sn/utils/CacheUtils.java | 4 +- .../java/com/fuying/sn/utils/JGYUtils.java | 52 +- .../com/fuying/sn/utils/NetStateUtils.java | 84 +++ .../java/com/fuying/sn/utils/TimeUtils.java | 16 +- .../main/java/com/fuying/sn/utils/Utils.java | 6 +- 31 files changed, 597 insertions(+), 822 deletions(-) create mode 100644 app/keystore/TeclastMTK.jks create mode 100644 app/keystore/TeclastUnisoc.keystore rename app/{src/keys/TeclastUserDebug.jks => keystore/TeclastUnisocUserDebug.jks} (100%) rename app/{src/keys => keystore}/Unisoc.jks (100%) rename app/{src/keys => keystore}/mtkAndroid11.jks (100%) rename app/{src/keys => keystore}/xueshibaoos.jks (100%) rename app/{src/keys => keystore}/zhanxun.keystore (100%) delete mode 100644 app/src/main/java/com/fuying/sn/network/api/Applog.java create mode 100644 app/src/main/java/com/fuying/sn/utils/NetStateUtils.java diff --git a/app/build.gradle b/app/build.gradle index feb6f3f..5430f65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,15 +73,15 @@ android { official { flavorDimensions "default" - versionCode 14 - versionName "2.3" + versionCode 28 + versionName "2.8" } } //签名 signingConfigs { zhanRui { - storeFile file("src/keys/zhanxun.keystore") + storeFile file("keystore/zhanxun.keystore") storePassword "123456" keyAlias "zhanxun" keyPassword "123456" @@ -89,8 +89,17 @@ android { v2SigningEnabled true } - teclastuserdebug { - storeFile file("src/keys/TeclastUserDebug.jks") + teclastUnisoc { + storeFile file("keystore/TeclastUnisoc.keystore") + storePassword "123456" + keyAlias "TeclastUnisoc" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + + teclastUnisocUserdebug { + storeFile file("keystore/TeclastUnisocUserDebug.jks") storePassword "123456" keyAlias "teclast" keyPassword "123456" @@ -98,8 +107,17 @@ android { v2SigningEnabled true } + teclastMTK { + storeFile file("keystore/TeclastMTK.jks") + storePassword "123456" + keyAlias "TeclastMTK" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + mtk { - storeFile file("src/keys/xueshibaoos.jks") + storeFile file("keystore/xueshibaoos.jks") storePassword "123456" keyAlias "xueshibaoos" keyPassword "123456" @@ -108,7 +126,7 @@ android { } mtkAndroid11 { - storeFile file("src/keys/mtkAndroid11.jks") + storeFile file("keystore/mtkAndroid11.jks") storePassword "123456" keyAlias "mtk11" keyPassword "123456" @@ -117,7 +135,7 @@ android { } unisoc { - storeFile file("src/keys/Unisoc.jks") + storeFile file("keystore/Unisoc.jks") storePassword "123456" keyAlias "unisoc" keyPassword "123456" @@ -156,8 +174,61 @@ android { signingConfig signingConfigs.mtkAndroid11 } + + + teclastMTKDebug.initWith(debug) + teclastMTKDebug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"T30PRO"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.teclastMTK + } + + teclastMTKRelease.initWith(release) + teclastMTKRelease { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"T30PRO"' + signingConfig signingConfigs.teclastMTK + } + + teclastUnisocdebug.initWith(zhanRuiDebug) + teclastUnisocdebug { + manifestPlaceholders = [ + AK: "u5qGsILQ7qlXI8GDv6T6cGl8IWMtsPSu" + ] + buildConfigField "String", "platform", '"M40SE"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.teclastUnisoc + } + + teclastUnisocrelease.initWith(zhanRuiDebug) + teclastUnisocrelease { + manifestPlaceholders = [ + AK: "u5qGsILQ7qlXI8GDv6T6cGl8IWMtsPSu" + ] + buildConfigField "String", "platform", '"M40SE"' + signingConfig signingConfigs.teclastUnisoc + } + + teclastUnisocUserdebug.initWith(zhanRuiDebug) + teclastUnisocUserdebug { + buildConfigField "String", "platform", '"M40SE"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.teclastUnisocUserdebug + } + zhanRuiDebug.initWith(debug) zhanRuiDebug { + manifestPlaceholders = [ + AK: "EiqcGW9LWDvfMKl7mZxUtt1UkNKpdQI5" + ] buildConfigField "String", "platform", '"ZhanRui"' versionNameSuffix "-debug" debuggable true @@ -166,19 +237,13 @@ android { zhanRuiRelease.initWith(release) zhanRuiRelease { + manifestPlaceholders = [ + AK: "EiqcGW9LWDvfMKl7mZxUtt1UkNKpdQI5" + ] buildConfigField "String", "platform", '"ZhanRui"' signingConfig signingConfigs.zhanRui } - //userdebug rom使用这个版本 - zhanRuiUserdebug.initWith(zhanRuiDebug) - zhanRuiUserdebug { - buildConfigField "String", "platform", '"ZhanRui"' - versionNameSuffix "-debug" - debuggable true - signingConfig signingConfigs.teclastuserdebug - } - debug { buildConfigField "String", "platform", '"MTK"' versionNameSuffix "-debug" @@ -248,7 +313,7 @@ dependencies { annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' //okhttp - implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' //Retrofit implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' diff --git a/app/keystore/TeclastMTK.jks b/app/keystore/TeclastMTK.jks new file mode 100644 index 0000000000000000000000000000000000000000..21975a2765fef1e1c602ab439073af9c691b9f6b GIT binary patch literal 2342 zcmd5-`8(9@9-bL9j4_s>u{J`M(93s1mdFwrO9(UBBZn+wr_9)QQG{$`-^r4S$i5^L zlI37tsj-AC*-8k9_d4fX?+@n>I6vG!-1qZ*mg~Om>v@jWj@CdR5aa~lzku*{uqWF2 z_`3PJo=8z4y9+xY5DWr@LyrI!dW0lB7z&nvpuk`l2pSIkMr;V-BJ^k0H*bC3dBVCI zy#9Ljay+rz&UZ2cw5;T_LGOE2`hK*V;}xCZ9{%qQAFK|}m-JP(v+f(D4o5O+eW?2J z8asAD6)j&9-r3%%a|VRN>CP zqjxVVlTV^NW<`mz#sYEIYMd2N%58r;tme^L>-U3JR# zW8^bhzpylU2XnK{^rnAKY|W@vPc$U*YN@=tbz4!AmYC0l#1DG>`Rehpd04!TF&i_+ zf~nNtQukA7l5*fYAb}fijTkym>;CPC@7M00>4dP~_NP%cE&9i~Rlp6u3JQF7UU#3> ze36EG`2NnUg0Nuk<0<|9ik>3RC#Jc|f*;vR+JqUFt;VSNyP~o;jnY=Riy9jpSj4Eh zrk}n#YI$|!(bcfHR@5U_R51>@UqYO@2my%^k*;MLj$6d3YS^YZVR=Z8zs9Qx#XEt= zNgN*B#~H?r^LjlW6i7e5e(Q5+tRr=VglIE=l>~jS8r&&pEZL&2Yc6)iGsA2)p=-@G zTTzU_G532Jz6F|~Vk**knNwVnaV_RNIGIbq0?PJ22jX`h7A{9MCRcQohk{&eNY?Sjwr61hKpxn6CI%ha(-)dm&tPBf<|dhuyc3;K-u5)3tGgO8 zi({$lQf{Jv2>;}Ykc_=4tV2Pm#9; zC9RK24P~1xMGH#i4C+Z6#Jb~H=n8Ga34t-(1T0+H-4(0?Q*5*JGB9LYr>#P;aggk2 zZck;wu)PSgpUeF3#VqU9C)&w!?!^N9eY*`Cp=OzyhTl6x8F**8h(Y#&!#nm8sd*D| zsCymjBP}ql>H2F+Ze%;DKl;cSGL{}5s0%#R1a!j4PF~YXLUm{0c!i5ZSAX~YPKaZ- z5-1c8us`iegGd@Vpd-jf%`?)o>(P~G-HPVEVfZq$MEwJIa2FG(wQYv&OV81V-jy;o zb%XP$jn_5$&#tFPd~f=-Lo$HrFOEiw&+rH|ZV?T0&~QKaJzHIW)#ATiN0^zE9H0mS z(MEV7Civn0rH3lTy#L2v2-$UGo`~10#TjUqYyH^U$AI}OPg&v#x>Pf4D%dfXgy<3^KeVgWRfkLI#pq` z`)aRZO>~L=)>25lT*Qk0XrP8mK+6WAfqm)Ro#GKZxm&Sc?G>SPeh*1i2~ZX%-uuJD zpH-56?oZ_T$)C26&Em4K8p(poVMp?*TqNNIm`T@Ka!m`7LhwA-W4S#i>F4R*L+*{Q zJjsJfB&)y%mVmppnJO7l<>wagLG$Mi3Aa+VZ(s-=7z8dd0t^7mNenP7P)_KXsz6d( zKEr`V+E<&!VPX^){OKVKICpw{9?A`HhW_shr?J9tKw$tK7<~M9&ria7;yD;pJ}nnV z)xZ}9t$(VHu%;=`GInrJ1e${*Xx-Y5ik&f-ec4gjs9vT0mOxz&(;G=2qw!=vHNy&l ztQ)OiB`nWl^3T*vF9b`lPE!UIkng>ne^nLQ*p2?+Fvx`a)(xQg_7$3wG*`?JG6Nea z+KMKl-+L*xyRxx(Lz*95#;z5lmFKX06#34scvwbQFru7Sx=l@6Xz|N_bj~)y^s@kK z<=hhUYxP9S)dXwt`C65Ok1Zjqn(qd7i*f z#Wk4g6liI^R|Vw}nFXX1_Z9RDy;E9sM$(nfrx&?C@LazZ6vVgRUdr*9I(T_q|2BV| R=RjVjhX*Af>{m10zW_{7^xXge literal 0 HcmV?d00001 diff --git a/app/keystore/TeclastUnisoc.keystore b/app/keystore/TeclastUnisoc.keystore new file mode 100644 index 0000000000000000000000000000000000000000..2cf312717bf5050f2381abdcf9dbaed8c01f4351 GIT binary patch literal 2709 zcmY+Ec{mh`8pdarAq`_4OWDoPG=q$ZEM=E1l9X#19E2%j$r2ixtPR-?vKyr-5h`TJ zk$sdj)nv~WSvpxJ3fH~QJ@-84kMH^3=Y8Mr`}2pR!ZSfYFpdhhg7IT$7Bt>LARn-l z3fF^B;e>r#3rB@U{3C+;L8wsgecNMyF2Mx;cO?i1f=a27pExRnheN~Qf7$!br6Hos z8o`32witoiotTSW5sw}Ng6uUxV89>t5Gtf+SIb5bpI_MSu}6bmuTOn6ORoByd!m&u zQv7ZT9W4`!c?Wv!gLxQR+n#$flpS;F{5_>eNA{$5U^V*nQ4>x^&r6|mz&ZIE)MXC8 zsasa$xX{nq*|YG|ZEh58vQF@3eXwl$(hqQYV#wj~fa)VO-wzrCFsTL)b+v2NWQi2@ zr3-vFM~y#)4~|(}Zk0RHCehUni^SDi_03GE^cc3h)pt^V0fFK^!or(VdlkISPq?BXy5rYm|*2;S%fG9IwuMU5kqhV@+s=SIB<2 z)m&r8H=d)W_S0rQEd>nVWxVZ#^ucq zajRoh;Qm(w0Jpu4K5RXINJi|u|Vyg z?}MDMwbo}FBpDql%cwpQ_uU6pY`Ezm6qbT_tPhEbEFoS!yzU^hr6eD44zT3C$R3xZh{NL*_1*!NVkAIvL*cIM(=3 zU9sGc6)g9Ptc^^DMGDu#C_`*weNG#8Jv7sWNFY{6 z`A=6#Oz~BP93~%V1y(V47FX_{c~+4)RMCl;N_sl3lG9>bB;Ot=lUgS@kGx3CLiF*r zTm*70b?p?MY^9&P;O1iBzZ&=(Sdwc(sOB=C3eJdk@m7+wNxKA6ipvm8Q6*uL z-&Bz1w+}D3t*$QYe$P$TNjG~VoWeaLhKjgJ%Z3NIWDYJ@1nP)}2W|@bD$g3!l(^{B z!~F;4n-4j}!SE+SSAu*(e(+VD=LC2&S${~YHcgl8zUw}MpbOYIxzUUfGSr`! zlVFHM(<`N}3IGR@W*=?!x+PTzW5xvSHc>!$7->fu2vURx=Q(c!8q02HCN+yQ_51=? zcrL$A*Q0Q^5s?S%&{%%eMAj+7r<#}t#9kBXEmp6vDoY5O2EEa_DBPsz&KqhX0rNVEc4s>|13ZAYgwL{G9;*!CTmWcuURxSR+k~epdi2li@pP zaIt4wBIdumji*99SQTM5pmGycwPLIx@OxU})rEz1iQ7_hR44GTj{KJ7?`bG_}z=HRe9SH z!*r_rh_thhMQ-`j+B>&iM<$lFBXH7tPafm6vh)<(?fGzyv_FPBKX0rK?j&SaQ-Vi;bX4_ zLhU8`A!zKI^{VUXnfBkV>1($3G18jn;5(9-l5xrTOuBF!iKsw2K-c(|(wx_2g*47% zA70#P(qV>syg|dM8psWrD2^q^XM{&rq@BVmZYjmVlQ7HC^F;-sP6s?SWmVUOWGlxb zeVNf;AghjW$^s|;4ZBMWnR33{2WiG82rNBfSGFJrF6tkSve-s^V+?>nlc_<=* z7CiVvcRMOMN?Rlk)waglk#51V$XwTj&;)*zF)rt|RM&!iJk=~WeA@i06TVT8Kg4qz z-IkGwcJGjVb$cS3c9-Ar={V$mzc0sX+iz_(Y6mi+VrzKrsZpiF5&s7xYG46{wd=4_ zej%lt7m%`xeR+CYP~MynDd?oau4InaNo~R0+J=x<>6h3cS<}$dXu?{HzRj$TWTmH4(w& z@rlY_h?M5dXarMuK%uP1Y36&IE`H{mzA;@_%8Tx_&o93c_1DfPGqdZ4B&D9+`H?hS zf5XnzAPY()T1~5nPZk@7Ub^1iK-5z1t6Ai>2$>)cp5lx5iYH?DRMXr{~xT3ulBel`Wg%P!mE$>gF^O;b@y_ zy3=_xdjsw!m27i9Ijy?^-8xBP)cOqO1Zs?wwU*a$2r0Qu+$3Uu+*d*Zu-MP~HK9r;oFXd$|DD0JwFC0q(G5Z#@#~t6^is;YoUAACI zn^*c4%zDqde{E^^ylo9XG0%JB_bnk!w_ud~bqs3bmT^2pam!2!afIGhDb{!i^DP(= zPYPWcn5+wpA`vW}Obx?5GMsCski!)d8I)A_M##Hg_2(q7`)QDE#P6yu&>6jMX!bAv zin*N%re3?-!Q$Qf;gIV`pPx%bt+f2kn(JWJ)<#by-XY45)cHB4Sqv8&ty!)HLCh=w zA62E5ZRBH-x5x-vRC~JCo$vhYnw0#c+lp1qK=!|mb>R$f@;H7NR9y%RLO}r#QSDNZ wWTh201(PDX>H1}Nspa*wGDP%q`r4^mmRHCRqvLboV7-TNHcAR0FpyUIZ^|U*SO5S3 literal 0 HcmV?d00001 diff --git a/app/src/keys/TeclastUserDebug.jks b/app/keystore/TeclastUnisocUserDebug.jks similarity index 100% rename from app/src/keys/TeclastUserDebug.jks rename to app/keystore/TeclastUnisocUserDebug.jks diff --git a/app/src/keys/Unisoc.jks b/app/keystore/Unisoc.jks similarity index 100% rename from app/src/keys/Unisoc.jks rename to app/keystore/Unisoc.jks diff --git a/app/src/keys/mtkAndroid11.jks b/app/keystore/mtkAndroid11.jks similarity index 100% rename from app/src/keys/mtkAndroid11.jks rename to app/keystore/mtkAndroid11.jks diff --git a/app/src/keys/xueshibaoos.jks b/app/keystore/xueshibaoos.jks similarity index 100% rename from app/src/keys/xueshibaoos.jks rename to app/keystore/xueshibaoos.jks diff --git a/app/src/keys/zhanxun.keystore b/app/keystore/zhanxun.keystore similarity index 100% rename from app/src/keys/zhanxun.keystore rename to app/keystore/zhanxun.keystore diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 537a641..c99c76a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,6 +99,7 @@ android:label="@string/app_name" android:networkSecurityConfig="@xml/network" android:requestLegacyExternalStorage="true" + android:usesCleartextTraffic="true" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/ImmerseTheme" @@ -339,7 +340,7 @@ + android:value="${AK}" > \ No newline at end of file diff --git a/app/src/main/java/com/fuying/sn/activity/SplashActivity.java b/app/src/main/java/com/fuying/sn/activity/SplashActivity.java index 1745a1a..4fdafaa 100644 --- a/app/src/main/java/com/fuying/sn/activity/SplashActivity.java +++ b/app/src/main/java/com/fuying/sn/activity/SplashActivity.java @@ -11,7 +11,6 @@ import com.fuying.sn.R; import com.fuying.sn.activity.main.MainActivity; import com.zackratos.ultimatebarx.ultimatebarx.java.UltimateBarX; - public class SplashActivity extends AppCompatActivity { private static String TAG = SplashActivity.class.getSimpleName(); diff --git a/app/src/main/java/com/fuying/sn/activity/main/MainAContact.java b/app/src/main/java/com/fuying/sn/activity/main/MainAContact.java index 1f2bbb6..320e1e1 100644 --- a/app/src/main/java/com/fuying/sn/activity/main/MainAContact.java +++ b/app/src/main/java/com/fuying/sn/activity/main/MainAContact.java @@ -11,8 +11,6 @@ public class MainAContact { interface Presenter extends BasePresenter { /*获取设备信息*/ void getSnInfo(); - /*获取小程序二维码*/ - void getAppletQRCode(); /*获取二维码*/ void getQRCode(); //获取所有app包名 @@ -27,7 +25,6 @@ public class MainAContact { public interface MainView extends BaseView { void setSnInfo(BaseResponse response); - void setAppletQRCode(String url); void setQRCode(Bitmap bitmap); void getAllAppFinish(); void checkUpdateFinish(); diff --git a/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java b/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java index ccc41e7..6998648 100644 --- a/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java +++ b/app/src/main/java/com/fuying/sn/activity/main/MainAPresenter.java @@ -25,7 +25,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject; * @author jgy02 */ public class MainAPresenter implements MainAContact.Presenter { - private String TAG = MainAPresenter.class.getSimpleName(); + private static final String TAG = MainAPresenter.class.getSimpleName(); private MainAContact.MainView mView; private Context mContext; @@ -89,30 +89,6 @@ public class MainAPresenter implements MainAContact.Presenter { }); } - @Override - public void getAppletQRCode() { -// NetInterfaceManager.getInstance() -// .getQRCodeURL(true, getLifecycle(), new NetInterfaceManager.onNextCallback() { -// @Override -// public void onNext(Object o) { -// Log.e("getAppletQRCode", "onNext: " + o); -// mView.setAppletQRCode((String) o); -// } -// -// @Override -// public void onError(Object o) { -// Log.e("getAppletQRCode", "onError: " + o); -// mView.setAppletQRCode(null); -// } -// -// @Override -// public void onComplete() { -// Log.e("getAppletQRCode", "onComplete: "); -// } -// }); - mView.setAppletQRCode(null); - } - @Override public void getQRCode() { String encryptString = CXAESUtil.encrypt(CommonConfig.AES_KEY, Utils.getIMEI(mContext)); diff --git a/app/src/main/java/com/fuying/sn/activity/main/MainActivity.java b/app/src/main/java/com/fuying/sn/activity/main/MainActivity.java index 6c7c63a..ec23bd0 100644 --- a/app/src/main/java/com/fuying/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/fuying/sn/activity/main/MainActivity.java @@ -13,7 +13,6 @@ import android.os.AsyncTask; import android.os.IBinder; import android.os.SystemClock; import android.provider.Settings; -import android.text.TextUtils; import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; @@ -26,7 +25,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import com.blankj.utilcode.util.NetworkUtils; -import com.bumptech.glide.Glide; import com.fuying.sn.BuildConfig; import com.fuying.sn.R; import com.fuying.sn.base.BaseActivity; @@ -37,6 +35,7 @@ import com.fuying.sn.dialog.UserDebugDialog; import com.fuying.sn.fragment.AppletQRCodeFragment; import com.fuying.sn.fragment.BaseFragmentPagerAdapter; import com.fuying.sn.fragment.QRCodeFragment; +import com.fuying.sn.gson.GsonUtils; import com.fuying.sn.manager.ControlManager; import com.fuying.sn.manager.DeviceManager; import com.fuying.sn.network.NetInterfaceManager; @@ -46,7 +45,6 @@ import com.fuying.sn.service.GuardService; import com.fuying.sn.service.ManagerService; import com.fuying.sn.service.StepService; import com.fuying.sn.service.main.MainService; -import com.fuying.sn.gson.GsonUtils; import com.fuying.sn.utils.JGYUtils; import com.fuying.sn.utils.SPUtils; import com.fuying.sn.utils.TimeUtils; @@ -114,6 +112,9 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, mPresenter.setLifecycle(lifecycleSubject); mPresenter.attachView(this); +// Settings.Global.putInt(getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); +// Settings.Global.putInt(getContentResolver(), Settings.Global.ADB_ENABLED, 1); + NetworkUtils.registerNetworkStatusChangedListener(this); try { @@ -177,7 +178,7 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, Log.e(TAG, "getWeekDay: " + TimeUtils.inWeekDay(1627702095000L)); Log.e(TAG, "getWeekDayString: " + new TimeUtils().getWeekDayString()); Log.e(TAG, "getWeekDayString: " + new TimeUtils().getWeekDayString(1627702095000L)); - Log.e(TAG, "initData: sn = "+Utils.getSerial() ); + Log.e(TAG, "initData: sn = " + Utils.getSerial()); } if (DeviceManager.isDebugMode()) { Settings.System.putInt(getContentResolver(), CommonConfig.AOLE_ACTION_DEVELOPER_OPTIONS, 0); @@ -209,7 +210,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, } } - @Override protected void onResume() { super.onResume(); @@ -377,7 +377,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, } } - @Override public void setSnInfo(BaseResponse response) { if (response != null) { @@ -400,20 +399,6 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, ControlManager.getInstance().setDisableSetting(); } } - mPresenter.getAppletQRCode(); - } - - @Override - public void setAppletQRCode(String url) { -// if (!TextUtils.isEmpty(url)) { -// Glide.with(iv_appqrcode) -// .load(url) -// .dontAnimate() -// .placeholder(getDrawable(R.drawable.applet_qrcode)) -// .into(iv_appqrcode); -// } else { -// iv_appqrcode.setImageDrawable(getDrawable(R.drawable.applet_qrcode)); -// } mPresenter.getQRCode(); } @@ -431,7 +416,7 @@ public class MainActivity extends BaseActivity implements MainAContact.MainView, @Override public void checkUpdateFinish() { mPresenter.checkFXYUpdate(); -} + } @Override public void checkFXYUpdateFinish() { diff --git a/app/src/main/java/com/fuying/sn/base/BaseApplication.java b/app/src/main/java/com/fuying/sn/base/BaseApplication.java index 25bda69..896b983 100644 --- a/app/src/main/java/com/fuying/sn/base/BaseApplication.java +++ b/app/src/main/java/com/fuying/sn/base/BaseApplication.java @@ -139,6 +139,7 @@ public class BaseApplication extends Application { @Override public void onSuccess(Object data, int flag) { Log.e("TPush", "onSuccess, data:" + data + ", flag:" + flag); + NetInterfaceManager.getInstance().setPushTags(); } @Override diff --git a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java index 6cf10fc..f618113 100644 --- a/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java +++ b/app/src/main/java/com/fuying/sn/desktop/RunningAppManager.java @@ -183,6 +183,9 @@ public class RunningAppManager { */ private void checkForegroundAppName() { String topPackage = getTopActivityInfo(); + if ("org.chromium.browser".equals(topPackage)){ + JGYUtils.getInstance().killPackage("org.chromium.browser"); + } Log.i(TAG, "checkForegroundAppName: topPackage = " + topPackage); String appPackageName = getAppPackageName(); Log.d(TAG, "checkForegroundAppName: appPackageName = " + appPackageName); @@ -1396,20 +1399,22 @@ public class RunningAppManager { } private String getTopActivityInfo() { - ActivityManager manager = ((ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE)); - if (Build.VERSION.SDK_INT >= 21) { - List pis = manager.getRunningAppProcesses(); - ActivityManager.RunningAppProcessInfo topAppProcess = (ActivityManager.RunningAppProcessInfo) pis.get(0); - if (topAppProcess != null && topAppProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) { - return topAppProcess.processName; - } - } else { -//getRunningTasks() is deprecated since API Level 21 (Android 5.0) - List localList = manager.getRunningTasks(1); - ActivityManager.RunningTaskInfo localRunningTaskInfo = (ActivityManager.RunningTaskInfo) localList.get(0); - return localRunningTaskInfo.topActivity.getPackageName(); - } - return ""; +// ActivityManager manager = ((ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE)); +// if (Build.VERSION.SDK_INT >= 21) { +// List pis = manager.getRunningAppProcesses(); +// ActivityManager.RunningAppProcessInfo topAppProcess = (ActivityManager.RunningAppProcessInfo) pis.get(0); +// if (topAppProcess != null && topAppProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) { +// return topAppProcess.processName; +// } +// } else { +////getRunningTasks() is deprecated since API Level 21 (Android 5.0) +// List localList = manager.getRunningTasks(1); +// ActivityManager.RunningTaskInfo localRunningTaskInfo = (ActivityManager.RunningTaskInfo) localList.get(0); +// return localRunningTaskInfo.topActivity.getPackageName(); +// } + ActivityManager manager = (ActivityManager) mContext.getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE); + String currentClassName = manager.getRunningTasks(1).get(0).topActivity.getPackageName(); + return currentClassName; } /** diff --git a/app/src/main/java/com/fuying/sn/manager/AmapManager.java b/app/src/main/java/com/fuying/sn/manager/AmapManager.java index 1ee6885..070d5e4 100644 --- a/app/src/main/java/com/fuying/sn/manager/AmapManager.java +++ b/app/src/main/java/com/fuying/sn/manager/AmapManager.java @@ -23,6 +23,8 @@ public class AmapManager { private AmapManager(Context context) { this.mContext = context; Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+gps"); + Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+network"); + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ASSISTED_GPS_ENABLED, 1); initAmap(); } @@ -47,6 +49,8 @@ public class AmapManager { mLocationClient = new LocationClient(mContext); } Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+gps"); + Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, "+network"); + Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ASSISTED_GPS_ENABLED, 1); mLocationClient.setLocOption(getDefaultLocationClientOption()); mLocationClient.registerLocationListener(mListener); mLocationClient.stop(); diff --git a/app/src/main/java/com/fuying/sn/manager/ConnectManager.java b/app/src/main/java/com/fuying/sn/manager/ConnectManager.java index a111b3b..bf8a8ed 100644 --- a/app/src/main/java/com/fuying/sn/manager/ConnectManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ConnectManager.java @@ -108,27 +108,27 @@ public class ConnectManager { /** * @return 今天WiFi连接是否有连接 */ - public boolean isWiFiFistConnect() { - long time = mMMKV.decodeLong(WIFI_LAST_CONNECT_TIME, 0); - return !TimeUtils.isTodayTime(time); - } +// public boolean isWiFiFistConnect() { +// long time = mMMKV.decodeLong(WIFI_LAST_CONNECT_TIME, 0); +// return !TimeUtils.isTodayTime(time); +// } /** * @return 今天打开设备信息后是否连接 */ - public boolean isOpenInfoFistConnect() { - long time = mMMKV.decodeLong(OPENINFO_LAST_ONNECT_TIME, 0); - return !TimeUtils.isTodayTime(time); - } +// public boolean isOpenInfoFistConnect() { +// long time = mMMKV.decodeLong(OPENINFO_LAST_ONNECT_TIME, 0); +// return !TimeUtils.isTodayTime(time); +// } /** * @param WiFiAlias * @return 今天切换WiFi后是否连接 */ - public boolean isWiFiCutoverFistConnect(String WiFiAlias) { - long time = mMMKV.decodeLong(WiFiAlias, 0); - return !TimeUtils.isTodayTime(time); - } +// public boolean isWiFiCutoverFistConnect(String WiFiAlias) { +// long time = mMMKV.decodeLong(WiFiAlias, 0); +// return !TimeUtils.isTodayTime(time); +// } } diff --git a/app/src/main/java/com/fuying/sn/manager/ControlManager.java b/app/src/main/java/com/fuying/sn/manager/ControlManager.java index e44d43e..a8bfcf0 100644 --- a/app/src/main/java/com/fuying/sn/manager/ControlManager.java +++ b/app/src/main/java/com/fuying/sn/manager/ControlManager.java @@ -380,8 +380,13 @@ public class ControlManager { break; default: } - Intent navIntent = new Intent(navigationStatus).setPackage("com.android.systemui"); - mContext.sendBroadcast(navIntent); + if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.T30ProPlatform) { + Intent navIntent = new Intent(navigationStatus); + mContext.sendBroadcast(navIntent); + } else { + Intent navIntent = new Intent(navigationStatus).setPackage("com.android.systemui"); + mContext.sendBroadcast(navIntent); + } //状态栏显示开关 int setting_statusbar = changeNum(settings.getSetting_statusbar()); diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java index e482b3a..e0b6d60 100644 --- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java @@ -84,8 +84,8 @@ import com.fuying.sn.utils.AppUsedTimeUtils; import com.fuying.sn.utils.CmdUtil; import com.fuying.sn.utils.FileUtils; import com.fuying.sn.utils.JGYUtils; -import com.fuying.sn.utils.MD5Util; import com.fuying.sn.utils.SPUtils; +import com.fuying.sn.utils.StringUtils; import com.fuying.sn.utils.URLUtils; import com.fuying.sn.utils.Utils; import com.google.gson.Gson; @@ -98,8 +98,6 @@ import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; -import org.jetbrains.annotations.NotNull; - import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -110,7 +108,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -127,14 +124,10 @@ import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.subjects.BehaviorSubject; import okhttp3.Cache; -import okhttp3.Interceptor; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.OkHttpClient; -import okhttp3.Protocol; -import okhttp3.Request; import okhttp3.RequestBody; -import okhttp3.Response; import okhttp3.ResponseBody; import retrofit2.Retrofit; import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory; @@ -152,13 +145,10 @@ public class NetInterfaceManager { private OkHttpClient okHttpClient; private CacheHelper mCacheHelper; - private final ConcurrentHashMap requestIdsMap = new ConcurrentHashMap<>(); - //超时时间 private static final int timeOut = 5; // 缓存文件最大限制大小20M private static final long cacheSize = 1024 * 1024 * 64; - public static final String CUSTOM_REPEAT_REQ_PROTOCOL = "MY_CUSTOM_REPEAT_REQ_PROTOCOL"; private NetInterfaceManager(Context context) { if (context == null) { @@ -170,46 +160,6 @@ public class NetInterfaceManager { if (null == mRetrofit) { if (okHttpClient == null) { - Interceptor myHttpInterceptor = new Interceptor() { - @NotNull - @Override - public Response intercept(@NotNull Chain chain) throws IOException { - Request request = chain.request(); - String requestKey = MD5Util.getUpperMD5Str(request.method() + request.url().toString()); - Response response = chain.proceed(request); //准备返回Response - synchronized (requestIdsMap) { - requestIdsMap.remove(requestKey); //在这里移除正常的请求登记 - Log.e("REPEAT-REQUEST", "移除请求2:" + requestKey + " --- " + Thread.currentThread().getName() + " URL = " + request.url()); - } - return response; - } - }; - Interceptor mRequestInterceptor = new Interceptor() { - @NotNull - @Override - public Response intercept(@NotNull Chain chain) throws IOException { - Request request = chain.request(); - //拦截处理重复的HTTP 请求,类似 防止快速点击按钮去重 可以不去处理了，全局统一处理 - String requestKey = MD5Util.getUpperMD5Str(request.method() + request.url().toString()); - synchronized (requestIdsMap) { - if (requestIdsMap.get(requestKey) == null) { -// Log.e("REPEAT-REQUEST", "intercept: " + requestIdsMap); - requestIdsMap.put(requestKey, System.currentTimeMillis()); - Log.e("REPEAT-REQUEST", "注册请求:" + requestKey + " --- " + Thread.currentThread().getName() + " URL = " + request.url()); - } else { - //如果是重复的请求，抛出一个自定义的错误，这个错误大家根据自己的业务定义吧 - Log.e("REPEAT-REQUEST", "重复请求:" + requestKey + " --- " + Thread.currentThread().getName() + " URL = " + request.url()); - return new Response.Builder() - .protocol(Protocol.get(CUSTOM_REPEAT_REQ_PROTOCOL)) - .request(request) //multi thread - .build(); - } - } - Response originalResponse = chain.proceed(request); - return originalResponse.newBuilder().build(); - } - }; - //如果无法生存缓存文件目录，检测权限使用已经加上，检测手机是否把文件读写权限禁止了 OkHttpClient.Builder builder = new OkHttpClient.Builder(); builder.connectTimeout(timeOut, TimeUnit.SECONDS); // 设置连接超时时间 @@ -218,16 +168,12 @@ public class NetInterfaceManager { builder.retryOnConnectionFailure(true);// 设置进行连接失败重试 builder.addInterceptor(new RepeatRequestInterceptor()); -// builder.addInterceptor(myHttpInterceptor); -// builder.addNetworkInterceptor(mRequestInterceptor); - // 设置缓存文件路径 String cacheDirectory = getCacheDir() + "/OkHttpCache"; Cache cache = new Cache(new File(cacheDirectory), cacheSize); builder.cache(cache);// 设置缓存 okHttpClient = builder.build(); } - mRetrofit = new Retrofit.Builder() .client(okHttpClient) .baseUrl(UrlAddress.ROOT_URL) @@ -235,14 +181,6 @@ public class NetInterfaceManager { .addCallAdapterFactory(RxJava3CallAdapterFactory.create()) .build(); } -// if (null == mGankaoRetrofit) { -// mGankaoRetrofit = new Retrofit.Builder() -// .client(okHttpClient) -// .baseUrl(UrlAddress.GANKAN_ROOT_URL) -// .addConverterFactory(GsonConverterFactory.create()) -// .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) -// .build(); -// } } private String getCacheDir() { @@ -401,18 +339,7 @@ public class NetInterfaceManager { } public Observable>> getOverallAppObservable() { - int platformCode = 0; - String platform = BuildConfig.platform; - switch (platform) { - case "ZhanRui": - platformCode = 2; - break; - case "MTK": - platformCode = 1; - break; - default: - platformCode = 3; - } + int platformCode = JGYUtils.getInstance().checkAppPlatform(); return getOverallAppByPlatformControl() .getOverallApp(platformCode) .subscribeOn(Schedulers.io()) @@ -622,9 +549,9 @@ public class NetInterfaceManager { } public void getSnInfo(boolean refresh, BehaviorSubject lifecycle, ObserverCallback callback) { - ConnectMode connectMode = ConnectMode.SIX_HOUR; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.ONE_MINUTE; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SNINFO, connectMode)) { getSnInfo(lifecycle, callback); @@ -647,136 +574,95 @@ public class NetInterfaceManager { public void getSnInfo(BehaviorSubject lifecycle, ObserverCallback callback) { getsnInfoControl() .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { - Log.e("getSnInfo", "onSubscribe: "); - callback.onSubscribe(d); - } - - @Override - public void onNext(BaseResponse userInfoBaseResponse) { - Log.e("getSnInfo", "onNext: " + userInfoBaseResponse); - SPUtils.put(mContext, CommonConfig.JGY_FIRST_CONNECT, 1); - callback.onNext(userInfoBaseResponse); - mCacheHelper.put(UrlAddress.SNINFO, GsonUtils.toJSONString(userInfoBaseResponse)); - int code = userInfoBaseResponse.code; - if (userInfoBaseResponse.code == 200) { - SPUtils.put(mContext, CommonConfig.isLogined, 1); - SnInfo snInfo = userInfoBaseResponse.data; - Settings.System.putString(crv, "UserInfo_username", snInfo.getSn_name()); - Settings.System.putString(crv, "UserInfo_grade", snInfo.getGrade()); - SPUtils.put(mContext, "sn_id", snInfo.getId()); - if (!TextUtils.isEmpty(snInfo.getSn_name())) { - SPUtils.put(mContext, "USERINFO_NAME", snInfo.getSn_name()); - } - if (!TextUtils.isEmpty(snInfo.getSchool())) { - SPUtils.put(mContext, "USERINFO_SCHOOL", snInfo.getSchool()); - } - if (!TextUtils.isEmpty(snInfo.getGrade())) { - SPUtils.put(mContext, "USERINFO_GRADE", snInfo.getGrade()); - } - } else if (code == 300) { - mCacheHelper.put(UrlAddress.SNINFO, ""); - SPUtils.put(mContext, CommonConfig.isLogined, 0); - } else if (code == 401) { - mCacheHelper.put(UrlAddress.SNINFO, ""); - SPUtils.put(mContext, CommonConfig.isLogined, 2); - } - } - - @Override - public void onError(Throwable e) { - Log.e("getSnInfo", "onError: " + e.getMessage()); - callback.onError(e); - onComplete(); - } - - @Override - public void onComplete() { - Log.e("getSnInfo", "onComplete: "); - callback.onComplete(); - } - }); + .subscribe(getSnInfoObserver(callback)); } + public void getSnInfo(ObserverCallback callback) { + getsnInfoControl() + .subscribe(getSnInfoObserver(callback)); + } + + public void getSnInfo() { + getsnInfoControl() + .subscribe(getSnInfoObserver(null)); + } + + public Observer> getSnInfoObserver(ObserverCallback callback) { + return new Observer>() { + @Override + public void onSubscribe(Disposable d) { + Log.e("getSnInfo", "onSubscribe: "); + if (callback != null) + callback.onSubscribe(d); + } + + @Override + public void onNext(BaseResponse userInfoBaseResponse) { + Log.e("getSnInfo", "onNext: " + userInfoBaseResponse); + SPUtils.put(mContext, CommonConfig.JGY_FIRST_CONNECT, 1); + if (callback != null) + callback.onNext(userInfoBaseResponse); + mCacheHelper.put(UrlAddress.SNINFO, GsonUtils.toJSONString(userInfoBaseResponse)); + int code = userInfoBaseResponse.code; + if (userInfoBaseResponse.code == 200) { + SPUtils.put(mContext, CommonConfig.isLogined, 1); + SnInfo snInfo = userInfoBaseResponse.data; + Settings.System.putString(crv, "UserInfo_username", snInfo.getSn_name()); + Settings.System.putString(crv, "UserInfo_grade", snInfo.getGrade()); + SPUtils.put(mContext, "sn_id", snInfo.getId()); + if (!TextUtils.isEmpty(snInfo.getSn_name())) { + SPUtils.put(mContext, "USERINFO_NAME", snInfo.getSn_name()); + } + if (!TextUtils.isEmpty(snInfo.getSchool())) { + SPUtils.put(mContext, "USERINFO_SCHOOL", snInfo.getSchool()); + } + if (!TextUtils.isEmpty(snInfo.getGrade())) { + SPUtils.put(mContext, "USERINFO_GRADE", snInfo.getGrade()); + } + } else if (code == 300) { + mCacheHelper.put(UrlAddress.SNINFO, ""); + SPUtils.put(mContext, CommonConfig.isLogined, 0); + } else if (code == 401) { + mCacheHelper.put(UrlAddress.SNINFO, ""); + SPUtils.put(mContext, CommonConfig.isLogined, 2); + } + } + + @Override + public void onError(Throwable e) { + Log.e("getSnInfo", "onError: " + e.getMessage()); + if (callback != null) + callback.onError(e); + onComplete(); + } + + @Override + public void onComplete() { + Log.e("getSnInfo", "onComplete: "); + if (callback != null) + callback.onComplete(); + } + }; + } + + /** * 设置推送标签 - * - * @param lifecycle - * @param callback */ - public void setPushTags(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.ONE_DAY; - if (refresh) { - connectMode = ConnectMode.ONE_DAY; - } - if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_BATCH, connectMode)) { - setPushTags(lifecycle, callback); - } else { - String jsonString = mCacheHelper.getAsString(UrlAddress.GET_BATCH); - //为 "" 是已经请求成功的 - if (jsonString == null) { - setPushTags(lifecycle, callback); - } else { - Set tagSets = mMMKV.decodeStringSet(CommonConfig.DEVICES_TAG); - Log.e("setPushTags", "tagSets: " + tagSets); - clearAndAppendTags(tagSets); - callback.onComplete(); - } - } - } - - public void setPushTags(BehaviorSubject lifecycle, CompleteCallback callback) { + public void setPushTags() { Set set = new HashSet<>(); JGYUtils.getInstance().getAppPlatform(platform -> { if (platform == JGYUtils.MTKPlatform) { set.add(JGYUtils.MTKTag); } else if (platform == JGYUtils.ZhanruiPlatform) { set.add(JGYUtils.ZhanruiTag); + } else if (platform == JGYUtils.M40sePlatform) { + set.add(JGYUtils.M40SETag); + } else if (platform == JGYUtils.T30ProPlatform) { + set.add(JGYUtils.T30PROTag); } }); -// getBatchApiControl() -// .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) -// .subscribe(new Observer>() { -// @Override -// public void onSubscribe(@NonNull Disposable d) { -// Log.e("setPushTags", "onSubscribe: "); -// } -// -// @Override -// public void onNext(@NonNull BaseResponse response) { -// Log.e("setPushTags", "onNext: " + response); -// if (response.code == 200) { -// BatchID batchID = response.data; -// String batch = batchID.getBatch_id(); -// Log.e("setPushTags", "onNext: " + batch); -// if (!TextUtils.isEmpty(batch)) { -// set.add(batch); -// } else { -// Log.e("setPushTags", "onNext: " + "batch empty"); -// } -// mCacheHelper.put(UrlAddress.GET_BATCH, GsonUtils.toJSONString(response.data)); -// } else { -// mCacheHelper.put(UrlAddress.GET_BATCH, ""); -// } -// mMMKV.encode(CommonConfig.DEVICES_TAG, set); -// } -// -// @Override -// public void onError(@NonNull Throwable e) { -// Log.e("setPushTags", "onError: " + e.getMessage()); -// onComplete(); -// } -// -// @Override -// public void onComplete() { -// Log.e("setPushTags", "onComplete: "); -// Log.e("setPushTags", "tagSets: " + set); -// clearAndAppendTags(set); -// callback.onComplete(); -// } -// }); + clearAndAppendTags(set); } private void clearAndAppendTags(Set tagSets) { @@ -1010,9 +896,9 @@ public class NetInterfaceManager { } public void checkAllAppUpdate(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.ONE_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.HALF_DAY; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_NEWESTAPPUPDATE, connectMode)) { checkAllAppUpdate(lifecycle, callback); @@ -1089,9 +975,9 @@ public class NetInterfaceManager { } public void checkFXYAppUpdate(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.SIX_HOUR; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.ONE_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(JGYUtils.FUXIAOYING_KEY, connectMode)) { checkFXYAppUpdate(lifecycle, callback); @@ -1240,7 +1126,7 @@ public class NetInterfaceManager { } private void getCloudLessonSetting(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.ONE_HOUR; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { connectMode = ConnectMode.DEFAULT; } @@ -1289,9 +1175,9 @@ public class NetInterfaceManager { } public void getQRCodeURL(boolean refresh, BehaviorSubject lifecycle, onNextCallback callback) { - ConnectMode connectMode = ConnectMode.ONE_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.HALF_DAY; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_APPLET_QRCODE, connectMode)) { getQRCodeURL(lifecycle, callback); @@ -1403,9 +1289,9 @@ public class NetInterfaceManager { } public void getBrowserWhiteList(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.HALF_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.SIX_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SET_BROWSER_URL, connectMode)) { getBrowserWhiteList(lifecycle, callback); @@ -1500,9 +1386,9 @@ public class NetInterfaceManager { public void getBrowserLabel(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.HALF_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.SIX_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.SET_BROWSER_LABEL, connectMode)) { getBrowserLabel(lifecycle, callback); @@ -1852,43 +1738,6 @@ public class NetInterfaceManager { } } - //应用内网页管控 - public void setAPPinsideBrowser(List list) { - StringBuilder packageList = new StringBuilder(); - StringBuilder urlList = new StringBuilder(); - for (AppStart app : list) { - if (TextUtils.isEmpty(app.getAddress())) { - packageList.append(app.getApp_package()).append(","); - } else { - urlList.append(app.getApp_package()).append(",").append(app.getAddress()).append(";"); - } - } - - if (!TextUtils.isEmpty(packageList.toString())) { -// //app内所有的网页禁止 -// packageList = packageList.substring(0, packageList.length() - 1); -// //去掉多余的, -// Log.e("setAppinsideWeb ", "packageList:" + packageList); -// Intent qch_app_website = new Intent("qch_app_website") -// .setPackage("com.android.settings"); -// qch_app_website.putExtra("package_name", packageList); -// mContext.sendBroadcast(qch_app_website); - sendAllweb(); - } else { - sendAllweb(); - } - if (!TextUtils.isEmpty(urlList.toString())) { - //app内单个网页地址禁止打开 - Log.e("setAppinsideWeb ", "strings:" + urlList); - Intent intent = new Intent("qch_app_inside_website") - .setPackage("com.android.settings"); - intent.putExtra("websitelist", urlList.toString()); - mContext.sendBroadcast(intent); - } else { - sendwebUrl(); - } - } - //应用ID管控 @SuppressLint("NewApi") public void setAPPIDJump(List list) { @@ -1960,11 +1809,6 @@ public class NetInterfaceManager { String machine = Utils.getMachine(mContext); String hardware = Utils.getHardware(mContext); String software = softwareJson.toString(); - if (BuildConfig.DEBUG) { - Log.e(TAG, "updateAdminInfo: machine = " + machine); - Log.e(TAG, "updateAdminInfo: getHardware = " + hardware); - Log.e(TAG, "updateAdminInfo: software = " + software); - } JsonObject nowJson = new JsonObject(); nowJson.addProperty("address", addr); nowJson.addProperty("machine", machine); @@ -1972,6 +1816,8 @@ public class NetInterfaceManager { nowJson.addProperty("software", software); String string = GsonUtils.toJSONString(nowJson); String oldString = mMMKV.decodeString(UrlAddress.UPDATE_SNINFO, ""); + Log.e(TAG, "updateAdminInfo: oldString = " + oldString); + Log.e(TAG, "updateAdminInfo: string = " + string); if (oldString.equals(string)) { Log.e(TAG, "updateAdminInfo: skip"); return; @@ -2068,9 +1914,9 @@ public class NetInterfaceManager { } public void getForceInstall(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.ONE_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.ONE_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_FORCE_INSTALL, connectMode)) { getForceInstall(lifecycle, callback); @@ -2084,8 +1930,9 @@ public class NetInterfaceManager { Type type = new TypeToken>() { }.getType(); List appInfos = gson.fromJson(jsonString, type); - - callback.onComplete(); + if (callback != null) { + callback.onComplete(); + } } } } @@ -2186,39 +2033,79 @@ public class NetInterfaceManager { } } + public void getSystemSettings(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { + ConnectMode connectMode = ConnectMode.ONE_MINUTE; + if (refresh) { + connectMode = ConnectMode.DEFAULT; + } + if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_SETTINGS, connectMode)) { + getSystemSettings(lifecycle, callback); + } else { + String jsonString = mCacheHelper.getAsString(UrlAddress.GET_SETTINGS); + //为 "" 是已经请求成功的 + if (jsonString == null) { + getSystemSettings(lifecycle, callback); + } else { + if (callback != null) { + callback.onComplete(); + } + } + } + } + + public void getSystemSettings(BehaviorSubject lifecycle, CompleteCallback callback) { + getsettingControl() + .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) + .subscribe(getSystemSettingsObserver(callback)); + } + + public void getSystemSettings(CompleteCallback callback) { + getsettingControl() + .subscribe(getSystemSettingsObserver(callback)); + } + public void getSystemSettings() { getsettingControl() - .subscribe(new Observer>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("getSystemSettings", "onSubscribe: "); - } + .subscribe(getSystemSettingsObserver(null)); + } - @Override - public void onNext(@NonNull BaseResponse BaseResponse) { - int code = BaseResponse.code; - if (code == 200) { - String data = new Gson().toJson(BaseResponse.data.getUser()); - Log.e("getSystemSettings", "onNext: " + data); - ControlManager.getInstance().setSystemSetting(data); - mCacheHelper.put(UrlAddress.GET_SETTINGS, GsonUtils.toJSONString(BaseResponse.data.getUser())); - } else { - ControlManager.getInstance().setDisableSetting(); - mCacheHelper.put(UrlAddress.GET_SETTINGS, ""); - } - } + public Observer> getSystemSettingsObserver(CompleteCallback callback) { + return new Observer>() { + @Override + public void onSubscribe(Disposable d) { + Log.e("getSystemSettings", "onSubscribe: "); + } - @Override - public void onError(@NonNull Throwable e) { - Log.e("getSystemSettings", "onError: " + e.getMessage()); - onComplete(); - } + @Override + public void onNext(BaseResponse systemSettingsBaseResponse) { + Log.e("getSystemSettings", "onNext: " + systemSettingsBaseResponse); + SPUtils.put(mContext, "is_first_connection", 0); + int code = systemSettingsBaseResponse.code; + if (code == 200) { + String data = new Gson().toJson(systemSettingsBaseResponse.data.getUser()); + ControlManager.getInstance().setSystemSetting(data); + } else { + ControlManager.getInstance().setDisableSetting(); + } + } - @Override - public void onComplete() { - Log.e("getSystemSettings", "onComplete: "); - } - }); + @Override + public void onError(Throwable e) { + if ((int) SPUtils.get(mContext, "is_first_connection", 1) == 1) { + ControlManager.getInstance().setDisableSetting(); + } + Log.e("getSystemSettings", "onError: " + e.getMessage()); + onComplete(); + } + + @Override + public void onComplete() { + Log.e("getSystemSettings", "onComplete: "); + if (callback != null) { + callback.onComplete(); + } + } + }; } public String getSystemSettingsJson() { @@ -2541,10 +2428,10 @@ public class NetInterfaceManager { if (jsonString == null) { getSnTimeControl(lifecycle, callback); } else { - Gson gson = new Gson(); - Type type = new TypeToken() { - }.getType(); - MachineControl machineControl = gson.fromJson(jsonString, type); +// Gson gson = new Gson(); +// Type type = new TypeToken() { +// }.getType(); +// MachineControl machineControl = gson.fromJson(jsonString, type); callback.onComplete(); } } @@ -2653,9 +2540,9 @@ public class NetInterfaceManager { } public void getOverallApp(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.HALF_DAY; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.SIX_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GE_TOVERALL_APPBYPLATFORM, connectMode)) { getOverallApp(lifecycle, callback); @@ -2824,9 +2711,9 @@ public class NetInterfaceManager { } public void getAppJump(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { - ConnectMode connectMode = ConnectMode.SIX_HOUR; + ConnectMode connectMode = ConnectMode.ONE_MINUTE; if (refresh) { - connectMode = ConnectMode.ONE_HOUR; + connectMode = ConnectMode.DEFAULT; } if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_APP_JUMP, connectMode)) { getAppJump(lifecycle, callback); @@ -3074,4 +2961,80 @@ public class NetInterfaceManager { } }; } + + public void getAppAndWhite(boolean refresh, BehaviorSubject lifecycle, CompleteCallback callback) { + ConnectMode connectMode = ConnectMode.ONE_MINUTE; + if (refresh) { + connectMode = ConnectMode.DEFAULT; + } + if (ConnectManager.getInstance().isNeedConnect(UrlAddress.GET_APP_AND_WHITE, connectMode)) { + getAppAndWhite(lifecycle, callback); + } else { + String jsonString = mCacheHelper.getAsString(UrlAddress.GET_APP_AND_WHITE); + //为 "" 是已经请求成功的 + if (jsonString == null) { + getAppAndWhite(lifecycle, callback); + } else { + Gson gson = new Gson(); + Type type = new TypeToken>() { + }.getType(); + if (callback != null) { + callback.onComplete(); + } + } + } + } + + public void getAppAndWhite(BehaviorSubject lifecycle, CompleteCallback callback) { + getAppAndWhiteApiObservable() + .compose(RxLifecycle.bindUntilEvent(lifecycle, ActivityEvent.DESTROY)) + .subscribe(getAppAndWhiteObserver(callback)); + } + + public void getAppAndWhite(CompleteCallback callback) { + getAppAndWhiteApiObservable() + .subscribe(getAppAndWhiteObserver(callback)); + } + + public void getAppAndWhite() { + getAppAndWhiteApiObservable() + .subscribe(getAppAndWhiteObserver(null)); + } + + public Observer>> getAppAndWhiteObserver(CompleteCallback callback) { + return new Observer>>() { + @Override + public void onSubscribe(@NonNull Disposable d) { + Log.e("getAppAndWhite", "onSubscribe: "); + } + + @Override + public void onNext(@NonNull BaseResponse> baseResponse) { + Log.e("getAppAndWhite", "onSubscribe: " + baseResponse); + if (baseResponse.code == 200) { + List appAndWhiteList = baseResponse.data; + if (appAndWhiteList != null) { + List pkgList = appAndWhiteList.stream().map(AppAndWhiteBean::getApp_package).collect(Collectors.toList()); + String pkgString = StringUtils.join(",", pkgList); + mMMKV.encode(UrlAddress.GET_APP_AND_WHITE, pkgString); + Log.e("getAppAndWhite", "onNext: " + pkgString); + } + } + } + + @Override + public void onError(@NonNull Throwable e) { + Log.e("getAppAndWhite", "onError: " + e.getMessage()); + onComplete(); + } + + @Override + public void onComplete() { + Log.e("getAppAndWhite", "onComplete: "); + if (callback != null) { + callback.onComplete(); + } + } + }; + } } diff --git a/app/src/main/java/com/fuying/sn/network/UrlAddress.java b/app/src/main/java/com/fuying/sn/network/UrlAddress.java index 316cebf..e464dc8 100644 --- a/app/src/main/java/com/fuying/sn/network/UrlAddress.java +++ b/app/src/main/java/com/fuying/sn/network/UrlAddress.java @@ -80,21 +80,7 @@ public class UrlAddress { public static final String UPDATE_LOCK_SCREEN = "sn/updateLockScreen"; - /*发送app信息*/ - @Deprecated - public static final String APPLOG = "App/getApplog"; - /*根据包名获取更新*/ - @Deprecated - public final static String GET_APP_UPDATE = "Update/update"; - /*获取当前最顶层应用和电量*/ - @Deprecated - public final static String SEND_RUNINGAPPINFO = "Monitoring/getAppNow"; - /*在线状态*/ - @Deprecated - public final static String SEND_DRIVE_STATE = "Online/online"; - /*获取公网IP*/ public static final String SHOUHU_CITYJSON = "http://pv.sohu.com/cityjson/"; - } diff --git a/app/src/main/java/com/fuying/sn/network/api/Applog.java b/app/src/main/java/com/fuying/sn/network/api/Applog.java deleted file mode 100644 index 16d9fcd..0000000 --- a/app/src/main/java/com/fuying/sn/network/api/Applog.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fuying.sn.network.api; - -import com.fuying.sn.bean.BaseResponse; -import com.fuying.sn.network.UrlAddress; - -import io.reactivex.rxjava3.core.Observable; -import retrofit2.http.GET; -import retrofit2.http.Query; - -public interface Applog { - @GET(UrlAddress.APPLOG) - Observable getApplog( - @Query("sn") String sn, - @Query("app_name") String app_name, - @Query("use_time") String use_time, - @Query("status") String status, - @Query("createtime") String createtime - ); -} diff --git a/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java b/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java index e2cd8d7..3d7592a 100644 --- a/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java +++ b/app/src/main/java/com/fuying/sn/receiver/APKinstallReceiver.java @@ -106,7 +106,7 @@ public class APKinstallReceiver extends BroadcastReceiver { NetInterfaceManager.getInstance().getAppInside(); } NetInterfaceManager.getInstance().SendAppInstallInfo(); - MainService.getPresenter().getAppAndWhite(); + NetInterfaceManager.getInstance().getAppAndWhite(); } @Override diff --git a/app/src/main/java/com/fuying/sn/receiver/BootReceiver.java b/app/src/main/java/com/fuying/sn/receiver/BootReceiver.java index ff61676..8dda432 100644 --- a/app/src/main/java/com/fuying/sn/receiver/BootReceiver.java +++ b/app/src/main/java/com/fuying/sn/receiver/BootReceiver.java @@ -21,7 +21,6 @@ import com.fuying.sn.service.StepService; public class BootReceiver extends BroadcastReceiver { private static String TAG = BootReceiver.class.getSimpleName(); public static final String BOOT_COMPLETED = "zuoyeos.action.BOOT_COMPLETED"; - public static final String SOS = "zuoyeos.action.SOS"; @Override public void onReceive(Context context, Intent intent) { @@ -47,17 +46,6 @@ public class BootReceiver extends BroadcastReceiver { context.startService(new Intent(context, DownloadService.class)); context.startService(new Intent(context, ManagerService.class)); context.startService(new Intent(context, ControlPanelService.class)); - } else if (SOS.equals(action)) { - LocationClient locationClient = AmapManager.getInstance().getLocationClient(); - locationClient.stop(); - locationClient.start(); - locationClient.registerLocationListener(new BDAbstractLocationListener() { - @Override - public void onReceiveLocation(BDLocation bdLocation) { - Log.e(TAG, "onReceiveLocation: "); - NetInterfaceManager.getInstance().updateAdminInfo(); - } - }); } } } diff --git a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java index 83ad6de..dd3344f 100644 --- a/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/fuying/sn/service/main/MainSPresenter.java @@ -5,35 +5,27 @@ import android.content.Intent; import android.provider.Settings; import android.util.Log; -import com.fuying.sn.bean.AppAndWhiteBean; import com.fuying.sn.bean.AppStart; import com.fuying.sn.bean.BaseResponse; import com.fuying.sn.bean.MyAppUsageBean; -import com.fuying.sn.bean.SystemSettingsSet; import com.fuying.sn.config.CommonConfig; import com.fuying.sn.desktop.RunningAppManager; import com.fuying.sn.disklrucache.CacheHelper; import com.fuying.sn.gson.GsonUtils; -import com.fuying.sn.manager.ControlManager; import com.fuying.sn.network.NetInterfaceManager; -import com.fuying.sn.network.UrlAddress; import com.fuying.sn.service.ManagerService; import com.fuying.sn.utils.JGYUtils; import com.fuying.sn.utils.SPUtils; import com.fuying.sn.utils.ServiceAliveUtils; -import com.fuying.sn.utils.StringUtils; import com.fuying.sn.utils.Utils; -import com.google.gson.Gson; import com.google.gson.JsonObject; import com.tencent.mmkv.MMKV; import com.trello.rxlifecycle4.RxLifecycle; import com.trello.rxlifecycle4.android.ActivityEvent; import java.util.List; -import java.util.stream.Collectors; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -43,7 +35,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject; * @author jgy02 */ public class MainSPresenter implements MainSContact.Presenter { - private String TAG = MainSPresenter.class.getSimpleName(); + private static final String TAG = MainSPresenter.class.getSimpleName(); private MainSContact.MainView mView; private Context mContext; @@ -75,42 +67,14 @@ public class MainSPresenter implements MainSContact.Presenter { this.mView = null; } - @Override public void getAppAndWhite() { - NetInterfaceManager.getInstance() - .getAppAndWhiteApiObservable() - .subscribe(new Observer>>() { - @Override - public void onSubscribe(@NonNull Disposable d) { - Log.e("getAppAndWhite", "onSubscribe: "); - } - - @Override - public void onNext(@NonNull BaseResponse> baseResponse) { - Log.e("getAppAndWhite", "onSubscribe: " + baseResponse); - if (baseResponse.code == 200) { - List appAndWhiteList = baseResponse.data; - if (appAndWhiteList != null) { - List pkgList = appAndWhiteList.stream().map(AppAndWhiteBean::getApp_package).collect(Collectors.toList()); - String pkgString = StringUtils.join(",", pkgList); - mMMKV.encode(UrlAddress.GET_APP_AND_WHITE, pkgString); - Log.e("getAppAndWhite", "onNext: " + pkgString); - } - } - } - - @Override - public void onError(@NonNull Throwable e) { - Log.e("getAppAndWhite", "onError: " + e.getMessage()); - } - - @Override - public void onComplete() { - Log.e("getAppAndWhite", "onComplete: "); - } - }); - mView.getAppAndWhiteFinish(); + NetInterfaceManager.getInstance().getAppAndWhite(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { + @Override + public void onComplete() { + mView.getAppAndWhiteFinish(); + } + }); } @Override @@ -155,29 +119,28 @@ public class MainSPresenter implements MainSContact.Presenter { @Override public void getSnInfo() { - NetInterfaceManager.getInstance() - .getSnInfo(true, getLifecycle(), new NetInterfaceManager.ObserverCallback() { - @Override - public void onSubscribe(Disposable d) { - Log.e("getSnInfo", "onSubscribe: "); - } + NetInterfaceManager.getInstance().getSnInfo(true, getLifecycle(), new NetInterfaceManager.ObserverCallback() { + @Override + public void onSubscribe(Disposable d) { + Log.e("getSnInfo", "onSubscribe: "); + } - @Override - public void onNext(BaseResponse response) { - Log.e("getSnInfo", "onNext: "); - mView.setSnInfo(response); - } + @Override + public void onNext(BaseResponse response) { + Log.e("getSnInfo", "onNext: "); + mView.setSnInfo(response); + } - @Override - public void onError(Throwable e) { - Log.e("getSnInfo", "onError: " + e.getMessage()); - } + @Override + public void onError(Throwable e) { + Log.e("getSnInfo", "onError: " + e.getMessage()); + } - @Override - public void onComplete() { - Log.e("getSnInfo", "onComplete: "); - } - }); + @Override + public void onComplete() { + Log.e("getSnInfo", "onComplete: "); + } + }); } @Override @@ -242,45 +205,14 @@ public class MainSPresenter implements MainSContact.Presenter { Log.e("getForceInstall", "onComplete: "); } }); - } @Override public void getSystemSettings() { NetInterfaceManager.getInstance() - .getsettingControl() - .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) - .subscribe(new Observer>() { - @Override - public void onSubscribe(Disposable d) { - Log.e("getSystemSettings", "onSubscribe: "); - } - - @Override - public void onNext(BaseResponse systemSettingsBaseResponse) { - Log.e("getSystemSettings", "onNext: " + systemSettingsBaseResponse); - SPUtils.put(mContext, "is_first_connection", 0); - int code = systemSettingsBaseResponse.code; - if (code == 200) { - String data = new Gson().toJson(systemSettingsBaseResponse.data.getUser()); - ControlManager.getInstance().setSystemSetting(data); - } else { - ControlManager.getInstance().setDisableSetting(); - } - } - - @Override - public void onError(Throwable e) { - if ((int) SPUtils.get(mContext, "is_first_connection", 1) == 1) { - ControlManager.getInstance().setDisableSetting(); - } - Log.e("getSystemSettings", "onError: " + e.getMessage()); - onComplete(); - } - + .getSystemSettings(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { @Override public void onComplete() { - Log.e("getSystemSettings", "onComplete: "); mView.setSystemSettings(); } }); @@ -289,82 +221,6 @@ public class MainSPresenter implements MainSContact.Presenter { @Override public void getBrowserLabel() { mView.setBrowserLabel(); -// NetInterfaceManager.getInstance().getBrowserLabel(true, getLifecycle(), new NetInterfaceManager.CompleteCallback() { -// @Override -// public void onComplete() { -// mView.setBrowserLabel(); -// } -// }); -// NetInterfaceManager.getInstance().getLabelControl() -// .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY)) -// .subscribe(new Observer>() { -// @Override -// public void onSubscribe(Disposable d) { -// Log.e("getBrowserLabel", "onSubscribe: "); -// } -// -// @Override -// public void onNext(BaseResponse