diff --git a/BaseLibrary/src/main/java/com/tfq/library/app/BaseConstants.java b/BaseLibrary/src/main/java/com/tfq/library/app/BaseConstants.java index 123ebb9..f25524f 100644 --- a/BaseLibrary/src/main/java/com/tfq/library/app/BaseConstants.java +++ b/BaseLibrary/src/main/java/com/tfq/library/app/BaseConstants.java @@ -11,7 +11,7 @@ public class BaseConstants { /** * 自定义dialog使用的layout类型 */ - public static int dialog_layout = 2; + public static int dialog_layout = 0; /** * 自定义字符串 打印 @@ -38,7 +38,11 @@ public class BaseConstants { */ public final static String ANIMATION_SKIP = "animation_skip"; /** - * 自定义字符串 底部导航栏颜色 + * 自定义字符串 底部导航栏颜色 默认白色 */ public static String NAVIGATION_BAR_COLOR = "navigation_bar_color"; + /** + * 自定义字符串 dialog使用的layout类型 默认2 + */ + public static String DIALOG_LAYOUT = "dialog_layout"; } diff --git a/BaseLibrary/src/main/java/com/tfq/library/app/LibraryApp.java b/BaseLibrary/src/main/java/com/tfq/library/app/LibraryApp.java index 8103eed..80f3608 100644 --- a/BaseLibrary/src/main/java/com/tfq/library/app/LibraryApp.java +++ b/BaseLibrary/src/main/java/com/tfq/library/app/LibraryApp.java @@ -2,8 +2,10 @@ package com.tfq.library.app; import android.app.Application; import android.content.Context; +import android.text.TextUtils; import com.hjq.toast.Toaster; +import com.tfq.library.utils.AppUtil; import com.tfq.library.utils.LogK; import java.util.Collections; @@ -82,6 +84,21 @@ public class LibraryApp { // 初始化 Toast 框架 Toaster.init((Application) context); + + try { + String circumnavigational = getInstance().getSlotConfig(BaseConstants.NAVIGATION_BAR_COLOR); + if (!TextUtils.isEmpty(circumnavigational) && !circumnavigational.equals("0")) { + BaseConstants.navigationBarColor = circumnavigational; + } + String dialog_layout = getInstance().getSlotConfig(BaseConstants.DIALOG_LAYOUT); + if (AppUtil.regexIsNumber(dialog_layout)) { + BaseConstants.dialog_layout = Integer.parseInt(dialog_layout); + } + }catch (Exception e){ + e.printStackTrace(); + BaseConstants.navigationBarColor = "#FFFFFF"; + } + } } diff --git a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth.xml b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth.xml index 9afe6cd..d409e65 100644 --- a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth.xml +++ b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth.xml @@ -1,81 +1,85 @@ - + > + android:background="@drawable/library_ll_radius_white" + android:paddingLeft="15dp" + android:paddingTop="18dp" + android:paddingRight="15dp" + android:paddingBottom="18dp" + > + android:textSize="17dp" + android:textStyle="bold" + /> - - + android:textSize="13dp" + /> + android:orientation="horizontal" + > - - + android:textColor="@color/themeColorText" + android:textSize="13dp" + /> + android:textColor="@color/themeColorText" + android:textSize="13dp" + /> diff --git a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth2.xml b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth2.xml index b6dff27..9afe6cd 100644 --- a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth2.xml +++ b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth2.xml @@ -1,81 +1,81 @@ - + android:layout_marginTop="10dp"> + android:layout_marginTop="10dp" + android:background="@drawable/library_ll_radius_white"> + android:textColor="#FF333333" + android:textSize="16sp" + android:textStyle="bold" /> + android:textColor="#FF333333" + android:textSize="14sp" /> + + + android:gravity="center" + android:orientation="horizontal"> + android:textStyle="bold" /> + + + android:textColor="#37A96A" + android:textStyle="bold" /> diff --git a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth3.xml b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth3.xml index d409e65..b6dff27 100644 --- a/BaseLibrary/src/main/res/layout/library_layout_dialog_auth3.xml +++ b/BaseLibrary/src/main/res/layout/library_layout_dialog_auth3.xml @@ -6,23 +6,22 @@ > @@ -32,21 +31,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/tv_title" - android:layout_marginLeft="5dp" android:layout_marginTop="10dp" - android:layout_marginRight="5dp" - android:gravity="center" android:text="content" - android:textColor="#FF333333" - android:textSize="13dp" + android:textColor="#212121" + android:textSize="15dp" /> @@ -54,14 +50,14 @@ android:id="@+id/tv_left" android:layout_width="wrap_content" android:layout_height="36dp" - android:background="@drawable/library_button_radius_01" + android:background="@drawable/library_button_radius_02" android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="33dp" - android:paddingRight="33dp" + android:paddingLeft="20dp" + android:paddingRight="20dp" android:text="取消" - android:textColor="@color/themeColorText" + android:textColor="#ffffff" android:textSize="13dp" /> @@ -69,15 +65,15 @@ android:id="@+id/tv_right" android:layout_width="wrap_content" android:layout_height="36dp" - android:layout_marginLeft="35dp" - android:background="@drawable/library_button_radius_01" + android:layout_marginLeft="8dp" + android:background="@drawable/library_button_radius_02" android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="33dp" - android:paddingRight="33dp" + android:paddingLeft="20dp" + android:paddingRight="20dp" android:text="确定" - android:textColor="@color/themeColorText" + android:textColor="#ffffff" android:textSize="13dp" /> diff --git a/LibraryAdLib/proguard-rules.pro b/LibraryAdLib/proguard-rules.pro index 93c20ab..753becb 100644 --- a/LibraryAdLib/proguard-rules.pro +++ b/LibraryAdLib/proguard-rules.pro @@ -1,78 +1,78 @@ -## GroMore START -#-keep class bykvm*.** -#-keep class com.bytedance.msdk.adapter.**{ public *; } -#-keep class com.bytedance.msdk.api.** { -# public *; -#} -# -## baidu sdk 不接入baidu sdk可以不引入 -#-ignorewarnings -#-dontwarn com.baidu.mobads.sdk.api.** -#-keepclassmembers class * extends android.app.Activity { -# public void *(android.view.View); -#} -# -#-keepclassmembers enum * { -# public static **[] values(); -# public static ** valueOf(java.lang.String); -#} -# -#-keep class com.baidu.mobads.** { *; } -#-keep class com.style.widget.** {*;} -#-keep class com.component.** {*;} -#-keep class com.baidu.ad.magic.flute.** {*;} -#-keep class com.baidu.mobstat.forbes.** {*;} -# -##ks 不接入ks sdk可以不引入 -#-keep class org.chromium.** {*;} -#-keep class org.chromium.** { *; } -#-keep class aegon.chrome.** { *; } -#-keep class com.kwai.**{ *; } -#-dontwarn com.kwai.** -#-dontwarn com.kwad.** -#-dontwarn com.ksad.** -#-dontwarn aegon.chrome.** -# -## Admob 不接入admob sdk可以不引入 -#-keep class com.google.android.gms.ads.MobileAds { -# public *; -#} -# -##sigmob 不接入sigmob sdk可以不引入 -#-dontwarn android.support.v4.** -#-keep class android.support.v4.** { *; } -#-keep interface android.support.v4.** { *; } -#-keep public class * extends android.support.v4.** -# -#-keep class sun.misc.Unsafe { *; } -#-dontwarn com.sigmob.** -#-keep class com.sigmob.**.**{*;} -# -##oaid 不同的版本混淆代码不太一致,你注意你接入的oaid版本 ,不接入oaid可以不添加 -#-dontwarn com.bun.** -#-keep class com.bun.** {*;} -#-keep class a.**{*;} -#-keep class XI.CA.XI.**{*;} -#-keep class XI.K0.XI.**{*;} -#-keep class XI.XI.K0.**{*;} -#-keep class XI.vs.K0.**{*;} -#-keep class XI.xo.XI.XI.**{*;} -#-keep class com.asus.msa.SupplementaryDID.**{*;} -#-keep class com.asus.msa.sdid.**{*;} -#-keep class com.huawei.hms.ads.identifier.**{*;} -#-keep class com.samsung.android.deviceidservice.**{*;} -#-keep class com.zui.opendeviceidlibrary.**{*;} -#-keep class org.json.**{*;} -#-keep public class com.netease.nis.sdkwrapper.Utils {public ;} -# -# -##Mintegral 不接入Mintegral sdk,可以不引入 -#-keepattributes Signature -#-keepattributes *Annotation* -#-keep class com.mbridge.** {*; } -#-keep interface com.mbridge.** {*; } -#-keep class android.support.v4.** { *; } -#-dontwarn com.mbridge.** -#-keep class **.R$* { public static final int mbridge*; } -# -## Gromore END +# GroMore START +-keep class bykvm*.** +-keep class com.bytedance.msdk.adapter.**{ public *; } +-keep class com.bytedance.msdk.api.** { + public *; +} + +# baidu sdk 不接入baidu sdk可以不引入 +-ignorewarnings +-dontwarn com.baidu.mobads.sdk.api.** +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keep class com.baidu.mobads.** { *; } +-keep class com.style.widget.** {*;} +-keep class com.component.** {*;} +-keep class com.baidu.ad.magic.flute.** {*;} +-keep class com.baidu.mobstat.forbes.** {*;} + +#ks 不接入ks sdk可以不引入 +-keep class org.chromium.** {*;} +-keep class org.chromium.** { *; } +-keep class aegon.chrome.** { *; } +-keep class com.kwai.**{ *; } +-dontwarn com.kwai.** +-dontwarn com.kwad.** +-dontwarn com.ksad.** +-dontwarn aegon.chrome.** + +# Admob 不接入admob sdk可以不引入 +-keep class com.google.android.gms.ads.MobileAds { + public *; +} + +#sigmob 不接入sigmob sdk可以不引入 +-dontwarn android.support.v4.** +-keep class android.support.v4.** { *; } +-keep interface android.support.v4.** { *; } +-keep public class * extends android.support.v4.** + +-keep class sun.misc.Unsafe { *; } +-dontwarn com.sigmob.** +-keep class com.sigmob.**.**{*;} + +#oaid 不同的版本混淆代码不太一致,你注意你接入的oaid版本 ,不接入oaid可以不添加 +-dontwarn com.bun.** +-keep class com.bun.** {*;} +-keep class a.**{*;} +-keep class XI.CA.XI.**{*;} +-keep class XI.K0.XI.**{*;} +-keep class XI.XI.K0.**{*;} +-keep class XI.vs.K0.**{*;} +-keep class XI.xo.XI.XI.**{*;} +-keep class com.asus.msa.SupplementaryDID.**{*;} +-keep class com.asus.msa.sdid.**{*;} +-keep class com.huawei.hms.ads.identifier.**{*;} +-keep class com.samsung.android.deviceidservice.**{*;} +-keep class com.zui.opendeviceidlibrary.**{*;} +-keep class org.json.**{*;} +-keep public class com.netease.nis.sdkwrapper.Utils {public ;} + + +#Mintegral 不接入Mintegral sdk,可以不引入 +-keepattributes Signature +-keepattributes *Annotation* +-keep class com.mbridge.** {*; } +-keep interface com.mbridge.** {*; } +-keep class android.support.v4.** { *; } +-dontwarn com.mbridge.** +-keep class **.R$* { public static final int mbridge*; } + +# Gromore END diff --git a/README.md b/README.md index 31bddec..c0cfbb9 100644 --- a/README.md +++ b/README.md @@ -6,21 +6,20 @@ maven { url "http://124.221.136.193:3000/app-lib/JKBaseLib/raw/master/maven" allowInsecureProtocol = true // 允许HTTP - metadataSources { - artifact() // 强制校验POM文件 - } } ``` #### 模块的gradle ```java -implementation ('com.chuangketie.jk:base-lib:1.0.0@aar') { - transitive = true // 确保嵌套依赖被加载 -} -implementation ('com.chuangketie.jk:ad-lib:1.0.0@aar') { - transitive = true // 确保嵌套依赖被加载 -} +//Base_And_Ad +def lib_base_and_ad = "1.0.0" +implementation "com.chuangketie.jk:lib_base:$lib_base_and_ad" +implementation "com.chuangketie.jk:lib_ad:$lib_base_and_ad" +//noinspection Aligned16KB +implementation "com.chuangketie.jk:lib_ad_open_ad_sdk:$lib_base_and_ad" +implementation "com.chuangketie.jk:lib_ad_GDTSDK.unionNormal:$lib_base_and_ad" +implementation "com.chuangketie.jk:lib_ad_mediation_gdt_adapter:$lib_base_and_ad" ``` ## BASE @@ -29,6 +28,10 @@ new LibraryApp.Builder(this) .addSlot(LOG_PRINT, "log_print") //ANIMATION_SKIP 0:默认从右向左弹出; 1:淡入(Fade); 2://缩放+透明度(Scale + Fade); 3:缩放+透明度; 4:缩放+旋转; .addSlot(ANIMATION_SKIP,"0") +//导航栏颜色 默认白色 +.addSlot(NAVIGATION_BAR_COLOR,"#FFFFFF") +//dialog样式 默认0样式 +.addSlot(DIALOG_LAYOUT,"0") .initialize();//初始化 ``` diff --git a/app/proguard-rules-base.pro b/app/proguard-rules-base.pro index a22455c..6509b4f 100644 --- a/app/proguard-rules-base.pro +++ b/app/proguard-rules-base.pro @@ -69,6 +69,7 @@ + # 保留xpopup -dontwarn com.lxj.xpopup.widget.** -keep class com.lxj.xpopup.widget.**{*;} \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar index 5c3915f..919058a 100644 Binary files a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar and b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar differ diff --git a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.md5 b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.md5 index d045f4d..766b144 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.md5 +++ b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.md5 @@ -1 +1 @@ -a7123b0b259400fd33a915fe72cd2c65 \ No newline at end of file +1e01f53e698c66ac3a826850afd190aa \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha1 b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha1 index 8f74b2b..d739893 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha1 +++ b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha1 @@ -1 +1 @@ -2982aa69039b28cae87110739f31496dc6a456ec \ No newline at end of file +572c7cefed4426a72bdc1a629d5f2d10207845aa \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha256 b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha256 index 1c1b6c2..095ab6b 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha256 +++ b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha256 @@ -1 +1 @@ -0065fa7bc39d1f3ddfb86e97df1a5e49d14eb507edd5cfd0441bb3f10431a7c4 \ No newline at end of file +45e87bfdef9eb806446273d772d918ea43139d37f1b0b80198b283e002e5830e \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha512 b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha512 index ac218d2..b496d17 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha512 +++ b/maven/com/chuangketie/jk/lib_base/1.0.0/lib_base-1.0.0.aar.sha512 @@ -1 +1 @@ -cf922213132a047fbfc3e28930de4f2a49f7ed00429b878f0c1358a207970196c9e25205376fb9fce426d7696b7dad2130d428ebd2fa2307f9a1c4a53a58509a \ No newline at end of file +5b03fca2c8520de601107cfaef9f629f81877c8fa4fd3ae10502cedc177ed42b559a65b04be61fc63241ee1a9cc773800ad2ad4664b9cde63e1e8d10bd45516d \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml index a4f8fe6..cf0c879 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml @@ -8,6 +8,6 @@ 1.0.0 - 20250730091507 + 20250731021308 diff --git a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.md5 b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.md5 index 04e4278..a2930b8 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.md5 +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.md5 @@ -1 +1 @@ -67db98554fc53de005f925dc11c87e8b \ No newline at end of file +d513f7a21439f4707c881da48bad233a \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha1 b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha1 index 7768b2b..c901f4d 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha1 +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha1 @@ -1 +1 @@ -00bd285cefcc136f74221dc8a050051782f2fc8b \ No newline at end of file +383418a799351d39347826b04aa8f2ddc4edbf65 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha256 b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha256 index 8b9620e..48ab19f 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha256 +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha256 @@ -1 +1 @@ -f7ce41ef410839927cb895460e42feba3fcffb336534730008bc06140ca501c3 \ No newline at end of file +bd1cd644d5af8983d9827d5ba29a406b8cdef68b8e734f0fe074fc2fae778551 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha512 b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha512 index 03ae805..85cfbe0 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha512 +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml.sha512 @@ -1 +1 @@ -9e0330a456c00df20bf47afb936bfe5d6b9079995f5b324454ece4b2f5d018c75588db4ecd59834f312f74a6c12cf0bdc8037a754e30236b8595ea36bec05e25 \ No newline at end of file +ce13b85dc89fccb8ce456ec666740dd60e0b5ba35d58aba1b0a307bb416d35d0f82f4a1b2eb04a29ebe878b1f1abcc3b6881c5ee04a0311ee88ce98ba7ca1ac9 \ No newline at end of file