Explorar o código

报警优化
优化apk

ccc hai 2 meses
pai
achega
88234a0a84
Modificáronse 100 ficheiros con 191 adicións e 171 borrados
  1. 13 6
      app/build.gradle
  2. 5 5
      app/src/main/java/com/sunzee/app/AppApplication.kt
  3. 2 1
      base_lib.gradle
  4. 3 1
      base_module.gradle
  5. 1 1
      buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt
  6. 4 4
      buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt
  7. 1 1
      buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/SDKKeyConfig.kt
  8. 3 2
      lib_base/build.gradle
  9. 0 8
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ResourcesFun.kt
  10. 3 3
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/BaseApplication.kt
  11. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PayEnum.kt
  12. 3 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcAlarmAddressEnum.kt
  13. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcD2StatusEnum.kt
  14. 4 3
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcDebugAddressEnum.kt
  15. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcHomeAddressEnum.kt
  16. 3 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcParamAddressEnum.kt
  17. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcSettingAddressEnum.kt
  18. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/ProTypeEnum.kt
  19. 3 3
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/ActivityLifecycleCallbacksImpl.kt
  20. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/ApplicationLifecycle.kt
  21. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/LoadModuleProxy.kt
  22. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/bean/Global.kt
  23. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/constant/VersionStatus.kt
  24. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ActivityKtx.kt
  25. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/EditTextKtx.kt
  26. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/LifecycleOwnerKtx.kt
  27. 0 0
      lib_base/src/main/java/com/quyunshuo/sbm10/base/ktx/NetUtils.kt
  28. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/PopupWindowKtx.kt
  29. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/SizeUnitKtx.kt
  30. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/VideoViewKtx.kt
  31. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewKtx.kt
  32. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewModelKtx.kt
  33. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewPager2Ktx.kt
  34. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/m/BaseRepository.kt
  35. 7 7
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameActivity.kt
  36. 6 6
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameDialog.kt
  37. 5 5
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameDialogFragment.kt
  38. 4 4
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameFragment.kt
  39. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/FrameView.kt
  40. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/vm/BaseViewModel.kt
  41. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/vm/EmptyViewModel.kt
  42. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ActivityStackManager.kt
  43. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AndroidBugFixUtils.kt
  44. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt
  45. 3 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/BarUtils.java
  46. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ClipboardUtils.kt
  47. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/CoilGIFImageLoader.kt
  48. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/DateUtils.kt
  49. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/EventBusUtils.kt
  50. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ForegroundBackgroundHelper.kt
  51. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/LanguageUtil.kt
  52. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ProcessUtils.kt
  53. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/RegisterEventBus.kt
  54. 8 0
      lib_base/src/main/java/com/quyunshuo/sbm10/base/utils/ResourcesFun.kt
  55. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/SpUtils.kt
  56. 3 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/SpannableStringUtils.java
  57. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/StateLayoutEnum.kt
  58. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ThreadUtils.kt
  59. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ToastUtils.kt
  60. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt
  61. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/AutoRegisterNetListener.kt
  62. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkCallbackImpl.kt
  63. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkStateChangeListener.kt
  64. 2 2
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkStateClient.kt
  65. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkTypeEnum.kt
  66. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/status/ViewStatusHelper.kt
  67. 3 3
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/status/imp/BaseFrameViewStatusHelperImp.kt
  68. 1 1
      lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/view/OnSingleClickListener.kt
  69. 4 2
      lib_common/build.gradle
  70. 10 9
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/CommonApplication.kt
  71. 0 0
      lib_common/src/main/java/com/quyunshuo/sbm10/common/bean/BaseResponse.kt
  72. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/DataItem.kt
  73. 0 0
      lib_common/src/main/java/com/quyunshuo/sbm10/common/bean/HomeProductBean.kt
  74. 3 3
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/LocalAlarmClockBean.kt
  75. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/PaySucessBean.kt
  76. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/PayTypeBean.kt
  77. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/ProductDataBean.kt
  78. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/SettingTypeBean.kt
  79. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/ShoppingCartBean.kt
  80. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/VideoInfoBean.kt
  81. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/Heartbeat.kt
  82. 2 2
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MMKVName.kt
  83. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MqName.kt
  84. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/PayName.kt
  85. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/RouteKey.kt
  86. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/RouteUrl.kt
  87. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/SavaAddress.kt
  88. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/SpKey.kt
  89. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/event/ApiMessageEvent.kt
  90. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/AlarmClockEnum.kt
  91. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/ConnectStateEnum.kt
  92. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/WeekEnum.kt
  93. 2 2
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ExceptionHandler.kt
  94. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ResponseCodeEnum.kt
  95. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ResponseException.kt
  96. 1 1
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyBean.java
  97. 2 2
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyUtils.java
  98. 3 2
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyView.java
  99. 2 2
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyboardView.java
  100. 0 0
      lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyboardView2.java

+ 13 - 6
app/build.gradle

@@ -2,7 +2,12 @@
 //************ app 壳的配置文件 ************
 //****************************************
 
-import com.quyunshuo.androidbaseframemvvm.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.DependencyConfig
+import com.quyunshuo.sbm10.buildsrc.ProjectBuildConfig
+
+import java.text.SimpleDateFormat
+
 
 plugins {
     alias(libs.plugins.application)
@@ -12,7 +17,7 @@ plugins {
 }
 
 android {
-    namespace 'com.quyunshuo.androidbaseframemvvm'
+    namespace 'com.quyunshuo.sbm10'
     compileSdk ProjectBuildConfig.compileSdkVersion
 
     defaultConfig {
@@ -84,10 +89,12 @@ android {
     android.applicationVariants.all { variant ->
         variant.outputs.all { output ->
             if (outputFileName != null && outputFileName.endsWith('.apk')) {
-                outputFileName = "${ProjectBuildConfig.applicationId}" +
-                        "_${ProjectBuildConfig.versionCode}" +
-                        "_${ProjectBuildConfig.versionName}" +
-                        "_${variant.buildType.name}" +
+                def date = new Date()
+                def dateFormat = new SimpleDateFormat("M.d") // 格式化日期为 MM.dd
+                def formattedDate = dateFormat.format(date)
+                outputFileName="${ProjectBuildConfig.versionName}"+
+                        "-SBM10-"+
+                        "${formattedDate}"+
                         ".apk"
             }
         }

+ 5 - 5
app/src/main/java/com/sunzee/app/AppApplication.kt

@@ -13,10 +13,10 @@ import com.hjq.http.EasyConfig
 import com.hjq.http.config.IRequestHandler
 import com.hjq.http.request.HttpRequest
 import com.hjq.toast.Toaster
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
-import com.quyunshuo.androidbaseframemvvm.common.constant.Heartbeat
-import com.quyunshuo.androidbaseframemvvm.common.util.FileUtil
-import com.quyunshuo.androidbaseframemvvm.common.util.XLogUtil
+import com.quyunshuo.sbm10.base.BaseApplication
+import com.quyunshuo.sbm10.common.constant.Heartbeat
+import com.quyunshuo.sbm10.common.util.FileUtil
+import com.quyunshuo.sbm10.common.util.XLogUtil
 import com.quyunshuo.module.home.service.GlobalService
 import com.quyunshuo.module.home.service.MqService
 import dagger.hilt.android.HiltAndroidApp
@@ -121,7 +121,7 @@ class AppApplication : BaseApplication() {
             val process: String = getAppNameByPID(instances!!.baseContext,pid)
             return if (TextUtils.isEmpty(process)) {
                 true
-            } else if ("com.quyunshuo.androidbaseframemvvm".equals(process, ignoreCase = true)) {
+            } else if ("com.quyunshuo.sbm10".equals(process, ignoreCase = true)) {
                 true
             } else {
                 false

+ 2 - 1
base_lib.gradle

@@ -2,7 +2,8 @@
 //********* lib 模块的公共脚本配置 **********
 //****************************************
 
-import com.quyunshuo.androidbaseframemvvm.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.ProjectBuildConfig
 
 android {
     compileSdkVersion ProjectBuildConfig.compileSdkVersion

+ 3 - 1
base_module.gradle

@@ -2,7 +2,9 @@
 //******** module模块的公共脚本配置 *********
 //****************************************
 
-import com.quyunshuo.androidbaseframemvvm.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.DependencyConfig
+import com.quyunshuo.sbm10.buildsrc.ProjectBuildConfig
 
 android {
     compileSdk ProjectBuildConfig.compileSdkVersion

+ 1 - 1
buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/DependencyConfig.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.buildsrc
+package com.quyunshuo.sbm10.buildsrc
 
 /**
  * 项目依赖版本统一管理

+ 4 - 4
buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/ProjectBuildConfig.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.buildsrc
+package com.quyunshuo.sbm10.buildsrc
 
 /**
  * 项目相关参数配置
@@ -8,11 +8,11 @@ package com.quyunshuo.androidbaseframemvvm.buildsrc
  */
 object ProjectBuildConfig {
     const val compileSdkVersion = 34
-    const val applicationId = "com.quyunshuo.androidbaseframemvvm"
+    const val applicationId = "com.quyunshuo.sbm10"
     const val minSdkVersion = 21
     const val targetSdkVersion = 29
-    const val versionCode = 4
-    const val versionName = "1.0.4"
+    const val versionCode = 5
+    const val versionName = "1.0.5"
     const val isAppMode = false
     /**
      * 项目当前的版本状态

+ 1 - 1
buildSrc/src/main/kotlin/com/quyunshuo/androidbaseframemvvm/buildsrc/SDKKeyConfig.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.buildsrc
+package com.quyunshuo.sbm10.buildsrc
 
 /**
  * 存放需要存在本地的SDK的密钥

+ 3 - 2
lib_base/build.gradle

@@ -11,7 +11,8 @@ plugins {
 
 apply from: '../base_lib.gradle'
 
-import com.quyunshuo.androidbaseframemvvm.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.DependencyConfig
 
 android {
 
@@ -20,7 +21,7 @@ android {
     }
 
 //    resourcePrefix "base_"
-    namespace 'com.quyunshuo.androidbaseframemvvm.base'
+    namespace 'com.quyunshuo.sbm10.base'
 }
 
 dependencies {

+ 0 - 8
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ResourcesFun.kt

@@ -1,8 +0,0 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
-
-import androidx.annotation.StringRes
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication.Companion.application as app
-
-fun getString(@StringRes stringRes: Int): String {
-    return app.getString(stringRes)
-}

+ 3 - 3
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/BaseApplication.kt

@@ -1,12 +1,12 @@
-package com.quyunshuo.androidbaseframemvvm.base
+package com.quyunshuo.sbm10.base
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.util.Log
 import androidx.multidex.MultiDexApplication
 import com.orhanobut.hawk.Hawk
-import com.quyunshuo.androidbaseframemvvm.base.app.ActivityLifecycleCallbacksImpl
-import com.quyunshuo.androidbaseframemvvm.base.app.LoadModuleProxy
+import com.quyunshuo.sbm10.base.app.ActivityLifecycleCallbacksImpl
+import com.quyunshuo.sbm10.base.app.LoadModuleProxy
 import kotlinx.coroutines.*
 import kotlin.system.measureTimeMillis
 

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PayEnum.kt

@@ -1,6 +1,6 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
 
-import com.quyunshuo.androidbaseframemvvm.base.R
+import com.quyunshuo.sbm10.base.R
 
 /**
  * 支付枚举

+ 3 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcAlarmAddressEnum.kt

@@ -1,6 +1,7 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
+
+import com.quyunshuo.sbm10.base.R
 
-import com.quyunshuo.androidbaseframemvvm.base.R
 
 enum class PlcAlarmAddressEnum(val address: String, val aName: String, val aNameId:Int) {
     Alarm01("0100", "玉米不爆开", R.string.base_plc_alarm_1),

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcD2StatusEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
 
 enum class PlcD2StatusEnum(val address: String, val aName: String) {
     D2_99("99", "整机初次上电"),

+ 4 - 3
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcDebugAddressEnum.kt

@@ -1,10 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
+
+import com.quyunshuo.sbm10.base.R
 
-import com.quyunshuo.androidbaseframemvvm.base.R
 
 enum class PlcDebugAddressEnum(val address: String, val aName: String,val aNameId:Int) {
 //    IO_SE_01("00FB01","次核点位1",R.string.base_plc_debug_1),//这里是开机按钮,不放到调试页
-    IO_SE_02("02","次核点位2",R.string.base_plc_debug_2),
+    IO_SE_02("02","次核点位2", R.string.base_plc_debug_2),
     IO_SE_03("03","次核点位3",R.string.base_plc_debug_3),
     IO_SE_04("04","次核点位4",R.string.base_plc_debug_4),
     IO_SE_05("05","次核点位5",R.string.base_plc_debug_5),

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcHomeAddressEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
 
 enum class PlcHomeAddressEnum(val address: String, val aName: String,) {
     D170("D170","蒸汽温度"),

+ 3 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcParamAddressEnum.kt

@@ -1,6 +1,7 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
+
+import com.quyunshuo.sbm10.base.R
 
-import com.quyunshuo.androidbaseframemvvm.base.R
 
 enum class PlcParamAddressEnum(val address: String, val aName: String,val aNameId:Int) {
     Param01("01", "气泵低速", R.string.base_plc_param_1),

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/PlcSettingAddressEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
 
 enum class PlcSettingAddressEnum(val address: String, val aName: String,) {
     M3("M3","开机复位"),

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/addressenum/ProTypeEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.addressenum
+package com.quyunshuo.sbm10.base.addressenum
 
 /**
  * 商品:

+ 3 - 3
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/ActivityLifecycleCallbacksImpl.kt

@@ -1,11 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.app
+package com.quyunshuo.sbm10.base.app
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import android.util.Log
-import com.quyunshuo.androidbaseframemvvm.base.utils.ActivityStackManager
-import com.quyunshuo.androidbaseframemvvm.base.utils.ForegroundBackgroundHelper
+import com.quyunshuo.sbm10.base.utils.ActivityStackManager
+import com.quyunshuo.sbm10.base.utils.ForegroundBackgroundHelper
 
 /**
  * Activity生命周期监听

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/ApplicationLifecycle.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.app
+package com.quyunshuo.sbm10.base.app
 
 import android.app.Application
 import android.content.Context

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/app/LoadModuleProxy.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.app
+package com.quyunshuo.sbm10.base.app
 
 import android.app.Application
 import android.content.Context

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/bean/Global.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.bean
+package com.quyunshuo.sbm10.base.bean
 
 object Global {
     var isNetWork: Boolean = false //自主检测里面来测试是否有网络

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/constant/VersionStatus.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.constant
+package com.quyunshuo.sbm10.base.constant
 
 /**
  * 版本状态

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ActivityKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.app.Activity
 import android.view.WindowManager

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/EditTextKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.text.InputFilter
 import android.widget.EditText

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/LifecycleOwnerKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData

lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/NetUtils.kt → lib_base/src/main/java/com/quyunshuo/sbm10/base/ktx/NetUtils.kt


+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/PopupWindowKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.view.View
 import android.view.ViewGroup

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/SizeUnitKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.content.Context
 import androidx.fragment.app.Fragment

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/VideoViewKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.media.MediaPlayer
 import android.view.ViewGroup

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewKtx.kt

@@ -1,11 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.animation.Animator
 import android.animation.IntEvaluator
 import android.animation.ValueAnimator
 import android.view.View
 import android.view.ViewGroup
-import com.quyunshuo.androidbaseframemvvm.base.view.OnSingleClickListener
+import com.quyunshuo.sbm10.base.view.OnSingleClickListener
 
 /**
  * @Author: QuYunShuo

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewModelKtx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/ktx/ViewPager2Ktx.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.ktx
+package com.quyunshuo.sbm10.base.ktx
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/m/BaseRepository.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.m
+package com.quyunshuo.sbm10.base.mvvm.m
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow

+ 7 - 7
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameActivity.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.v
+package com.quyunshuo.sbm10.base.mvvm.v
 
 import android.content.Context
 import android.content.res.Resources
@@ -10,12 +10,12 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
 import com.alibaba.android.arouter.launcher.ARouter
-import com.quyunshuo.androidbaseframemvvm.base.R
-import com.quyunshuo.androidbaseframemvvm.base.mvvm.vm.BaseViewModel
-import com.quyunshuo.androidbaseframemvvm.base.utils.*
-import com.quyunshuo.androidbaseframemvvm.base.utils.network.AutoRegisterNetListener
-import com.quyunshuo.androidbaseframemvvm.base.utils.network.NetworkStateChangeListener
-import com.quyunshuo.androidbaseframemvvm.base.utils.network.NetworkTypeEnum
+import com.quyunshuo.sbm10.base.R
+import com.quyunshuo.sbm10.base.mvvm.vm.BaseViewModel
+import com.quyunshuo.sbm10.base.utils.*
+import com.quyunshuo.sbm10.base.utils.network.AutoRegisterNetListener
+import com.quyunshuo.sbm10.base.utils.network.NetworkStateChangeListener
+import com.quyunshuo.sbm10.base.utils.network.NetworkTypeEnum
 import me.jessyan.autosize.AutoSizeCompat
 
 /**

+ 6 - 6
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameDialog.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.v
+package com.quyunshuo.sbm10.base.mvvm.v
 
 import android.app.Activity
 import android.app.Dialog
@@ -9,11 +9,11 @@ import android.util.DisplayMetrics
 import android.view.Gravity
 import androidx.viewbinding.ViewBinding
 import com.alibaba.android.arouter.launcher.ARouter
-import com.quyunshuo.androidbaseframemvvm.base.R
-import com.quyunshuo.androidbaseframemvvm.base.mvvm.vm.BaseViewModel
-import com.quyunshuo.androidbaseframemvvm.base.utils.EventBusUtils
-import com.quyunshuo.androidbaseframemvvm.base.utils.RegisterEventBus
-import com.quyunshuo.androidbaseframemvvm.base.utils.network.AutoRegisterNetListener
+import com.quyunshuo.sbm10.base.R
+import com.quyunshuo.sbm10.base.mvvm.vm.BaseViewModel
+import com.quyunshuo.sbm10.base.utils.EventBusUtils
+import com.quyunshuo.sbm10.base.utils.RegisterEventBus
+import com.quyunshuo.sbm10.base.utils.network.AutoRegisterNetListener
 import me.jessyan.autosize.AutoSizeCompat
 
 abstract class BaseFrameDialog<VB : ViewBinding> (

+ 5 - 5
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameDialogFragment.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.v
+package com.quyunshuo.sbm10.base.mvvm.v
 
 import android.content.Context
 import android.os.Build
@@ -12,10 +12,10 @@ import androidx.annotation.RequiresApi
 import androidx.fragment.app.DialogFragment
 import androidx.viewbinding.ViewBinding
 import com.alibaba.android.arouter.launcher.ARouter
-import com.quyunshuo.androidbaseframemvvm.base.R
-import com.quyunshuo.androidbaseframemvvm.base.mvvm.vm.BaseViewModel
-import com.quyunshuo.androidbaseframemvvm.base.utils.EventBusUtils
-import com.quyunshuo.androidbaseframemvvm.base.utils.RegisterEventBus
+import com.quyunshuo.sbm10.base.R
+import com.quyunshuo.sbm10.base.mvvm.vm.BaseViewModel
+import com.quyunshuo.sbm10.base.utils.EventBusUtils
+import com.quyunshuo.sbm10.base.utils.RegisterEventBus
 
 abstract class BaseFrameDialogFragment<VB : ViewBinding, VM : BaseViewModel> : DialogFragment(),FrameView<VB> {
     private  val TAG = "BaseFrameDialogFragment"

+ 4 - 4
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/BaseFrameFragment.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.v
+package com.quyunshuo.sbm10.base.mvvm.v
 
 import android.os.Bundle
 import android.util.Log
@@ -9,9 +9,9 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
 import com.alibaba.android.arouter.launcher.ARouter
-import com.quyunshuo.androidbaseframemvvm.base.mvvm.vm.BaseViewModel
-import com.quyunshuo.androidbaseframemvvm.base.utils.RegisterEventBus
-import com.quyunshuo.androidbaseframemvvm.base.utils.EventBusUtils
+import com.quyunshuo.sbm10.base.mvvm.vm.BaseViewModel
+import com.quyunshuo.sbm10.base.utils.RegisterEventBus
+import com.quyunshuo.sbm10.base.utils.EventBusUtils
 
 /**
  * Fragment基类

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/v/FrameView.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.v
+package com.quyunshuo.sbm10.base.mvvm.v
 
 import androidx.lifecycle.LiveData
 import androidx.viewbinding.ViewBinding

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/vm/BaseViewModel.kt

@@ -1,8 +1,8 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.vm
+package com.quyunshuo.sbm10.base.mvvm.vm
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.quyunshuo.androidbaseframemvvm.base.utils.StateLayoutEnum
+import com.quyunshuo.sbm10.base.utils.StateLayoutEnum
 import kotlin.jvm.Throws
 
 /**

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/mvvm/vm/EmptyViewModel.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.mvvm.vm
+package com.quyunshuo.sbm10.base.mvvm.vm
 
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ActivityStackManager.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.app.Activity
 import java.util.*

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AndroidBugFixUtils.kt

@@ -1,10 +1,10 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.app.Activity
 import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 import java.lang.reflect.Field
 
 /**

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/AppUtils.kt

@@ -1,8 +1,8 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.content.pm.PackageInfo
 import android.os.Build
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 /**
  * App 相关工具类

+ 3 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/BarUtils.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils;
+package com.quyunshuo.sbm10.base.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -27,7 +27,8 @@ import java.lang.reflect.Method;
 
 import static android.Manifest.permission.EXPAND_STATUS_BAR;
 
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication;
+import com.quyunshuo.sbm10.base.BaseApplication;
+import com.quyunshuo.sbm10.base.BaseApplication;
 
 /**
  * 各种栏的工具类

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ClipboardUtils.kt

@@ -1,9 +1,9 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 /**
  * 剪切板工具类

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/CoilGIFImageLoader.kt

@@ -1,10 +1,10 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.os.Build.VERSION.SDK_INT
 import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 /**
  * 用于加载 Gif 的 Coil ImageLoader

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/DateUtils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import java.text.ParseException
 import java.text.SimpleDateFormat

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/EventBusUtils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import org.greenrobot.eventbus.EventBus
 

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ForegroundBackgroundHelper.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 /**
  * 前后台切换帮助类,该类实现了前后台监听以及支持注册变化响应监听

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/LanguageUtil.kt

@@ -1,11 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Build
 import android.util.Log
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 import java.util.Locale
 
 object LanguageUtil {

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ProcessUtils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.app.ActivityManager
 import android.content.Context

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/RegisterEventBus.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 /**
  * 辅助注册 EventBus 的注解

+ 8 - 0
lib_base/src/main/java/com/quyunshuo/sbm10/base/utils/ResourcesFun.kt

@@ -0,0 +1,8 @@
+package com.quyunshuo.sbm10.base.utils
+
+import androidx.annotation.StringRes
+import com.quyunshuo.sbm10.base.BaseApplication.Companion.application as app
+
+fun getString(@StringRes stringRes: Int): String {
+    return app.getString(stringRes)
+}

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/SpUtils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.content.Context
 import com.tencent.mmkv.MMKV

+ 3 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/SpannableStringUtils.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils;
+package com.quyunshuo.sbm10.base.utils;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
@@ -61,7 +61,8 @@ import java.lang.ref.WeakReference;
 
 import static android.graphics.BlurMaskFilter.Blur;
 
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication;
+import com.quyunshuo.sbm10.base.BaseApplication;
+import com.quyunshuo.sbm10.base.BaseApplication;
 
 /**
  * 字符串相关

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/StateLayoutEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 /**
  * 状态视图的状态枚举

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ThreadUtils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.os.Build
 import android.os.Looper

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/ToastUtils.kt

@@ -1,11 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
 import androidx.annotation.StringRes
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 private val mToastHandler by lazy { Handler(Looper.getMainLooper()) }
 

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/Utils.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils
+package com.quyunshuo.sbm10.base.utils
 
 import android.util.Log
 import com.alibaba.android.arouter.launcher.ARouter

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/AutoRegisterNetListener.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.network
+package com.quyunshuo.sbm10.base.utils.network
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkCallbackImpl.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.network
+package com.quyunshuo.sbm10.base.utils.network
 
 import android.net.ConnectivityManager
 import android.net.Network

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkStateChangeListener.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.network
+package com.quyunshuo.sbm10.base.utils.network
 
 /**
  * 网络状态改变监听起

+ 2 - 2
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkStateClient.kt

@@ -1,11 +1,11 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.network
+package com.quyunshuo.sbm10.base.utils.network
 
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import androidx.annotation.RequiresPermission
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 /**
  * 网络状态监听

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/network/NetworkTypeEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.network
+package com.quyunshuo.sbm10.base.utils.network
 
 /**
  * 网络类型的枚举

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/status/ViewStatusHelper.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.status
+package com.quyunshuo.sbm10.base.utils.status
 
 import android.os.Bundle
 

+ 3 - 3
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/utils/status/imp/BaseFrameViewStatusHelperImp.kt

@@ -1,7 +1,7 @@
-package com.quyunshuo.androidbaseframemvvm.base.utils.status.imp
+package com.quyunshuo.sbm10.base.utils.status.imp
 
 import android.os.Bundle
-import com.quyunshuo.androidbaseframemvvm.base.utils.status.ViewStatusHelper
+import com.quyunshuo.sbm10.base.utils.status.ViewStatusHelper
 
 /**
  * @author DBoy 2021/7/8
@@ -12,7 +12,7 @@ open class BaseFrameViewStatusHelperImp(parentViewStatusHelper: ViewStatusHelper
     /**
      * 重建标记key 以包名保存数据可以防止嵌套层级出现重复Key
      */
-    private val KEY_RECREATE = "com.quyunshuo.androidbaseframemvvm.base.utils.status.BaseFrameViewStatusHelperImp.Recreate"
+    private val KEY_RECREATE = "com.quyunshuo.sbm10.base.utils.status.BaseFrameViewStatusHelperImp.Recreate"
 
     /**
      * 是否重建

+ 1 - 1
lib_base/src/main/java/com/quyunshuo/androidbaseframemvvm/base/view/OnSingleClickListener.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.base.view
+package com.quyunshuo.sbm10.base.view
 
 import android.view.View
 

+ 4 - 2
lib_common/build.gradle

@@ -11,7 +11,9 @@ plugins {
 
 apply from: '../base_lib.gradle'
 
-import com.quyunshuo.androidbaseframemvvm.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.*
+import com.quyunshuo.sbm10.buildsrc.DependencyConfig
+import com.quyunshuo.sbm10.buildsrc.SDKKeyConfig
 
 android {
 
@@ -24,7 +26,7 @@ android {
     }
 
     resourcePrefix "common_"
-    namespace 'com.quyunshuo.androidbaseframemvvm.common'
+    namespace 'com.quyunshuo.sbm10.common'
 }
 
 dependencies {

+ 10 - 9
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/CommonApplication.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common
+package com.quyunshuo.sbm10.common
 
 import android.annotation.SuppressLint
 import android.app.Application
@@ -6,14 +6,15 @@ import android.content.Context
 import android.util.Log
 import com.alibaba.android.arouter.launcher.ARouter
 import com.google.auto.service.AutoService
-import com.quyunshuo.androidbaseframemvvm.base.app.ApplicationLifecycle
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
-import com.quyunshuo.androidbaseframemvvm.base.constant.VersionStatus
-import com.quyunshuo.androidbaseframemvvm.base.utils.ForegroundBackgroundObserver
-import com.quyunshuo.androidbaseframemvvm.base.utils.ProcessUtils
-import com.quyunshuo.androidbaseframemvvm.base.utils.SpUtils
-import com.quyunshuo.androidbaseframemvvm.base.utils.network.NetworkStateClient
-import com.quyunshuo.androidbaseframemvvm.common.constant.Heartbeat
+import com.quyunshuo.sbm10.common.R
+import com.quyunshuo.sbm10.base.app.ApplicationLifecycle
+import com.quyunshuo.sbm10.base.BaseApplication
+import com.quyunshuo.sbm10.base.constant.VersionStatus
+import com.quyunshuo.sbm10.base.utils.ForegroundBackgroundObserver
+import com.quyunshuo.sbm10.base.utils.ProcessUtils
+import com.quyunshuo.sbm10.base.utils.SpUtils
+import com.quyunshuo.sbm10.base.utils.network.NetworkStateClient
+import com.quyunshuo.sbm10.common.constant.Heartbeat
 import com.tencent.bugly.crashreport.CrashReport
 //import com.tencent.smtt.export.external.TbsCoreSettings
 //import com.tencent.smtt.sdk.QbSdk

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/BaseResponse.kt → lib_common/src/main/java/com/quyunshuo/sbm10/common/bean/BaseResponse.kt


+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/DataItem.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 import java.io.Serializable
 

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/HomeProductBean.kt → lib_common/src/main/java/com/quyunshuo/sbm10/common/bean/HomeProductBean.kt


+ 3 - 3
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/LocalAlarmClockBean.kt

@@ -1,7 +1,7 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
-import com.quyunshuo.androidbaseframemvvm.common.enums.AlarmClockEnum
-import com.quyunshuo.androidbaseframemvvm.common.enums.WeekEnum
+import com.quyunshuo.sbm10.common.enums.AlarmClockEnum
+import com.quyunshuo.sbm10.common.enums.WeekEnum
 
 data class LocalAlarmClockBean(
     var id: String? = null,//闹钟id

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/PaySucessBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 /**
  * 支付成功的json

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/PayTypeBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 /**
  * 支付 方式 bean

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/ProductDataBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 data class ProductDataBean(
     var productId: Int,//id 唯一标识

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/SettingTypeBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 /**
  * Setting  bean

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/ShoppingCartBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 /**
  * 购物车list内容

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/bean/VideoInfoBean.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.bean
+package com.quyunshuo.sbm10.common.bean
 
 import java.io.Serializable
 

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/Heartbeat.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 import java.math.BigDecimal
 

+ 2 - 2
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MMKVName.kt

@@ -1,7 +1,7 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 import android.graphics.Typeface
-import com.quyunshuo.androidbaseframemvvm.base.BaseApplication
+import com.quyunshuo.sbm10.base.BaseApplication
 
 abstract class MMKVName {
 

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MqName.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 /**
  * 后台参数数据

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/PayName.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 /**
  * 支付相关的 name

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/RouteKey.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 /**
  * @Author: QuYunShuo

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/RouteUrl.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 /**
  * @Author: QuYunShuo

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/SavaAddress.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 import android.os.Environment
 

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/SpKey.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant
+package com.quyunshuo.sbm10.common.constant
 
 /**
  * @Author: QuYunShuo

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/event/ApiMessageEvent.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.constant.event
+package com.quyunshuo.sbm10.common.constant.event
 
 /**
  * 发送推送结果

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/AlarmClockEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.enums
+package com.quyunshuo.sbm10.common.enums
 
 
 /**

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/ConnectStateEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.enums
+package com.quyunshuo.sbm10.common.enums
 
 /**
  * 连接状态

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/enums/WeekEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.enums
+package com.quyunshuo.sbm10.common.enums
 
 enum class WeekEnum(val code:Int,val content:String)  {
     SUNDAY(7, "sunday"),

+ 2 - 2
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ExceptionHandler.kt

@@ -1,6 +1,6 @@
-package com.quyunshuo.androidbaseframemvvm.common.helper
+package com.quyunshuo.sbm10.common.helper
 
-import com.quyunshuo.androidbaseframemvvm.base.utils.toast
+import com.quyunshuo.sbm10.base.utils.toast
 
 /**
  * 响应code异常统一处理

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ResponseCodeEnum.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.helper
+package com.quyunshuo.sbm10.common.helper
 
 /**
  * 请求响应code枚举抽象

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/helper/ResponseException.kt

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.helper
+package com.quyunshuo.sbm10.common.helper
 
 /**
  * 自定义响应异常的抽象类型

+ 1 - 1
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyBean.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.keyboard;
+package com.quyunshuo.sbm10.common.keyboard;
 
 /**
  * <br>Email:1006368252@qq.com

+ 2 - 2
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyUtils.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.keyboard;
+package com.quyunshuo.sbm10.common.keyboard;
 
 import android.app.Activity;
 import android.util.Log;
@@ -14,7 +14,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringDef;
 
 import com.orhanobut.hawk.Hawk;
-import com.quyunshuo.androidbaseframemvvm.common.R;
+import com.quyunshuo.sbm10.common.R;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 3 - 2
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyView.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.keyboard;
+package com.quyunshuo.sbm10.common.keyboard;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -10,7 +10,8 @@ import android.widget.TextView;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 
-import com.quyunshuo.androidbaseframemvvm.common.R;
+import com.quyunshuo.sbm10.common.R;
+
 
 /**
  * <br>Email:1006368252@qq.com

+ 2 - 2
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyboardView.java

@@ -1,4 +1,4 @@
-package com.quyunshuo.androidbaseframemvvm.common.keyboard;
+package com.quyunshuo.sbm10.common.keyboard;
 
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
@@ -33,7 +33,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringDef;
 
 import com.orhanobut.hawk.Hawk;
-import com.quyunshuo.androidbaseframemvvm.common.R;
+import com.quyunshuo.sbm10.common.R;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

+ 0 - 0
lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/keyboard/KeyboardView2.java


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio