From 84e3fa87fabc3eb592034e9dd6ec6b5187842bf4 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Mon, 26 Aug 2024 10:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89butterknife?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 22 +- app/keystore/G10zUserDebug.keystore | Bin 0 -> 2554 bytes .../aoleyun/sn/activity/CleanupActivity.java | 31 +- .../sn/activity/EyeProtectionActivity.java | 58 +-- .../aoleyun/sn/activity/SplashActivity.java | 2 +- .../sn/activity/main/MainActivity.java | 2 +- .../sn/activity/main/MainViewModel.java | 2 +- .../requestlog/RequestLogActivity.java | 84 ++- .../requestlog/RequestLogContact.java | 17 - .../requestlog/RequestLogPresenter.java | 47 -- .../requestlog/RequestLogViewModel.java | 34 ++ .../sn/activity/update/UpdateActivity.java | 100 ++-- .../sn/activity/update/UpdateContact.java | 19 - .../sn/activity/update/UpdatePresenter.java | 52 -- .../sn/activity/update/UpdateViewModel.java | 39 ++ .../aoleyun/sn/adapter/AppUpdateAdapter.java | 2 +- .../com/aoleyun/sn/base/BaseApplication.java | 3 +- .../sn/base/mvvm/BaseMvvmActivity.java | 3 +- .../com/aoleyun/sn/comm/CommonConfig.java | 2 + .../aoleyun/sn/disklrucache/CacheHelper.java | 2 +- .../sn/hook/AoleyunActivityController.java | 2 +- .../aoleyun/sn/manager/ConnectManager.java | 2 +- .../com/aoleyun/sn/manager/MapManager.java | 2 +- .../sn/network/NetInterfaceManager.java | 2 +- .../com/aoleyun/sn/network/RetryCallback.java | 2 +- .../interceptor/RepeatRequestInterceptor.java | 2 +- .../java/com/aoleyun/sn/push/PushManager.java | 7 +- .../push/alipush/AliMessageIntentService.java | 2 +- .../push/alipush/AliyunMessageReceiver.java | 2 +- .../com/aoleyun/sn/receiver/BootReceiver.java | 2 +- .../aoleyun/sn/receiver/NewAppReceiver.java | 2 +- .../com/aoleyun/sn/rlog/LogDBManager.java | 2 +- .../com/aoleyun/sn/service/GuardService.java | 2 +- .../com/aoleyun/sn/service/LogcatService.java | 2 +- .../com/aoleyun/sn/service/RemoteService.java | 2 +- .../com/aoleyun/sn/service/StepService.java | 2 +- .../sn/service/main/MainSPresenter.java | 2 +- .../aoleyun/sn/service/main/MainService.java | 2 +- .../com/aoleyun/sn/utils/AES/AESEncrypt.java | 2 +- .../sn/utils/AES/AesCbcWithIntegrity.java | 10 +- .../java/com/aoleyun/sn/utils/ApkUtils.java | 2 +- .../java/com/aoleyun/sn/utils/AppUtil.java | 2 +- .../com/aoleyun/sn/utils/BootManager.java | 2 +- .../java/com/aoleyun/sn/utils/CacheUtils.java | 2 +- .../sn/utils/Camera2BackgroundUtil.java | 2 +- .../aoleyun/sn/utils/ForegroundAppUtil.java | 2 +- .../java/com/aoleyun/sn/utils/JGYUtils.java | 17 +- .../com/aoleyun/sn/utils/NetworkUtils.java | 2 +- .../aoleyun/sn/utils/ServiceAliveUtils.java | 2 +- .../com/aoleyun/sn/utils/SysSettingUtils.java | 11 +- .../java/com/aoleyun/sn/utils/TimeUtils.java | 2 +- .../java/com/aoleyun/sn/utils/URLUtils.java | 2 +- .../main/java/com/aoleyun/sn/utils/Utils.java | 2 +- .../java/com/aoleyun/sn/utils/WiFiUtils.java | 2 +- .../java/com/aoleyun/sn/utils/XAPKUtils.java | 2 +- .../res/layout-land/activity_request_log.xml | 254 ++++----- .../main/res/layout-land/activity_update.xml | 98 ---- .../main/res/layout-port/activity_main.xml | 4 +- .../res/layout-port/activity_request_log.xml | 254 ++++----- .../main/res/layout-port/activity_update.xml | 96 ---- app/src/main/res/layout/activity_cleanup.xml | 127 ++--- .../res/layout/activity_eye_protection.xml | 485 +++++++++--------- app/src/main/res/layout/activity_update.xml | 146 +++--- 63 files changed, 933 insertions(+), 1159 deletions(-) create mode 100644 app/keystore/G10zUserDebug.keystore delete mode 100644 app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogContact.java delete mode 100644 app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogPresenter.java create mode 100644 app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogViewModel.java delete mode 100644 app/src/main/java/com/aoleyun/sn/activity/update/UpdateContact.java delete mode 100644 app/src/main/java/com/aoleyun/sn/activity/update/UpdatePresenter.java create mode 100644 app/src/main/java/com/aoleyun/sn/activity/update/UpdateViewModel.java delete mode 100644 app/src/main/res/layout-land/activity_update.xml delete mode 100644 app/src/main/res/layout-port/activity_update.xml diff --git a/app/build.gradle b/app/build.gradle index 5116304..f251af4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,6 +147,15 @@ android { v2SigningEnabled true } + G10ZUserDebug { + storeFile file("keystore/G10zUserDebug.keystore") + storePassword "123456" + keyAlias "G10zUserDebug" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + mtk12 { storeFile file("keystore/mtkAndroid12.keystore") storePassword "123456" @@ -362,19 +371,25 @@ android { buildConfigField "String", "platform", '"MTK11"' } + zhanruiG10ZUserDebug.initWith(debug) + zhanruiG10ZUserDebug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.G10ZUserDebug + buildConfigField "String", "platform", '"ZR6016"' + } + zhanruiG10ZDebug.initWith(debug) zhanruiG10ZDebug { versionNameSuffix "-debug" debuggable true signingConfig signingConfigs.zhanruiG10Z -// signingConfig signingConfigs.zhanRui buildConfigField "String", "platform", '"ZR6016"' } zhanruiG10ZRelease.initWith(release) zhanruiG10ZRelease { signingConfig signingConfigs.zhanruiG10Z -// signingConfig signingConfigs.zhanRui buildConfigField "String", "platform", '"ZR6016"' } @@ -502,9 +517,6 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - //BindView - implementation 'com.jakewharton:butterknife:10.2.3' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' implementation 'com.squareup.moshi:moshi:1.9.3' //OkHttp diff --git a/app/keystore/G10zUserDebug.keystore b/app/keystore/G10zUserDebug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..6f8990db78f97af4778c77a26173a1be1099a196 GIT binary patch literal 2554 zcmd6o`8(9@9>?c9GiWfv*tfpJHTcz*a?_w{+*_kCTT&wah`_vgp*k7Wo10zC@g&pK|nHmA7r6tl%faVfFzU+0O%laGJO6^81GwPlgKr!K z#}QRB*tu-mZ8o>5TChz-B3}qkv&ikR8R-Dx&7pP)YH?H^uX;wYlR{Nj9n{d#ug2nO zlE{_!_~cQ?f84V;d9dWXj@g9)Uh^xd37;KU@Ya*Pc9)(!v!b#=xOwR>zuRxq`Gb%% zy*=j0`o>L`nWp*Bdu&d@M~UgG0ZEFcvfZR^j9K(XNW2prr!2XRagE!)R-V-6yjdn! zTiAW(Tx2)@RPb=&oab}tr1lOiVbYyl%1k1D%j}ycWuKt6?U=XcX1^LEXwPos_@u!nJcD{Og65`0Y%@n7t66sA@)S0sWAbg+E#&H zoV~fPaiAQ)8o4u3w=lvA(;yLiqsC5sv!&Yb5qyhMvim!uYek>&mN<^N5>F1zMl`zU zKij!eQsiMu$0=LNT>90+ThowWU-kv*Z7rSo7CHOlWL&s(S}|?%aV$n_t$NmN^+{V; zXC-?e!*8(#)JwzYal^f9h~@YigAU0)?(2ceD`g*4o1=9^ z1mKYBa?YSU@xXDr2CI2&YvAEkaOK6`GO57At(&rnw!(Z{jf5@pe9xD&uJ?xJ_|aHf zgvfl@IDS6Kom2vC`pnmcV>wmREBo(ObZ|}Dg18<>)CuQWUZNvrL6~X<HPu6Olt7>i_hb3 zy?b~CD_2zw-R}{g9O@BNyarko9Df>aF;t%9vA^Ci&Gq#(mz@6Oinq5^u{GO`u z50{|9_yhw2>MT9i@yEtang+`~yjfOOVSz#|imepR(z?#b$zrkgfjYNxgNb0Wq|jV^ zP{T%sd*+E;L+Bn48TY%6rCBW7u-*0CbwJNJLo8-bQ=kie-hI`YyLxlte!{Cpn*BHR zKkbpu0;>QjLm=>yBRebt$*_bR7!-g)5s-?saLQZrzV9HC9wAB5qiiDq0Dk0}q!bw@ z5J3+!gVUp+W+pNyknLx348?ff!Nc{Mw~v>rgA5nQ@e?wjkOtoVUVaX)UTAYyLZA%m zk>MV3MihgFmy?gTtJA*;)Bh0Ie~Ac){!a}EfD7gDue-RvR;;79Cn&^?1eHK}83kEc zc~AkgseXf^@Ipkx4mWZs}lDnZ&P34AIhEOiz@ zycG4AJ$)F;(QNfb6cyT+DjP`p1W{*b9W4^x(PI!iDj}wNC)`7#;v&jlG(X8j1P>nr z@aIAp`}pWO{kAe-!S*0E!EZn_eA4}?WR$!j@1@0UNj+)Ab9i}_Eqlqsrs6<#7s$)S zgBeeY`jPpMT)TPph|IG^@&yyi)h{Y9z_S=~UHAJ=o2IV!DGnLzGOEVK%jeb7^f%>* zGz>9A^>LKxQ)ZKWj>%E&K_OAYR|{$x`OCY#rV=QlB@=Uo2G`uf3pux{winSzL_t$! zmN4#2%raX-j0(*%F?`K<{!C>4Ws^R;rUYW!N+$*i!174@AZZsAJQ9u|3!DqiVK|*r zF`ij_YFp4Js&%d<9!+UZ14&&!_eJ5PCXiGg{(sLrBBke(9{f#}K>p>&G5>4@1*ZdH z0C4!LJdXa~kvss%W${ZjA5>2Gemd@{lTGDUPE+MKmOF$$Ssy}_F-u=La4~p zybZilW(d`vrt~U?EEbk0EbjhDTF@;%X;HAe#aAXcr}6A+|FbRa(si*1*|lCl9Iv6) z#Fr$c-i`5nx>W8yvD?<$l}JbOHpX^X32*sgCYe7)IKUdu@3ZIfIec`~q8Un+4~dn% zJAH1esN76$d2b=6&P{LpA{zTKrJWWxSfiW-`&f#7uOo^zT&PP$rL==Amz1XZ1|nyt hrz1@6)|6LV=E*5*krjm}=Vm{C3J4iV^xmf8{|SUTJ6Zq$ literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/aoleyun/sn/activity/CleanupActivity.java b/app/src/main/java/com/aoleyun/sn/activity/CleanupActivity.java index 5333ae9..b973f63 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/CleanupActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/CleanupActivity.java @@ -7,9 +7,13 @@ import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.databinding.DataBindingUtil; + import com.aoleyun.sn.BuildConfig; import com.aoleyun.sn.R; +import com.aoleyun.sn.base.BaseDataBindingActivity; import com.aoleyun.sn.base.mvp.BaseMvpActivity; +import com.aoleyun.sn.databinding.ActivityCleanupBinding; import com.aoleyun.sn.utils.ApkUtils; import com.aoleyun.sn.utils.AppUtil; import com.hjq.toast.Toaster; @@ -18,38 +22,31 @@ import com.king.view.circleprogressview.CircleProgressView; import java.lang.reflect.Method; import java.util.List; -import butterknife.BindView; -import butterknife.ButterKnife; - -public class CleanupActivity extends BaseMvpActivity { - private static final String TAG = CleanupActivity.class.getSimpleName(); - - @BindView(R.id.tv_clean) - TextView tv_clean; - @BindView(R.id.cpv) - CircleProgressView cpv; +public class CleanupActivity extends BaseDataBindingActivity { + private static final String TAG = "CleanupActivity"; + private ActivityCleanupBinding mBinding; /** * 设置布局 */ - @Override - public int getLayoutId() { - return R.layout.activity_cleanup; - } @Override public boolean setNightMode() { return true; } + @Override + protected void initDataBinding() { + mBinding = DataBindingUtil.setContentView(this,R.layout.activity_cleanup); + } + /** * 初始化视图 */ @Override public void initView() { - ButterKnife.bind(this); - tv_clean.setOnClickListener(new View.OnClickListener() { + mBinding.tvClean.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { killBackgroundApp(); @@ -104,7 +101,7 @@ public class CleanupActivity extends BaseMvpActivity { // } else { // cpv.setProgressColor(mShaderColors); // } - cpv.showAnimation(0, x, 1000); + mBinding.cpv.showAnimation(0, x, 1000); float x2 = (((total - avail) / (float) total)); } diff --git a/app/src/main/java/com/aoleyun/sn/activity/EyeProtectionActivity.java b/app/src/main/java/com/aoleyun/sn/activity/EyeProtectionActivity.java index 48aa918..95a348b 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/EyeProtectionActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/EyeProtectionActivity.java @@ -4,34 +4,19 @@ import android.provider.Settings; import android.view.View; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.databinding.DataBindingUtil; import com.aoleyun.sn.R; +import com.aoleyun.sn.base.BaseDataBindingActivity; import com.aoleyun.sn.base.mvp.BaseMvpActivity; +import com.aoleyun.sn.databinding.ActivityEyeProtectionBinding; import com.aoleyun.sn.view.ToggleButton; import com.hjq.toast.Toaster; -import butterknife.BindView; -import butterknife.ButterKnife; +public class EyeProtectionActivity extends BaseDataBindingActivity { -public class EyeProtectionActivity extends BaseMvpActivity { + private ActivityEyeProtectionBinding mBinding; - @BindView(R.id.cl_exit) - ConstraintLayout cl_exit; - @BindView(R.id.toggleButton1) - ToggleButton toggleButton1; - @BindView(R.id.toggleButton2) - ToggleButton toggleButton2; - @BindView(R.id.toggleButton3) - ToggleButton toggleButton3; - @BindView(R.id.toggleButton4) - ToggleButton toggleButton4; - @BindView(R.id.toggleButton5) - ToggleButton toggleButton5; - - @Override - public int getLayoutId() { - return R.layout.activity_eye_protection; - } @Override public boolean setNightMode() { @@ -39,45 +24,48 @@ public class EyeProtectionActivity extends BaseMvpActivity { } @Override - public void initView() { - ButterKnife.bind(this); + protected void initDataBinding() { + mBinding = DataBindingUtil.setContentView(this, R.layout.activity_eye_protection); + } - toggleButton1.setOnToggleChanged(new ToggleButton.OnToggleChanged() { + @Override + public void initView() { + mBinding.toggleButton1.setOnToggleChanged(new ToggleButton.OnToggleChanged() { @Override public void onToggle(boolean on) { Settings.Secure.putInt(getContentResolver(), Settings.Secure.NIGHT_DISPLAY_ACTIVATED, on ? 1 : 0); } }); - toggleButton2.setOnToggleChanged(new ToggleButton.OnToggleChanged() { + mBinding.toggleButton2.setOnToggleChanged(new ToggleButton.OnToggleChanged() { @Override public void onToggle(boolean on) { Settings.Secure.putInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, on ? 1 : 0); Settings.Secure.putInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, on ? 0 : 1); } }); - toggleButton3.setDisable(true); - toggleButton3.setOnClickListener(new View.OnClickListener() { + mBinding.toggleButton3.setDisable(true); + mBinding.toggleButton3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Toaster.show("此功能暂未开放"); } }); - toggleButton4.setDisable(true); - toggleButton4.setOnClickListener(new View.OnClickListener() { + mBinding.toggleButton4.setDisable(true); + mBinding.toggleButton4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Toaster.show("此功能暂未开放"); } }); - toggleButton5.setDisable(true); - toggleButton5.setOnClickListener(new View.OnClickListener() { + mBinding.toggleButton5.setDisable(true); + mBinding.toggleButton5.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Toaster.show("此功能暂未开放"); } }); - cl_exit.setOnClickListener(new View.OnClickListener() { + mBinding.clExit.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { finish(); @@ -95,16 +83,16 @@ public class EyeProtectionActivity extends BaseMvpActivity { super.onResume(); int nightDisplay = Settings.Secure.getInt(getContentResolver(), Settings.Secure.NIGHT_DISPLAY_ACTIVATED, 0); if (nightDisplay == 1) { - toggleButton1.setToggleOn(); + mBinding.toggleButton1.setToggleOn(); } else { - toggleButton1.setToggleOff(); + mBinding.toggleButton1.setToggleOff(); } int accessibilityDisplay = Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0); if (accessibilityDisplay == 1) { - toggleButton2.setToggleOn(); + mBinding.toggleButton2.setToggleOn(); } else { - toggleButton2.setToggleOff(); + mBinding.toggleButton2.setToggleOff(); } } } diff --git a/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java b/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java index 0692c4d..953ba23 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java @@ -51,7 +51,7 @@ import java.nio.file.Paths; public class SplashActivity extends AppCompatActivity { - private static String TAG = SplashActivity.class.getSimpleName(); + private static String TAG = "SplashActivity"; private Button bt_log; private Button bt_stop; diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java index c50f75e..63d4b89 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java @@ -47,7 +47,7 @@ import com.hjq.toast.Toaster; import com.tencent.mmkv.MMKV; public class MainActivity extends BaseMvvmActivity implements NetworkUtils.OnNetworkStatusChangedListener { - private static final String TAG = MainActivity.class.getSimpleName(); + private static final String TAG = "MainActivity"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java index ac0403c..116b9d4 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java @@ -40,7 +40,7 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; public class MainViewModel extends BaseViewModel { - private static final String TAG = MainViewModel.class.getSimpleName(); + private static final String TAG = "MainViewModel"; @Override public ActivityMainBinding getVDBinding() { diff --git a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogActivity.java b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogActivity.java index 331f4fb..86e9b6b 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogActivity.java @@ -1,53 +1,23 @@ package com.aoleyun.sn.activity.requestlog; import android.view.View; -import android.widget.ImageView; +import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.aoleyun.sn.R; -import com.aoleyun.sn.base.mvp.BaseMvpActivity; +import com.aoleyun.sn.base.mvvm.BaseMvvmActivity; +import com.aoleyun.sn.databinding.ActivityRequestLogBinding; import com.aoleyun.sn.rlog.LogBean; import com.aoleyun.sn.rlog.LogDBManager; import java.util.List; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; +public class RequestLogActivity extends BaseMvvmActivity { + private static final String TAG = "RequestLogActivity"; -public class RequestLogActivity extends BaseMvpActivity implements RequestLogContact.MainView { - private static final String TAG = RequestLogActivity.class.getSimpleName(); private RequestLogAdapter mAdapter; - @BindView(R.id.recyclerview) - RecyclerView mRecyclerView; - @BindView(R.id.iv_delete) - ImageView iv_delete; - @BindView(R.id.iv_refresh) - ImageView iv_refresh; - @BindView(R.id.iv_back) - ImageView back; - - @OnClick({R.id.iv_back, R.id.iv_refresh, R.id.iv_delete}) - public void onClick(View view) { - switch (view.getId()) { - case R.id.iv_back: - finish(); - break; - case R.id.iv_refresh: - mPresenter.getDBList(); - break; - case R.id.iv_delete: - LogDBManager.getInstance().saveToFile(); - break; - default: - } - } - - private RequestLogPresenter mPresenter; - @Override public int getLayoutId() { return R.layout.activity_request_log; @@ -58,30 +28,48 @@ public class RequestLogActivity extends BaseMvpActivity implements RequestLogCon return true; } + @Override + protected void initDataBinding() { + mViewModel.setCtx(this); + mViewModel.setLifecycle(getLifecycleSubject()); + mViewModel.setVDBinding(mViewDataBinding); + mViewDataBinding.setClick(new BtnClick()); + } + @Override public void initView() { - ButterKnife.bind(this); - mPresenter = new RequestLogPresenter(this); - mPresenter.attachView(this); - mPresenter.setLifecycle(getLifecycleSubject()); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this)); + mViewDataBinding.recyclerview.setLayoutManager(new LinearLayoutManager(this)); mAdapter = new RequestLogAdapter(); - mRecyclerView.setAdapter(mAdapter); + mViewDataBinding.recyclerview.setAdapter(mAdapter); } @Override public void initData() { - mPresenter.getDBList(); - } - - @Override - public void setDBList(List logBeanList) { - mAdapter.setLogBeans(logBeanList); + mViewModel.getLogBeanListData().observe(this, new Observer>() { + @Override + public void onChanged(List logBeans) { + mAdapter.setLogBeans(logBeans); + } + }); + mViewModel.getDBList(); } @Override protected void onDestroy() { super.onDestroy(); - mPresenter.detachView(); + } + + public class BtnClick { + public void exit(View view) { + finish(); + } + + public void refresh(View view) { + mViewModel.getDBList(); + } + + public void delete(View view) { + LogDBManager.getInstance().saveToFile(); + } } } diff --git a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogContact.java b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogContact.java deleted file mode 100644 index e1d6e2f..0000000 --- a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogContact.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.aoleyun.sn.activity.requestlog; - -import com.aoleyun.sn.base.mvp.BasePresenter; -import com.aoleyun.sn.base.mvp.BaseView; -import com.aoleyun.sn.rlog.LogBean; - -import java.util.List; - -public class RequestLogContact { - public interface Presenter extends BasePresenter { - void getDBList(); - } - - public interface MainView extends BaseView { - void setDBList(List logBeanList); - } -} diff --git a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogPresenter.java b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogPresenter.java deleted file mode 100644 index 6c73689..0000000 --- a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogPresenter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.aoleyun.sn.activity.requestlog; - -import android.content.Context; - -import androidx.annotation.NonNull; - -import com.aoleyun.sn.rlog.LogDBManager; -import com.trello.rxlifecycle4.android.ActivityEvent; - -import io.reactivex.rxjava3.subjects.BehaviorSubject; - -public class RequestLogPresenter implements RequestLogContact.Presenter { - private static final String TAG = RequestLogPresenter.class.getSimpleName(); - private RequestLogContact.MainView mView; - private Context mContext; - - private BehaviorSubject lifecycle; - - - public void setLifecycle(BehaviorSubject lifecycle) { - this.lifecycle = lifecycle; - } - - public BehaviorSubject getLifecycle() { - return lifecycle; - } - - - public RequestLogPresenter(Context context) { - this.mContext = context; - } - - @Override - public void getDBList() { - mView.setDBList(LogDBManager.getInstance().getLogList()); - } - - @Override - public void attachView(@NonNull RequestLogContact.MainView view) { - this.mView = view; - } - - @Override - public void detachView() { - this.mView = null; - } -} diff --git a/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogViewModel.java b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogViewModel.java new file mode 100644 index 0000000..b23baf7 --- /dev/null +++ b/app/src/main/java/com/aoleyun/sn/activity/requestlog/RequestLogViewModel.java @@ -0,0 +1,34 @@ +package com.aoleyun.sn.activity.requestlog; + +import androidx.lifecycle.MutableLiveData; + +import com.aoleyun.sn.base.mvvm.BaseViewModel; +import com.aoleyun.sn.databinding.ActivityRequestLogBinding; +import com.aoleyun.sn.rlog.LogBean; +import com.aoleyun.sn.rlog.LogDBManager; +import com.trello.rxlifecycle4.android.ActivityEvent; + +import java.util.List; + +public class RequestLogViewModel extends BaseViewModel { + + @Override + public ActivityRequestLogBinding getVDBinding() { + return binding; + } + + @Override + public void onDestroy() { + + } + + private MutableLiveData> mLogBeanListData =new MutableLiveData<>(); + + public MutableLiveData> getLogBeanListData() { + return mLogBeanListData; + } + + public void getDBList(){ + mLogBeanListData.setValue(LogDBManager.getInstance().getLogList()); + } +} diff --git a/app/src/main/java/com/aoleyun/sn/activity/update/UpdateActivity.java b/app/src/main/java/com/aoleyun/sn/activity/update/UpdateActivity.java index 47c1e51..588bf63 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/update/UpdateActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/update/UpdateActivity.java @@ -6,37 +6,21 @@ import android.content.Intent; import android.content.IntentFilter; import android.util.Log; import android.view.View; -import android.widget.ImageView; -import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.lifecycle.Observer; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.aoleyun.sn.R; import com.aoleyun.sn.adapter.AppUpdateAdapter; -import com.aoleyun.sn.base.mvp.BaseMvpActivity; +import com.aoleyun.sn.base.mvvm.BaseMvvmActivity; import com.aoleyun.sn.bean.AppUpdateInfo; +import com.aoleyun.sn.databinding.ActivityUpdateBinding; import java.util.List; -import butterknife.BindView; -import butterknife.ButterKnife; +public class UpdateActivity extends BaseMvvmActivity { + private static final String TAG = "UpdateActivity"; -public class UpdateActivity extends BaseMvpActivity implements UpdateContact.UpdateView { - - private static final String TAG = UpdateActivity.class.getSimpleName(); - @BindView(R.id.root) - ConstraintLayout root; - @BindView(R.id.main) - ConstraintLayout main; - @BindView(R.id.iv_back) - ImageView iv_back; - @BindView(R.id.cl_nodata) - ConstraintLayout cl_nodata; - @BindView(R.id.recyclerView) - RecyclerView recyclerView; - - private UpdatePresenter mPresenter; private AppUpdateAdapter mAppUpdateAdapter; @Override @@ -49,63 +33,48 @@ public class UpdateActivity extends BaseMvpActivity implements UpdateContact.Upd return true; } + @Override + protected void initDataBinding() { + mViewModel.setCtx(this); + mViewModel.setLifecycle(getLifecycleSubject()); + mViewModel.setVDBinding(mViewDataBinding); + mViewDataBinding.setClick(new BtnClick()); + } + @Override public void initView() { - ButterKnife.bind(this); - mPresenter = new UpdatePresenter(this); - mPresenter.attachView(this); - mPresenter.setLifecycle(getLifecycleSubject()); - mAppUpdateAdapter = new AppUpdateAdapter(); - recyclerView.setLayoutManager(new LinearLayoutManager(UpdateActivity.this)); - recyclerView.setAdapter(mAppUpdateAdapter); - root.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }); - main.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - - } - }); - iv_back.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }); + mViewDataBinding.recyclerView.setLayoutManager(new LinearLayoutManager(UpdateActivity.this)); + mViewDataBinding.recyclerView.setAdapter(mAppUpdateAdapter); } @Override public void initData() { + mViewModel.getAppUpdateInfoListData().observe(this, new Observer>() { + @Override + public void onChanged(List appUpdateInfos) { + if (appUpdateInfos == null || appUpdateInfos.size() == 0) { + mViewDataBinding.clNodata.setVisibility(View.VISIBLE); + mViewDataBinding.recyclerView.setVisibility(View.GONE); + } else { + mViewDataBinding.clNodata.setVisibility(View.GONE); + mViewDataBinding.recyclerView.setVisibility(View.VISIBLE); + mAppUpdateAdapter.setAppInfoList(appUpdateInfos); + } + } + }); + mViewModel.checkAllAppUpdate(); registmNewAppReceiver(); - mPresenter.checkAllAppUpdate(); } @Override protected void onDestroy() { super.onDestroy(); - mPresenter.detachView(); if (mNewAppReceiver != null) { unregisterReceiver(mNewAppReceiver); } } - @Override - public void onAppUpdate(List updateApp) { - if (updateApp == null || updateApp.size() == 0) { - cl_nodata.setVisibility(View.VISIBLE); - recyclerView.setVisibility(View.GONE); - } else { - cl_nodata.setVisibility(View.GONE); - recyclerView.setVisibility(View.VISIBLE); - mAppUpdateAdapter.setAppInfoList(updateApp); - } - } - private void registmNewAppReceiver() { mNewAppReceiver = new NewAppReceiver(); IntentFilter filter = new IntentFilter(); @@ -134,4 +103,15 @@ public class UpdateActivity extends BaseMvpActivity implements UpdateContact.Upd } } } + + + public class BtnClick { + public void exit(View view) { + finish(); + } + + public void empty(View view) { + + } + } } diff --git a/app/src/main/java/com/aoleyun/sn/activity/update/UpdateContact.java b/app/src/main/java/com/aoleyun/sn/activity/update/UpdateContact.java deleted file mode 100644 index 9d185bb..0000000 --- a/app/src/main/java/com/aoleyun/sn/activity/update/UpdateContact.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.aoleyun.sn.activity.update; - -import com.aoleyun.sn.base.mvp.BasePresenter; -import com.aoleyun.sn.base.mvp.BaseView; -import com.aoleyun.sn.bean.AppUpdateInfo; - -import java.util.List; - -public class UpdateContact { - interface Presenter extends BasePresenter { - /*获取所有更新*/ - void checkAllAppUpdate(); - } - - - public interface UpdateView extends BaseView { - void onAppUpdate(List updateApp); - } -} diff --git a/app/src/main/java/com/aoleyun/sn/activity/update/UpdatePresenter.java b/app/src/main/java/com/aoleyun/sn/activity/update/UpdatePresenter.java deleted file mode 100644 index a66b284..0000000 --- a/app/src/main/java/com/aoleyun/sn/activity/update/UpdatePresenter.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.aoleyun.sn.activity.update; - -import android.content.Context; - -import com.aoleyun.sn.bean.AppUpdateInfo; -import com.aoleyun.sn.network.NetInterfaceManager; -import com.trello.rxlifecycle4.android.ActivityEvent; - -import java.util.List; - -import io.reactivex.rxjava3.subjects.BehaviorSubject; - -public class UpdatePresenter implements UpdateContact.Presenter { - private Context mContext; - - UpdatePresenter(Context context) { - this.mContext = context; - } - - private UpdateContact.UpdateView mView; - - private BehaviorSubject lifecycle; - - public void setLifecycle(BehaviorSubject lifecycle) { - this.lifecycle = lifecycle; - } - - public BehaviorSubject getLifecycle() { - return lifecycle; - } - - @Override - public void attachView(UpdateContact.UpdateView view) { - this.mView = view; - } - - @Override - public void detachView() { - this.mView = null; - } - - @Override - public void checkAllAppUpdate() { - NetInterfaceManager.getInstance().checkAoleyunUpdate( getLifecycle(), new NetInterfaceManager.UpdateCallback() { - @Override - public void onUpdate(List appUpdateInfos) { - mView.onAppUpdate(appUpdateInfos); - } - }); - } - -} diff --git a/app/src/main/java/com/aoleyun/sn/activity/update/UpdateViewModel.java b/app/src/main/java/com/aoleyun/sn/activity/update/UpdateViewModel.java new file mode 100644 index 0000000..f4336e0 --- /dev/null +++ b/app/src/main/java/com/aoleyun/sn/activity/update/UpdateViewModel.java @@ -0,0 +1,39 @@ +package com.aoleyun.sn.activity.update; + +import androidx.lifecycle.MutableLiveData; + +import com.aoleyun.sn.base.mvvm.BaseViewModel; +import com.aoleyun.sn.bean.AppUpdateInfo; +import com.aoleyun.sn.databinding.ActivityUpdateBinding; +import com.aoleyun.sn.network.NetInterfaceManager; +import com.trello.rxlifecycle4.android.ActivityEvent; + +import java.util.List; + +public class UpdateViewModel extends BaseViewModel { + + @Override + public ActivityUpdateBinding getVDBinding() { + return binding; + } + + @Override + public void onDestroy() { + + } + + private MutableLiveData> mAppUpdateInfoListData = new MutableLiveData<>(); + + public MutableLiveData> getAppUpdateInfoListData() { + return mAppUpdateInfoListData; + } + + public void checkAllAppUpdate() { + NetInterfaceManager.getInstance().checkAoleyunUpdate(getLifecycle(), new NetInterfaceManager.UpdateCallback() { + @Override + public void onUpdate(List appUpdateInfos) { + mAppUpdateInfoListData.setValue(appUpdateInfos); + } + }); + } +} diff --git a/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java b/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java index 0fc7cca..e1415ab 100644 --- a/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java +++ b/app/src/main/java/com/aoleyun/sn/adapter/AppUpdateAdapter.java @@ -32,7 +32,7 @@ import com.hjq.toast.Toaster; import java.util.List; public class AppUpdateAdapter extends RecyclerView.Adapter { - private static final String TAG = AppUpdateAdapter.class.getSimpleName(); + private static final String TAG = "AppUpdateAdapter"; private Context mContext; private List mAppInfoList; diff --git a/app/src/main/java/com/aoleyun/sn/base/BaseApplication.java b/app/src/main/java/com/aoleyun/sn/base/BaseApplication.java index 0de8165..9998b00 100644 --- a/app/src/main/java/com/aoleyun/sn/base/BaseApplication.java +++ b/app/src/main/java/com/aoleyun/sn/base/BaseApplication.java @@ -36,7 +36,7 @@ import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; public class BaseApplication extends MultiDexApplication { - private static final String TAG = BaseApplication.class.getSimpleName(); + private static final String TAG = "BaseApplication"; @Override public void onCreate() { @@ -89,6 +89,7 @@ public class BaseApplication extends MultiDexApplication { public void uncaughtException(Thread t, Throwable e) { Log.e("捕获异常子线程:", Thread.currentThread().getName() + "在:" + e.getStackTrace()[0].getClassName()); + e.printStackTrace(); } } ); diff --git a/app/src/main/java/com/aoleyun/sn/base/mvvm/BaseMvvmActivity.java b/app/src/main/java/com/aoleyun/sn/base/mvvm/BaseMvvmActivity.java index 77c2b33..a23c9f8 100644 --- a/app/src/main/java/com/aoleyun/sn/base/mvvm/BaseMvvmActivity.java +++ b/app/src/main/java/com/aoleyun/sn/base/mvvm/BaseMvvmActivity.java @@ -15,8 +15,7 @@ import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; public abstract class BaseMvvmActivity extends BaseTransparentActivity { - - private static final String TAG = BaseMvvmActivity.class.getSimpleName(); + private static final String TAG = "BaseMvvmActivity"; protected VM mViewModel; protected VDB mViewDataBinding; diff --git a/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java b/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java index 77d686e..78f39c2 100644 --- a/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java +++ b/app/src/main/java/com/aoleyun/sn/comm/CommonConfig.java @@ -100,6 +100,8 @@ public class CommonConfig { public final static String AOLE_ACTION_APP_FORBID = "aole_app_forbid"; /*强制安装应用，禁止卸载*/ public final static String AOLE_ACTION_FORCE_APP = "aole_force_app"; + /*指定应用安装源 非指定包名不能安装apk*/ + public static final String APP_SOURCE_WHITE_LIST = "app_source_white_list"; /*应用ID管控*/ public final static String AOLE_ACTION_APP_FORBID_ID = "aole_app_forbid_id"; diff --git a/app/src/main/java/com/aoleyun/sn/disklrucache/CacheHelper.java b/app/src/main/java/com/aoleyun/sn/disklrucache/CacheHelper.java index 347b89d..d07d112 100644 --- a/app/src/main/java/com/aoleyun/sn/disklrucache/CacheHelper.java +++ b/app/src/main/java/com/aoleyun/sn/disklrucache/CacheHelper.java @@ -30,7 +30,7 @@ import java.io.Serializable; * 磁盘缓存帮助类 */ public class CacheHelper { - private static final String TAG = CacheHelper.class.getSimpleName(); + private static final String TAG = "CacheHelper"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); diff --git a/app/src/main/java/com/aoleyun/sn/hook/AoleyunActivityController.java b/app/src/main/java/com/aoleyun/sn/hook/AoleyunActivityController.java index 10a31c1..3361097 100644 --- a/app/src/main/java/com/aoleyun/sn/hook/AoleyunActivityController.java +++ b/app/src/main/java/com/aoleyun/sn/hook/AoleyunActivityController.java @@ -9,7 +9,7 @@ import com.aoleyun.sn.utils.JGYUtils; import com.tencent.mmkv.MMKV; public class AoleyunActivityController extends IActivityController.Stub { - private static final String TAG = AoleyunActivityController.class.getSimpleName(); + private static final String TAG = "AoleyunActivityController"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); @Override diff --git a/app/src/main/java/com/aoleyun/sn/manager/ConnectManager.java b/app/src/main/java/com/aoleyun/sn/manager/ConnectManager.java index 730c76d..c93dfaf 100644 --- a/app/src/main/java/com/aoleyun/sn/manager/ConnectManager.java +++ b/app/src/main/java/com/aoleyun/sn/manager/ConnectManager.java @@ -8,7 +8,7 @@ import com.aoleyun.sn.comm.CommonConfig; import com.tencent.mmkv.MMKV; public class ConnectManager { - private static final String TAG = ConnectManager.class.getSimpleName(); + private static final String TAG = "ConnectManager"; public static final long ONE_MILLISECOND = 1000; public static final long ONE_MINUTES_TIME = 60 * ONE_MILLISECOND; diff --git a/app/src/main/java/com/aoleyun/sn/manager/MapManager.java b/app/src/main/java/com/aoleyun/sn/manager/MapManager.java index 9e616b8..baabc3c 100644 --- a/app/src/main/java/com/aoleyun/sn/manager/MapManager.java +++ b/app/src/main/java/com/aoleyun/sn/manager/MapManager.java @@ -12,7 +12,7 @@ import com.baidu.location.LocationClient; import com.baidu.location.LocationClientOption; public class MapManager { - private String TAG = MapManager.class.getSimpleName(); + private String TAG = "MapManager"; @SuppressLint("StaticFieldLeak") private static MapManager sInstance; diff --git a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java index 8eb2736..eacf803 100644 --- a/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java @@ -198,7 +198,7 @@ import retrofit2.converter.gson.GsonConverterFactory; import static com.google.gson.JsonParser.parseString; public class NetInterfaceManager { - private static final String TAG = NetInterfaceManager.class.getSimpleName(); + private static final String TAG = "NetInterfaceManager"; @SuppressLint("StaticFieldLeak") private static NetInterfaceManager INSTANCE; diff --git a/app/src/main/java/com/aoleyun/sn/network/RetryCallback.java b/app/src/main/java/com/aoleyun/sn/network/RetryCallback.java index 2577938..0a7c236 100644 --- a/app/src/main/java/com/aoleyun/sn/network/RetryCallback.java +++ b/app/src/main/java/com/aoleyun/sn/network/RetryCallback.java @@ -12,7 +12,7 @@ import retrofit2.Response; public abstract class RetryCallback implements Callback { - private static final String TAG = RetryCallback.class.getSimpleName(); + private static final String TAG = "RetryCallback"; private int mRetryCount; private long mRetryInterval; diff --git a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java index 0b4a1af..a4eeca8 100644 --- a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java @@ -22,7 +22,7 @@ import okio.Buffer; * v1.0 2022-07-15 16:16:52 */ public class RepeatRequestInterceptor implements Interceptor { - private static final String TAG = RepeatRequestInterceptor.class.getSimpleName(); + private static final String TAG = "RepeatRequestInterceptor"; private final ConcurrentHashMap requestIdsMap = new ConcurrentHashMap<>(); public static final String REPEAT_REQUEST_PROTOCOL = "OKHTTP_REPEAT_REQUEST_PROTOCOL"; diff --git a/app/src/main/java/com/aoleyun/sn/push/PushManager.java b/app/src/main/java/com/aoleyun/sn/push/PushManager.java index c5ad497..d36285e 100644 --- a/app/src/main/java/com/aoleyun/sn/push/PushManager.java +++ b/app/src/main/java/com/aoleyun/sn/push/PushManager.java @@ -92,7 +92,7 @@ import retrofit2.Call; import retrofit2.Response; public class PushManager { - private static final String TAG = PushManager.class.getSimpleName(); + private static final String TAG = "PushManager"; public static final String ACTION_REFRESH_BINDING_STATUS = "RefreshBindingStatus"; public static final String AOLEYUN_REFRESH_DESKTOP = "aoleyun_refresh_desktop_action"; @@ -248,6 +248,8 @@ public class PushManager { /*绑定设备*/ private static final String BIND_DEVICE = "71"; + /*文件分享*/ + private static final String FILE_DISTRIBUTE = "72"; /*打开应用*/ private static final String OPEN_APK = "73"; /*全局黑名单*/ @@ -650,6 +652,9 @@ public class PushManager { case BIND_DEVICE: bindService(extras); break; + case FILE_DISTRIBUTE: + ApkUtils.openPackage(mContext, "com.uiui.filecloud"); + break; case OPEN_APK: openApk(extras); break; diff --git a/app/src/main/java/com/aoleyun/sn/push/alipush/AliMessageIntentService.java b/app/src/main/java/com/aoleyun/sn/push/alipush/AliMessageIntentService.java index 7d22924..1c85fac 100644 --- a/app/src/main/java/com/aoleyun/sn/push/alipush/AliMessageIntentService.java +++ b/app/src/main/java/com/aoleyun/sn/push/alipush/AliMessageIntentService.java @@ -18,7 +18,7 @@ import java.util.Map; */ public class AliMessageIntentService extends AliyunMessageIntentService { - private static final String TAG = AliyunMessageIntentService.class.getSimpleName(); + private static final String TAG = "AliyunMessageIntentService"; /** * 推送通知的回调方法 diff --git a/app/src/main/java/com/aoleyun/sn/push/alipush/AliyunMessageReceiver.java b/app/src/main/java/com/aoleyun/sn/push/alipush/AliyunMessageReceiver.java index 3ced65b..71bb854 100644 --- a/app/src/main/java/com/aoleyun/sn/push/alipush/AliyunMessageReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/push/alipush/AliyunMessageReceiver.java @@ -19,7 +19,7 @@ import java.util.Map; */ public class AliyunMessageReceiver extends MessageReceiver { // 消息接收部分的LOG_TAG - public static final String TAG = AliyunMessageReceiver.class.getSimpleName(); + public static final String TAG = "AliyunMessageReceiver"; /** * 推送通知的回调方法 diff --git a/app/src/main/java/com/aoleyun/sn/receiver/BootReceiver.java b/app/src/main/java/com/aoleyun/sn/receiver/BootReceiver.java index 24dd341..950ca49 100644 --- a/app/src/main/java/com/aoleyun/sn/receiver/BootReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/receiver/BootReceiver.java @@ -22,7 +22,7 @@ import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; public class BootReceiver extends BroadcastReceiver { - private static String TAG = BootReceiver.class.getSimpleName() + ":aoleyunsn"; + private static String TAG = "BootReceiver" + ":aoleyunsn"; public static final String BOOT_COMPLETED = "aoleyun.intent.action.BOOT_COMPLETED"; static { diff --git a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java index 65aac1a..5ddcf70 100644 --- a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java @@ -23,7 +23,7 @@ import io.reactivex.rxjava3.core.Observer; import io.reactivex.rxjava3.disposables.Disposable; public class NewAppReceiver extends BroadcastReceiver { - private static final String TAG = NewAppReceiver.class.getSimpleName(); + private static final String TAG = "NewAppReceiver"; private static NewAppListener newAppListener; private static LauncherListener launcherListener; diff --git a/app/src/main/java/com/aoleyun/sn/rlog/LogDBManager.java b/app/src/main/java/com/aoleyun/sn/rlog/LogDBManager.java index 6054ba4..19423d8 100644 --- a/app/src/main/java/com/aoleyun/sn/rlog/LogDBManager.java +++ b/app/src/main/java/com/aoleyun/sn/rlog/LogDBManager.java @@ -28,7 +28,7 @@ public class LogDBManager { private LogDBHelper mDBHelper; private static final String TABLE_NAME = "logtable"; - private static String TAG = LogDBManager.class.getSimpleName(); + private static String TAG = "LogDBManager"; private LogDBManager(Context context) { if (context == null) { diff --git a/app/src/main/java/com/aoleyun/sn/service/GuardService.java b/app/src/main/java/com/aoleyun/sn/service/GuardService.java index 2184687..a9f223d 100644 --- a/app/src/main/java/com/aoleyun/sn/service/GuardService.java +++ b/app/src/main/java/com/aoleyun/sn/service/GuardService.java @@ -108,7 +108,7 @@ import static android.os.BatteryManager.EXTRA_VOLTAGE; * @time Created by 2018/8/17 11:27 */ public class GuardService extends Service { - private final static String TAG = GuardService.class.getSimpleName(); + private final static String TAG = "GuardService"; private ServiceConnection mServiceConnection = new ServiceConnection() { @Override diff --git a/app/src/main/java/com/aoleyun/sn/service/LogcatService.java b/app/src/main/java/com/aoleyun/sn/service/LogcatService.java index 72f1334..89aa6c9 100644 --- a/app/src/main/java/com/aoleyun/sn/service/LogcatService.java +++ b/app/src/main/java/com/aoleyun/sn/service/LogcatService.java @@ -35,7 +35,7 @@ import okhttp3.RequestBody; public class LogcatService extends Service { public final static String LOGCAT_START_ACTION = "START"; public final static String LOGCAT_STOP_ACTION = "STOP"; - private String TAG = LogcatService.class.getSimpleName(); + private String TAG = "LogcatService"; public LogcatService() { diff --git a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java index 1d0a600..8301090 100644 --- a/app/src/main/java/com/aoleyun/sn/service/RemoteService.java +++ b/app/src/main/java/com/aoleyun/sn/service/RemoteService.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; public class RemoteService extends Service { - private String TAG = RemoteService.class.getSimpleName(); + private String TAG = "RemoteService"; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); diff --git a/app/src/main/java/com/aoleyun/sn/service/StepService.java b/app/src/main/java/com/aoleyun/sn/service/StepService.java index 9159080..37be178 100644 --- a/app/src/main/java/com/aoleyun/sn/service/StepService.java +++ b/app/src/main/java/com/aoleyun/sn/service/StepService.java @@ -35,7 +35,7 @@ import java.net.URI; * @time Created by 2018/8/17 11:26 */ public class StepService extends Service implements NetworkUtils.OnNetworkStatusChangedListener { - private final static String TAG = StepService.class.getSimpleName(); + private final static String TAG = "StepService"; public JWebSocketClient client; private JWebSocketClientBinder mBinder = new JWebSocketClientBinder(); diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java index 2ac1b58..64a4722 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainSPresenter.java @@ -46,7 +46,7 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject; * @author jgy02 */ public class MainSPresenter implements MainSContact.Presenter { - private static final String TAG = MainSPresenter.class.getSimpleName(); + private static final String TAG = "MainSPresenter"; private MainSContact.MainView mView; private Context mContext; diff --git a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java index ce2220f..30ee698 100644 --- a/app/src/main/java/com/aoleyun/sn/service/main/MainService.java +++ b/app/src/main/java/com/aoleyun/sn/service/main/MainService.java @@ -88,7 +88,7 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.subjects.BehaviorSubject; public class MainService extends Service implements MainSContact.MainView, NetworkUtils.OnNetworkStatusChangedListener, LifecycleProvider { - private static final String TAG = MainService.class.getSimpleName(); + private static final String TAG = "MainService"; public MainSPresenter mPresenter; private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE); diff --git a/app/src/main/java/com/aoleyun/sn/utils/AES/AESEncrypt.java b/app/src/main/java/com/aoleyun/sn/utils/AES/AESEncrypt.java index 74278b4..a7cc9c6 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/AES/AESEncrypt.java +++ b/app/src/main/java/com/aoleyun/sn/utils/AES/AESEncrypt.java @@ -13,7 +13,7 @@ import javax.crypto.spec.SecretKeySpec; */ public class AESEncrypt { - private static final String TAG = AESEncrypt.class.getSimpleName() + " --> "; + private static final String TAG = "AESEncrypt" + " --> "; /** * 加密算法 diff --git a/app/src/main/java/com/aoleyun/sn/utils/AES/AesCbcWithIntegrity.java b/app/src/main/java/com/aoleyun/sn/utils/AES/AesCbcWithIntegrity.java index 101adb1..e1de727 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/AES/AesCbcWithIntegrity.java +++ b/app/src/main/java/com/aoleyun/sn/utils/AES/AesCbcWithIntegrity.java @@ -671,7 +671,7 @@ public class AesCbcWithIntegrity { } } catch (Exception e) { if (ALLOW_BROKEN_PRNG) { - Log.w(PrngFixes.class.getSimpleName(), "Failed to seed OpenSSL PRNG", e); + Log.w("PrngFixes", "Failed to seed OpenSSL PRNG", e); } else { throw new SecurityException("Failed to seed OpenSSL PRNG", e); } @@ -714,7 +714,7 @@ public class AesCbcWithIntegrity { SecureRandom rng1 = new SecureRandom(); if (!rng1.getProvider().getClass().getSimpleName().equals("LinuxPRNGSecureRandomProvider")) { if (ALLOW_BROKEN_PRNG) { - Log.w(PrngFixes.class.getSimpleName(), + Log.w("PrngFixes", "new SecureRandom() backed by wrong Provider: " + rng1.getProvider().getClass()); return; } else { @@ -728,7 +728,7 @@ public class AesCbcWithIntegrity { rng2 = SecureRandom.getInstance("SHA1PRNG"); } catch (NoSuchAlgorithmException e) { if (ALLOW_BROKEN_PRNG) { - Log.w(PrngFixes.class.getSimpleName(), "SHA1PRNG not available", e); + Log.w("PrngFixes", "SHA1PRNG not available", e); return; } else { new SecurityException("SHA1PRNG not available", e); @@ -736,7 +736,7 @@ public class AesCbcWithIntegrity { } if (!rng2.getProvider().getClass().getSimpleName().equals("LinuxPRNGSecureRandomProvider")) { if (ALLOW_BROKEN_PRNG) { - Log.w(PrngFixes.class.getSimpleName(), + Log.w("PrngFixes", "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong" + " Provider: " + rng2.getProvider().getClass()); return; @@ -824,7 +824,7 @@ public class AesCbcWithIntegrity { } catch (IOException e) { // On a small fraction of devices /dev/urandom is not // writable Log and ignore. - Log.w(PrngFixes.class.getSimpleName(), "Failed to mix seed into " + Log.w("PrngFixes", "Failed to mix seed into " + URANDOM_FILE); } finally { mSeeded = true; diff --git a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java index a74de8c..593afff 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java @@ -66,7 +66,7 @@ import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; public class ApkUtils { - private static final String TAG = ApkUtils.class.getSimpleName(); + private static final String TAG = "ApkUtils"; public static final Set aoleyunAPP = new HashSet() {{ this.add(BuildConfig.APPLICATION_ID); diff --git a/app/src/main/java/com/aoleyun/sn/utils/AppUtil.java b/app/src/main/java/com/aoleyun/sn/utils/AppUtil.java index 53f795d..12ffb5e 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/AppUtil.java +++ b/app/src/main/java/com/aoleyun/sn/utils/AppUtil.java @@ -24,7 +24,7 @@ import java.io.BufferedReader; import java.io.FileReader; public class AppUtil { - private static String TAG = AppUtil.class.getSimpleName(); + private static String TAG = "AppUtil"; /** * 描述：获取可用内存. diff --git a/app/src/main/java/com/aoleyun/sn/utils/BootManager.java b/app/src/main/java/com/aoleyun/sn/utils/BootManager.java index e49ca9f..26a23fc 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/BootManager.java +++ b/app/src/main/java/com/aoleyun/sn/utils/BootManager.java @@ -10,7 +10,7 @@ import com.aoleyun.sn.service.main.MainService; public class BootManager { private Context mContext; - private final static String TAG = BootManager.class.getSimpleName(); + private final static String TAG = "BootManager"; public BootManager(Context context) { this.mContext = context; diff --git a/app/src/main/java/com/aoleyun/sn/utils/CacheUtils.java b/app/src/main/java/com/aoleyun/sn/utils/CacheUtils.java index 531ad33..96eca08 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/CacheUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/CacheUtils.java @@ -15,7 +15,7 @@ import java.lang.reflect.Method; public class CacheUtils { - private static final String TAG = CacheUtils.class.getSimpleName(); + private static final String TAG = "CacheUtils"; private final long MAX_WAIT_TIME = 60 * 1000; private final long WAIT_TIME_INCR = 10 * 1000; diff --git a/app/src/main/java/com/aoleyun/sn/utils/Camera2BackgroundUtil.java b/app/src/main/java/com/aoleyun/sn/utils/Camera2BackgroundUtil.java index e6e578c..e176092 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Camera2BackgroundUtil.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Camera2BackgroundUtil.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; * @描述 */ public class Camera2BackgroundUtil { - private static final String TAG = Camera2BackgroundUtil.class.getSimpleName(); + private static final String TAG = "Camera2BackgroundUtil"; private Context context; private CameraCallBack cameraCallBack; diff --git a/app/src/main/java/com/aoleyun/sn/utils/ForegroundAppUtil.java b/app/src/main/java/com/aoleyun/sn/utils/ForegroundAppUtil.java index 2916a90..8f926dc 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ForegroundAppUtil.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ForegroundAppUtil.java @@ -19,7 +19,7 @@ public class ForegroundAppUtil { private static final long START_TIME = END_TIME - TIME_INTERVAL; public static final String TOPAPP_KEY = "TOP_ALWAYS_SHOW_APP_NAME"; - private static String TAG = ForegroundAppUtil.class.getSimpleName(); + private static String TAG = "ForegroundAppUtil"; public static String getForegroundPackageName(Context context) { //系统应用可以直接获取 diff --git a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java index 9a66b68..036a112 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java @@ -111,7 +111,7 @@ import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; public class JGYUtils { - private static final String TAG = JGYUtils.class.getSimpleName(); + private static final String TAG = "JGYUtils"; /*九学王*/ public static final String JXW_LAUNCHER_PACKAGE_NAME = "com.jxw.launcher"; @@ -1304,9 +1304,9 @@ public class JGYUtils { pkgSet.addAll(ApkUtils.desktopAPP); pkgSet.addAll(ApkUtils.aoleyunAPP); pkgSet.addAll(ApkUtils.mJxwApp); - - if ("AS001".equals(Build.MODEL)) { + if ("K101".equals(Build.MODEL)||"AS001".equals(Build.MODEL)) { pkgSet.addAll(ApkUtils.aihuaApp); + pkgSet.addAll(aihuaAppList); } if ("D1".equals(Build.MODEL)) { pkgSet.addAll(ApkUtils.dongwa); @@ -1668,7 +1668,9 @@ public class JGYUtils { this.add("com.aoleyunos.dop1"); this.add("com.aoleyunos.dop2"); this.add("com.aoleyunos.dop3"); + }}; + HashSet aihuaAppList = new HashSet() {{ //aihua this.add("com.android.mms"); this.add("com.android.fmradio"); @@ -1684,10 +1686,11 @@ public class JGYUtils { this.add("com.tongyi.aistudent"); }}; - /** - * 隐藏系统所有应用 - * 除了设置，图库、视频、设置、文件管理器、通话、短信、日历、时钟、计算器 - */ + + /** + * 隐藏系统所有应用 + * 除了设置，图库、视频、设置、文件管理器、通话、短信、日历、时钟、计算器 + */ public void hideSystemAPP() { PackageManager pm = mContext.getPackageManager(); try { diff --git a/app/src/main/java/com/aoleyun/sn/utils/NetworkUtils.java b/app/src/main/java/com/aoleyun/sn/utils/NetworkUtils.java index 2a2d440..1c30b00 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/NetworkUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/NetworkUtils.java @@ -15,7 +15,7 @@ import android.util.Log; * @author fanhuitong */ public class NetworkUtils { - private static String TAG = NetworkUtils.class.getSimpleName(); + private static String TAG = "NetworkUtils"; /** * 网络是否连接 diff --git a/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java index 2f61bbe..7a11de1 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ServiceAliveUtils.java @@ -5,7 +5,7 @@ import android.content.Context; import android.util.Log; public class ServiceAliveUtils { - private static final String TAG = ServiceAliveUtils.class.getSimpleName(); + private static final String TAG = "ServiceAliveUtils"; public static boolean isServiceAlive(Context mContext) { boolean isServiceRunning = false; diff --git a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java index e0bfd8f..2073520 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -32,7 +32,7 @@ import java.util.List; public class SysSettingUtils { - private static final String TAG = SysSettingUtils.class.getSimpleName(); + private static final String TAG = "SysSettingUtils"; public SysSettingUtils() { @@ -390,9 +390,12 @@ public class SysSettingUtils { } - int old_setting_bht = Settings.System.getInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHT_FORBID_ON, 1); - int old_setting_bluetooth = Settings.System.getInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_BT_FORBID_ON, 1); - int old_setting_bhtvideo = mmkv.decodeInt(CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, 1); + int old_setting_bht = Settings.System.getInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_BHT_FORBID_ON, 0); + Log.e(TAG, "setBluetooth: old_setting_bht = " + old_setting_bht); + int old_setting_bluetooth = Settings.System.getInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_BT_FORBID_ON, 0); + Log.e(TAG, "setBluetooth: old_setting_bluetooth = " + old_setting_bluetooth); + int old_setting_bhtvideo = mmkv.decodeInt(CommonConfig.AOLE_ACTION_BHTVIDEO_FORBID_ON, 0); + Log.e(TAG, "setBluetooth: old_setting_bhtvideo = " + old_setting_bhtvideo); if (old_setting_bht != setting_bht) { diff --git a/app/src/main/java/com/aoleyun/sn/utils/TimeUtils.java b/app/src/main/java/com/aoleyun/sn/utils/TimeUtils.java index 713b0bf..beb588e 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/TimeUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/TimeUtils.java @@ -31,7 +31,7 @@ import java.util.Date; * 时间管控工具类 */ public class TimeUtils { - private static final String TAG = TimeUtils.class.getSimpleName(); + private static final String TAG = "TimeUtils"; private static DateFormat df = new SimpleDateFormat("HH:mm"); public static final String START_TIME_KEY = "START_TIME"; public static final String END_TIME_KEY = "END_TIME"; diff --git a/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java b/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java index 8b5f61b..bfea513 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/URLUtils.java @@ -28,7 +28,7 @@ import okhttp3.Request; import okhttp3.Response; public class URLUtils { - private static final String TAG = URLUtils.class.getSimpleName(); + private static final String TAG = "URLUtils"; private Context mContext; private HashSet baseURLList = new HashSet<>(); private HashSet nohttpURLList = new HashSet<>(); diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index 024f2ec..f8e29b2 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -109,7 +109,7 @@ import static android.content.Context.WIFI_SERVICE; public class Utils { - private static String TAG = Utils.class.getSimpleName(); + private static String TAG = "Utils"; // MD5 设备地址标识 public static String getMAC(Context context) { diff --git a/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java b/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java index cd09878..e2dd155 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/WiFiUtils.java @@ -30,7 +30,7 @@ public class WiFiUtils { private static WifiManager mWifiManager; @SuppressLint("StaticFieldLeak") private Context mContext; - private static String TAG = WiFiUtils.class.getSimpleName(); + private static String TAG = "WiFiUtils"; public WiFiUtils(Context context) { this.mContext = context; diff --git a/app/src/main/java/com/aoleyun/sn/utils/XAPKUtils.java b/app/src/main/java/com/aoleyun/sn/utils/XAPKUtils.java index 4f5d764..3224e83 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/XAPKUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/XAPKUtils.java @@ -51,7 +51,7 @@ public class XAPKUtils { //https://www.jianshu.com/p/cd10d5278ebf?utm_campaign=hugo //https://www.jianshu.com/p/580b61ee7aee - private static final String TAG = XAPKUtils.class.getSimpleName(); + private static final String TAG = "XAPKUtils"; private static XAPKUtils sInstance; private Context mContext; diff --git a/app/src/main/res/layout-land/activity_request_log.xml b/app/src/main/res/layout-land/activity_request_log.xml index d3cc356..8a4ff8c 100644 --- a/app/src/main/res/layout-land/activity_request_log.xml +++ b/app/src/main/res/layout-land/activity_request_log.xml @@ -1,131 +1,145 @@ - + tools:context=".activity.requestlog.RequestLogActivity"> + + + + + + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent"> + + + - + diff --git a/app/src/main/res/layout-land/activity_update.xml b/app/src/main/res/layout-land/activity_update.xml deleted file mode 100644 index 7ea8b9b..0000000 --- a/app/src/main/res/layout-land/activity_update.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml index 0fce3d4..068c17d 100644 --- a/app/src/main/res/layout-port/activity_main.xml +++ b/app/src/main/res/layout-port/activity_main.xml @@ -577,8 +577,8 @@ - + tools:context=".activity.requestlog.RequestLogActivity"> + + + + + + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent"> + + + - + diff --git a/app/src/main/res/layout-port/activity_update.xml b/app/src/main/res/layout-port/activity_update.xml deleted file mode 100644 index 3177b58..0000000 --- a/app/src/main/res/layout-port/activity_update.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cleanup.xml b/app/src/main/res/layout/activity_cleanup.xml index ce2cb6a..481f41b 100644 --- a/app/src/main/res/layout/activity_cleanup.xml +++ b/app/src/main/res/layout/activity_cleanup.xml @@ -1,72 +1,79 @@ - + + + + + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_eye_protection.xml b/app/src/main/res/layout/activity_eye_protection.xml index 8e86dfd..ab50e54 100644 --- a/app/src/main/res/layout/activity_eye_protection.xml +++ b/app/src/main/res/layout/activity_eye_protection.xml @@ -1,284 +1,291 @@ - + + + + + android:layout_height="match_parent" + android:background="#1f2127"> - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + - - - - + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> - + android:layout_height="wrap_content" + android:orientation="vertical"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_update.xml b/app/src/main/res/layout/activity_update.xml index 3177b58..58b3004 100644 --- a/app/src/main/res/layout/activity_update.xml +++ b/app/src/main/res/layout/activity_update.xml @@ -1,96 +1,106 @@ - - + - - - - + + - - + android:layout_height="match_parent"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file