v2.0.0

正式版发布!
新增
1. 漫画下载页退出多选模式
2. 我的下载反转排序
3. 分类页 日漫/韩漫/美漫/已完结 筛选标签
4. 排行页 男频/女频 筛选菜单
5. 已完结/更新 标签
6. Token 失效时自动退出登录
7. 我的订阅/漫画详情增加云端读到记录
8. 浏览历史增加最新话提示
9. 漫画详情支持取消订阅
修复
1. 下拉刷新无法回到最开头
2. 断网时无法进入下载
优化
1. 卡片翻页加载效率
2. 网络加载逻辑

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

app/src/main/java/top/fumiama/copymanga/tools/api/UITools.kt

@@ -15,21 +15,28 @@ class UITools(that: Context?, w: WeakReference<Activity>? = null) {
     private val zis = that
     private val weak = w
     constructor(w: WeakReference<Activity>): 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_WIFI) -> return@let zis.getString(
-                    it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return@let "移动数据"
+                        R.string.TRANSPORT_WIFI)
-                    it.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE) -> return@let "WIFI_AWARE"
+                    it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> return@let zis.getString(
-                    it.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> return@let "蓝牙"
+                        R.string.TRANSPORT_CELLULAR)
-                    it.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> return@let "以太网"
+                    it.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) -> return@let zis.getString(
-                    it.hasTransport(NetworkCapabilities.TRANSPORT_LOWPAN) -> return@let "LOWPAN"
+                        R.string.TRANSPORT_BLUETOOTH)
-                    else -> return@let "无网络"
+                    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()

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()
+        val tb = mainWeakReference?.get()?.toolsBox
-        if (l?.code != 200) {
+        val netInfo = tb?.netInfo
-            MainActivity.member?.logout()
+        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))
     }
 

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

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()
     }