From d470a6f54aa2280f987179b977ceea30de9356ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 29 Oct 2023 17:37:59 +0900 Subject: [PATCH] =?UTF-8?q?v2.0.0=20=E6=AD=A3=E5=BC=8F=E7=89=88=E5=8F=91?= =?UTF-8?q?=E5=B8=83!=20=E6=96=B0=E5=A2=9E=201.=20=E6=BC=AB=E7=94=BB?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=A1=B5=E9=80=80=E5=87=BA=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=202.=20=E6=88=91=E7=9A=84=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=8F=8D=E8=BD=AC=E6=8E=92=E5=BA=8F=203.=20=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=A1=B5=20=E6=97=A5=E6=BC=AB/=E9=9F=A9=E6=BC=AB/=E7=BE=8E?= =?UTF-8?q?=E6=BC=AB/=E5=B7=B2=E5=AE=8C=E7=BB=93=20=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=204.=20=E6=8E=92=E8=A1=8C=E9=A1=B5=20?= =?UTF-8?q?=E7=94=B7=E9=A2=91/=E5=A5=B3=E9=A2=91=20=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=205.=20=E5=B7=B2=E5=AE=8C=E7=BB=93/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20=E6=A0=87=E7=AD=BE=206.=20Token=20=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=97=B6=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=207.=20=E6=88=91=E7=9A=84=E8=AE=A2=E9=98=85/=E6=BC=AB?= =?UTF-8?q?=E7=94=BB=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E8=AF=BB=E5=88=B0=E8=AE=B0=E5=BD=95=208.=20=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=A2=9E=E5=8A=A0=E6=9C=80=E6=96=B0=E8=AF=9D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=209.=20=E6=BC=AB=E7=94=BB=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=201.=20=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9B=9E=E5=88=B0=E6=9C=80=E5=BC=80=E5=A4=B4?= =?UTF-8?q?=202.=20=E6=96=AD=E7=BD=91=E6=97=B6=E6=97=A0=E6=B3=95=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E4=B8=8B=E8=BD=BD=20=E4=BC=98=E5=8C=96=201.=20?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E7=BF=BB=E9=A1=B5=E5=8A=A0=E8=BD=BD=E6=95=88?= =?UTF-8?q?=E7=8E=87=202.=20=E7=BD=91=E7=BB=9C=E5=8A=A0=E8=BD=BD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../top/fumiama/copymanga/MainActivity.kt | 2 +- .../fumiama/copymanga/tools/api/UITools.kt | 25 ++++++++++++------- .../fumiama/copymanga/ui/home/HomeFragment.kt | 12 ++++++--- .../top/fumiama/copymanga/ui/vm/VMHandler.kt | 2 +- .../copymanga/ui/vm/ViewMangaActivity.kt | 2 +- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/top/fumiama/copymanga/MainActivity.kt b/app/src/main/java/top/fumiama/copymanga/MainActivity.kt index 7ce7c32..fa59b26 100644 --- a/app/src/main/java/top/fumiama/copymanga/MainActivity.kt +++ b/app/src/main/java/top/fumiama/copymanga/MainActivity.kt @@ -64,7 +64,7 @@ class MainActivity : AppCompatActivity() { private lateinit var appBarConfiguration: AppBarConfiguration private lateinit var headPic: File - private lateinit var toolsBox: UITools + lateinit var toolsBox: UITools private var latestDestination = 0 private var isMenuWaiting = false diff --git a/app/src/main/java/top/fumiama/copymanga/tools/api/UITools.kt b/app/src/main/java/top/fumiama/copymanga/tools/api/UITools.kt index 53d5ddb..59f6f57 100644 --- a/app/src/main/java/top/fumiama/copymanga/tools/api/UITools.kt +++ b/app/src/main/java/top/fumiama/copymanga/tools/api/UITools.kt @@ -15,21 +15,28 @@ class UITools(that: Context?, w: WeakReference? = null) { private val zis = that private val weak = w constructor(w: WeakReference): this(w.get()?.applicationContext, w) - val netinfo: String + val transportStringNull = zis?.getString(R.string.TRANSPORT_NULL) ?: "TRANSPORT_NULL" + val transportStringError = zis?.getString(R.string.TRANSPORT_ERROR) ?: "TRANSPORT_ERROR" + val netInfo: String get() { val cm: ConnectivityManager = zis?.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager return cm.getNetworkCapabilities(cm.activeNetwork)?.let { when { - it.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> return@let "WIFI" - it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return@let "移动数据" - it.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE) -> return@let "WIFI_AWARE" - it.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> return@let "蓝牙" - it.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> return@let "以太网" - it.hasTransport(NetworkCapabilities.TRANSPORT_LOWPAN) -> return@let "LOWPAN" - else -> return@let "无网络" + it.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> return@let zis.getString( + R.string.TRANSPORT_WIFI) + it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return@let zis.getString( + R.string.TRANSPORT_CELLULAR) + it.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> return@let zis.getString( + R.string.TRANSPORT_BLUETOOTH) + it.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> return@let zis.getString( + R.string.TRANSPORT_ETHERNET) + it.hasTransport(NetworkCapabilities.TRANSPORT_LOWPAN) -> return@let zis.getString( + R.string.TRANSPORT_LOWPAN) + it.hasTransport(NetworkCapabilities.TRANSPORT_VPN) -> return@let "VPN" + else -> return@let transportStringNull } - } ?: "错误" + } ?: transportStringError } fun toastError(s: String, willFinish: Boolean = true) { Toast.makeText(zis, s, Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/top/fumiama/copymanga/ui/home/HomeFragment.kt b/app/src/main/java/top/fumiama/copymanga/ui/home/HomeFragment.kt index fa80cba..6a60145 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/home/HomeFragment.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/home/HomeFragment.kt @@ -135,10 +135,14 @@ class HomeFragment : NoBackRefreshFragment(R.layout.fragment_home) { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val l = MainActivity.member?.refreshAvatar() - if (l?.code != 200) { - MainActivity.member?.logout() - } + val tb = mainWeakReference?.get()?.toolsBox + val netInfo = tb?.netInfo + if(netInfo != null && netInfo != tb.transportStringNull && netInfo != tb.transportStringError)Thread { + val l = MainActivity.member?.refreshAvatar() + if (l?.code != 200) { + MainActivity.member?.logout() + } + }.start() homeHandler = HomeHandler(WeakReference(this)) } diff --git a/app/src/main/java/top/fumiama/copymanga/ui/vm/VMHandler.kt b/app/src/main/java/top/fumiama/copymanga/ui/vm/VMHandler.kt index 3b15541..6122756 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/vm/VMHandler.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/vm/VMHandler.kt @@ -113,7 +113,7 @@ class VMHandler(activity: ViewMangaActivity, url: String) : AutoDownloadHandler( } else { showInfCardFull(); true } - 22 -> wv.get()?.idtime?.text = SimpleDateFormat("HH:mm").format(Date()) + week + wv.get()?.toolsBox?.netinfo + 22 -> wv.get()?.idtime?.text = SimpleDateFormat("HH:mm").format(Date()) + week + wv.get()?.toolsBox?.netInfo } } override fun getGsonItem() = manga diff --git a/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt b/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt index 84f4a7c..3dbc37a 100644 --- a/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt +++ b/app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt @@ -258,7 +258,7 @@ class ViewMangaActivity : TitleActivityTemplate() { } private fun prepareImgFromWeb() { - if(!noCellarAlert && toolsBox.netinfo == "移动数据") alertCellar() + if(!noCellarAlert && toolsBox.netInfo == getString(R.string.TRANSPORT_CELLULAR)) alertCellar() else handler.startLoad() }