diff --git a/hooks/commit-msg.sh b/hooks/commit-msg.sh index 1a33bc4c4..9fd251a37 100755 --- a/hooks/commit-msg.sh +++ b/hooks/commit-msg.sh @@ -98,6 +98,7 @@ declare -A commitMap=( ["technologist"]="改善开发人员体验" ["money_with_wings"]="添加赞助或与资金相关的基础设施" ["thread"]="添加或更新与多线程或并发相关的代码" + ["safety_vest"]="添加或更新与验证相关的代码" ) result=$(echo "$commitMsg" | grep ":[a-z0-9_]\+: .\+") diff --git a/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/BaseApp.kt b/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/BaseApp.kt index e5d50a506..691eab184 100644 --- a/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/BaseApp.kt +++ b/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/BaseApp.kt @@ -57,6 +57,7 @@ open class BaseApp : Application(), InitialManager { //因为有些sdk的初始化不是幂等的，即多次初始化会导致进程的crash。这样就会导致一些未知的问题。 //所以解决方案就是对当前进程进程判断，只在main进程初始化sdk，其余进程默认不进行sdk的初始化。 // (不排除某些sdk需要，比如友盟推送就需要在新开辟的:channel进行进行初始化) + loader.forEach { it.onAllProcess(this) } if (isMainProcess()){ onMainProcess() }else { diff --git a/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/spi/InitialService.kt b/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/spi/InitialService.kt index 292f28167..2baccf8fc 100644 --- a/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/spi/InitialService.kt +++ b/lib_base/src/main/java/com/mredrock/cyxbs/lib/base/spi/InitialService.kt @@ -14,6 +14,8 @@ package com.mredrock.cyxbs.lib.base.spi * @signature 我将追寻并获取我想要的答案 */ interface InitialService { + // 所有进程的回调 + fun onAllProcess(manager: InitialManager) {} //处于主进程的调用(可以进行与隐私策略无关的sdk的初始化,因为app启动就会回调) fun onMainProcess(manager: InitialManager) {} //隐私策略同意的时候的回调 diff --git a/module_course/build.gradle.kts b/module_course/build.gradle.kts index fbf1ecb4e..e0d595581 100644 --- a/module_course/build.gradle.kts +++ b/module_course/build.gradle.kts @@ -19,12 +19,8 @@ dependRxjava() dependNetwork() dependCoroutinesRx3() -configurations.all { - resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) -} - dependencies { - // 20 级郭祥瑞封装的 Banner 库 - implementation("io.github.985892345:SlideShow:2.0.0-SNAPSHOT") + // 20 级郭祥瑞封装的 Banner 库，如果有问题，欢迎来联系 👀 + implementation("io.github.985892345:SlideShow:2.0.0") } diff --git a/module_course/lib_course/build.gradle.kts b/module_course/lib_course/build.gradle.kts index 7e30f336e..ce9ead648 100644 --- a/module_course/lib_course/build.gradle.kts +++ b/module_course/lib_course/build.gradle.kts @@ -19,15 +19,12 @@ dependApiCourse() dependNetwork() dependRxjava() -configurations.all { - resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) -} - dependencies { implementation(Android.`core-ktx`) implementation(Android.constraintlayout) implementation(Android.viewpager2) implementation(Android.`fragment-ktx`) implementation(Android.cardview) - api("io.github.985892345:NetLayout:1.0.0-SNAPSHOT") + // 20 级郭祥瑞封装的课表底层控件，如果有问题，欢迎来联系 👀 + api("io.github.985892345:NetLayout:1.0.0") } \ No newline at end of file diff --git a/module_dialog/build.gradle.kts b/module_dialog/build.gradle.kts index 44d75b945..009aaa7ad 100644 --- a/module_dialog/build.gradle.kts +++ b/module_dialog/build.gradle.kts @@ -1,6 +1,5 @@ import com.mredrock.cyxbs.convention.depend.api.dependApiAccount import com.mredrock.cyxbs.convention.depend.api.dependApiDialog -import com.mredrock.cyxbs.convention.depend.dependEventBus import com.mredrock.cyxbs.convention.depend.dependMaterialDialog import com.mredrock.cyxbs.convention.depend.dependPhotoView import com.mredrock.cyxbs.convention.depend.dependRxjava @@ -21,16 +20,12 @@ dependLibBase() dependLibUtils() dependLibConfig() -configurations.all { - resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) -} - dependencies { // rhino j2js引擎 // 因为最新的rhino 1.7.14 使用了javax.lang.model.SourceVersion，故不支持安卓 // 他们似乎已经修复了这个问题，但还没有发release // https://github.com/mozilla/rhino/issues/1149org.o implementation("org.mozilla:rhino:1.7.11") - // 20 级郭祥瑞封装的 Banner 库 - implementation("io.github.985892345:SlideShow:2.0.0-SNAPSHOT") + // 20 级郭祥瑞封装的 Banner 库，如果有问题，欢迎来联系 👀 + implementation("io.github.985892345:SlideShow:2.0.0") } \ No newline at end of file diff --git a/module_discover/build.gradle.kts b/module_discover/build.gradle.kts index 35f19f911..abcfb3b4c 100644 --- a/module_discover/build.gradle.kts +++ b/module_discover/build.gradle.kts @@ -26,11 +26,7 @@ dependEventBus() dependLibUtils() dependLibCommon() // TODO common 模块不再使用，新模块请依赖 base 和 utils 模块 -configurations.all { - resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) -} - dependencies { - // 20 级郭祥瑞封装的 Banner 库 - implementation("io.github.985892345:SlideShow:2.0.0-SNAPSHOT") + // 20 级郭祥瑞封装的 Banner 库，如果有问题，欢迎来联系 👀 + implementation("io.github.985892345:SlideShow:2.0.0") } diff --git a/module_mine/src/main/res/layout/mine_dialog_choose_find_type.xml b/module_mine/src/main/res/layout/mine_dialog_choose_find_type.xml index 9a950c8f0..daa5196ff 100644 --- a/module_mine/src/main/res/layout/mine_dialog_choose_find_type.xml +++ b/module_mine/src/main/res/layout/mine_dialog_choose_find_type.xml @@ -2,7 +2,7 @@ @@ -38,6 +38,7 @@ android:layout_height="1dp" android:background="@color/common_default_divide_line_color" /> + \ No newline at end of file diff --git a/module_store/build.gradle.kts b/module_store/build.gradle.kts index 22c80ae00..d67bd909b 100644 --- a/module_store/build.gradle.kts +++ b/module_store/build.gradle.kts @@ -19,11 +19,7 @@ dependLibBase() dependLibUtils() dependLibConfig() -configurations.all { - resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) -} - dependencies { - // 20 级郭祥瑞封装的 Banner 库 - implementation("io.github.985892345:SlideShow:2.0.0-SNAPSHOT") + // 20 级郭祥瑞封装的 Banner 库，如果有问题，欢迎来联系 👀 + implementation("io.github.985892345:SlideShow:2.0.0") }