code impr

storytellerF · May 28, 2023 · 904dfd5 · 904dfd5
1 parent d6ecdb0
commit 904dfd5
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 72 deletions.
diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/HomeApi.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/HomeApi.kt
@@ -5,6 +5,7 @@ import com.a10miaomiao.bilimiao.comm.network.BiliApiService
 import com.a10miaomiao.bilimiao.comm.network.MiaoHttp
 import java.util.Locale
 
+@Suppress("UNUSED_PARAMETER")
 class HomeApi {
 
     /**

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/UserApi.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/UserApi.kt
@@ -4,6 +4,7 @@ import com.a10miaomiao.bilimiao.comm.network.ApiHelper
 import com.a10miaomiao.bilimiao.comm.network.BiliApiService
 import com.a10miaomiao.bilimiao.comm.network.MiaoHttp
 
+@Suppress("UNUSED_PARAMETER")
 class UserApi {
 
     /**

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/DimensionXInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/DimensionXInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.bangumi
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class DimensionXInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/EpisodeInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/EpisodeInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.bangumi
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class EpisodeInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/SeasonInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/bangumi/SeasonInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.bangumi
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class SeasonInfo(

diff --git a/...miao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/region/RegionChildrenInfo.kt b/...miao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/region/RegionChildrenInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.region
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * 子分区信息

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/region/RegionInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/region/RegionInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.region
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 /**
  * 分区信息

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/user/MemberInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/user/MemberInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.user
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class MemberInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/user/UpperChannelInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/user/UpperChannelInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.user
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class UpperChannelInfo(

diff --git a/...ao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoCommentReplyInfo.kt b/...ao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoCommentReplyInfo.kt
@@ -2,8 +2,7 @@ package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
 import com.a10miaomiao.bilimiao.comm.entity.user.MemberInfo
-import kotlinx.android.parcel.Parcelize
-
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoCommentReplyInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoInfo.kt
@@ -2,7 +2,7 @@ package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
 import com.a10miaomiao.bilimiao.comm.entity.bangumi.SeasonInfo
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoOwnerInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoOwnerInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoOwnerInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoPageInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoPageInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 
 @Parcelize

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoRelateInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoRelateInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoRelateInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoReqUserInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoReqUserInfo.kt
@@ -1,8 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoReqUserInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoStaffInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoStaffInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoStaffInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoStatInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoStatInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoStatInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoTagInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/video/VideoTagInfo.kt
@@ -1,7 +1,7 @@
 package com.a10miaomiao.bilimiao.comm.entity.video
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class VideoTagInfo(

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/network/BiliGRPCConfig.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/network/BiliGRPCConfig.kt
@@ -16,22 +16,22 @@ object BiliGRPCConfig {
     /**
      * 频道.
      */
-    val channel = "bilibili140";
+    val channel = "bilibili140"
 
     /**
      * 网络状况.
      */
-    val networkType = 2;
+    val networkType = 2
 
     /**
      * 未知.
      */
-    val networkTF = 0;
+    val networkTF = 0
 
     /**
      * 未知.
      */
-    val networkOid = "46007";
+    val networkOid = "46007"
 
     /**
      * 未知.
@@ -42,32 +42,32 @@ object BiliGRPCConfig {
     /**
      * 应用类型.
      */
-    val mobileApp = "android_hd";
+    val mobileApp = "android_hd"
 
     /**
      * 移动平台.
      */
-    val platform = "android_hd";
+    val platform = "android_hd"
 
     /**
      * 产品环境.
      */
-    val envorienment = "prod";
+    val envorienment = "prod"
 
     /**
      * 应用Id.
      */
-    var appId = 1;
+    var appId = 1
 
     /**
      * 国家或地区.
      */
-    val region = "CN";
+    val region = "CN"
 
     /**
      * 语言.
      */
-    val language = "zh";
+    val language = "zh"
 
     /**
      * 获取客户端在Fawkes系统中的信息标头.
@@ -153,15 +153,14 @@ object BiliGRPCConfig {
     }
 
     fun getSystemUserAgent(): String {
-        var userAgent = ""
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        val userAgent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
             try {
-                userAgent = WebSettings.getDefaultUserAgent(BilimiaoCommApp.commApp.app)
+                WebSettings.getDefaultUserAgent(BilimiaoCommApp.commApp.app)
             } catch (e: Exception) {
-                userAgent = System.getProperty("http.agent")
+                System.getProperty("http.agent")
             }
         } else {
-            userAgent = System.getProperty("http.agent")
+            System.getProperty("http.agent")
         }
         //调整编码，防止中文出错
         val sb = StringBuffer()
@@ -170,7 +169,7 @@ object BiliGRPCConfig {
         while (i < length) {
             val c = userAgent[i]
             if (c <= '\u001f' || c >= '\u007f') {
-                sb.append(String.format("\\u%04x", c.toInt()))
+                sb.append(String.format("\\u%04x", c.code))
             } else {
                 sb.append(c)
             }

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/store/model/DateModel.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/store/model/DateModel.kt
@@ -4,26 +4,31 @@ package com.a10miaomiao.bilimiao.comm.store.model
 import java.util.Calendar
 import java.util.Date
 
-class DateModel() {
-    var year = 2009
-    var month = 1
-    var date = 1
+class DateModel {
+    private var year = 2009
+    private var month = 1
+    private var date = 1
 
     fun setValue(str: String) {
-        val lenght = str.length
-        year = str.substring(0, lenght - 4).toInt()
-        month = str.substring(lenght - 4, lenght - 2).toInt()
-        date = str.substring(lenght - 2, lenght).toInt()
+        val length = str.length
+        year = str.substring(0, length - 4).toInt()
+        month = str.substring(length - 4, length - 2).toInt()
+        date = str.substring(length - 2, length).toInt()
     }
 
     fun getValue(span: String = "") = "$year$span${fillZero(month)}$span${fillZero(date)}"
 
-    fun getDate() = Date(year - 1900, month - 1, date)
+    private fun getDate() = Calendar.getInstance().apply {
+        set(year - 1900, month - 1, date)
+    }
 
     fun setDate(date: Date): DateModel {
-        year = date.year + 1900
-        month = date.month + 1
-        this.date = date.date
+        val calendar = Calendar.getInstance().apply {
+            time = date
+        }
+        year = calendar.get(Calendar.YEAR) + 1900
+        month = calendar.get(Calendar.MONTH) + 1
+        this.date = calendar.get(Calendar.DAY_OF_MONTH)
         return this
     }
 
@@ -88,8 +93,8 @@ class DateModel() {
      * 根据获取gapCount天后的时间
      */
     fun getTimeByGapCount(gapCount: Int): DateModel {
-        var calendar = Calendar.getInstance()
-        calendar.time = getDate()
+        val calendar = Calendar.getInstance()
+        calendar.set(year - 1900, month - 1, date)
         calendar.add(Calendar.DATE, gapCount)//参数-，换为1则为加1代表在原来时间的基础上减少一天一天;ps:加减月数 小时同加减天数
         return DateModel().setDate(calendar.time)
     }
@@ -98,8 +103,8 @@ class DateModel() {
      * 计算时间间隔
      */
     fun getGapCount(date: DateModel): Int {
-        val startL = getDate().time
-        val endL = date.getDate().time
+        val startL = getDate().time.time
+        val endL = date.getDate().time.time
         return ((endL - startL) / (1000 * 60 * 60 * 24)).toInt()
     }
 

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/utils/BiliUrlMatcher.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/utils/BiliUrlMatcher.kt
@@ -21,8 +21,7 @@ object BiliUrlMatcher {
      *
      */
     fun findIDByUrl(text: String): Array<String> {
-        var a = ""
-        a = matchingID(text, ".*://www.bilibili.com/video/av(\\d+)")
+        var a = matchingID(text, ".*://www.bilibili.com/video/av(\\d+)")
         if (a != "") {
             return arrayOf("AV", a)
         }
@@ -86,7 +85,7 @@ object BiliUrlMatcher {
         val compile = Pattern.compile(regex)
         val matcher = compile.matcher(text)
         if (matcher.find())
-            return matcher.group(1)//提取匹配到的结果
+            return matcher.group(1).orEmpty()//提取匹配到的结果
         return ""
     }
 

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/utils/DebugMiao.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/utils/DebugMiao.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_PARAMETER")
+
 package com.a10miaomiao.bilimiao.comm.utils
 
 import android.content.pm.ApplicationInfo
@@ -16,12 +18,12 @@ object DebugMiao {
         get() {
             if (_isDebug == null) {
                 _isDebug =
-                    BilimiaoCommApp.commApp.app.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE !== 0
+                    BilimiaoCommApp.commApp.app.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0
             }
             return _isDebug!!
         }
 
-    private inline fun Any?.getString(): String {
+    private fun Any?.getString(): String {
         return this?.toString() ?: "null"
     }
 
@@ -46,7 +48,6 @@ object DebugMiao {
     fun i(tag: String, msg: String) {  //信息太长,分段打印
         //因为String的length是字符数量不是字节数量所以为了防止中文字符过多，
         //  把4*1024的MAX字节打印长度改为2001字符数
-        var msg = msg
 
     }