fumiama/copymanga
1
0
Fork 0
mirror of https://github.com/fumiama/copymanga.git synced 2026-06-08 08:50:27 +08:00
Code Activity

v2.0.0

Browse Source 
正式版发布!
新增
1. 漫画下载页退出多选模式
2. 我的下载反转排序
3. 分类页 日漫/韩漫/美漫/已完结 筛选标签
4. 排行页 男频/女频 筛选菜单
5. 已完结/更新 标签
6. Token 失效时自动退出登录
7. 我的订阅/漫画详情增加云端读到记录
8. 浏览历史增加最新话提示
9. 漫画详情支持取消订阅
修复
1. 下拉刷新无法回到最开头
2. 断网时无法进入下载
优化
1. 卡片翻页加载效率
2. 网络加载逻辑
This commit is contained in:
源文雨
2023-10-29 17:37:59 +09:00
parent 44c67838ad
commit d470a6f54a
5 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/top/fumiama/copymanga/MainActivity.kt
View File

@@ -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

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

@@ -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_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()

12
app/src/main/java/top/fumiama/copymanga/ui/home/HomeFragment.kt
View File

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

2
app/src/main/java/top/fumiama/copymanga/ui/vm/VMHandler.kt
View File

@@ -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

2
app/src/main/java/top/fumiama/copymanga/ui/vm/ViewMangaActivity.kt
View File

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