diff --git a/BaseLibrary/src/main/java/com/tfq/library/base/BaseFragment.java b/BaseLibrary/src/main/java/com/tfq/library/base/BaseFragment.java index dd556f2..ff86118 100644 --- a/BaseLibrary/src/main/java/com/tfq/library/base/BaseFragment.java +++ b/BaseLibrary/src/main/java/com/tfq/library/base/BaseFragment.java @@ -17,6 +17,8 @@ import com.hjq.permissions.permission.base.IPermission; import com.hjq.toast.Toaster; import com.tfq.library.R; import com.tfq.library.permission.PermissionConverter; +import com.tfq.library.permission.PermissionDescription; +import com.tfq.library.permission.PermissionInterceptor; import com.tfq.library.view.Animation; import java.util.List; @@ -69,6 +71,8 @@ public abstract class BaseFragment extends Fragment { protected void requestPermission(IPermission iPermissions, Listener listener) { XXPermissions.with(getActivity()) .permission(iPermissions) + .interceptor(new PermissionInterceptor()) + .description(new PermissionDescription()) .request(new OnPermissionCallback() { @Override public void onResult(@NonNull List grantedList, @NonNull List deniedList) { @@ -91,6 +95,8 @@ public abstract class BaseFragment extends Fragment { protected void requestPermission(IPermission[] iPermissions, Listener listener) { XXPermissions.with(getActivity()) .permissions(iPermissions) + .interceptor(new PermissionInterceptor()) + .description(new PermissionDescription()) .request(new OnPermissionCallback() { @Override public void onResult(@NonNull List grantedList, @NonNull List deniedList) { diff --git a/LibraryAd/build.gradle b/LibraryAd/build.gradle index 2ee4c0a..7798651 100644 --- a/LibraryAd/build.gradle +++ b/LibraryAd/build.gradle @@ -46,11 +46,11 @@ dependencies { } else { //线上使用这个,因为是线上库 //假如使用这个的话,需要先将LibraryAdLib进行publish后再同步项目,更新下来 -// implementation "com.chuangketie.jk:lib_ad_GDTSDK.unionNormal:$rootProject.maven_version.adlib_version" -// implementation "com.chuangketie.jk:lib_ad_mediation_gdt_adapter:$rootProject.maven_version.adlib_version" -// implementation "com.chuangketie.jk:lib_ad_open_ad_sdk:$rootProject.maven_version.adlib_version" + implementation "com.chuangketie.jk:lib_ad_GDTSDK.unionNormal:$rootProject.maven_version.adlib_aar_version" + implementation "com.chuangketie.jk:lib_ad_mediation_gdt_adapter:$rootProject.maven_version.adlib_aar_version" + implementation "com.chuangketie.jk:lib_ad_open_ad_sdk:$rootProject.maven_version.adlib_aar_version" - compileOnly fileTree(dir: '../LibraryAdLib/libs', include: ['*.aar']) +// implementation fileTree(dir: '../LibraryAdLib/libs', include: ['*.aar']) } } diff --git a/app/src/main/java/com/tfq/finances/main/Activity_Main.java b/app/src/main/java/com/tfq/finances/main/Activity_Main.java index a768dd8..27abb87 100644 --- a/app/src/main/java/com/tfq/finances/main/Activity_Main.java +++ b/app/src/main/java/com/tfq/finances/main/Activity_Main.java @@ -11,14 +11,13 @@ import androidx.viewpager2.widget.ViewPager2; import com.google.gson.Gson; import com.tfq.demo.R; +import com.tfq.finances.main.fragment.Fm_Page_A; +import com.tfq.finances.main.fragment.Fm_Page_S; import com.tfq.finances.network.api.userinfo.UserInfoService; import com.tfq.finances.network.config.ApiCallback; -import com.tfq.finances.network.model.response.userinfo.UserInfoData; import com.tfq.finances.network.model.response.userinfo.UserInfoResp; import com.tfq.library.adapter.MyFragmentStateAdapter; import com.tfq.library.base.BaseActivity; -import com.tfq.finances.main.fragment.Fm_Page_A; -import com.tfq.finances.main.fragment.Fm_Page_S; import com.tfq.library.utils.LogK; import com.tfq.library.utils.ToasterUtil; @@ -83,7 +82,7 @@ public class Activity_Main extends BaseActivity { if (viewId == R.id.iv_page01 && !mOnPage) { viewPager.setCurrentItem(0); toTime(); - }else if (viewId == R.id.iv_page10 && !mOnPage) { + } else if (viewId == R.id.iv_page10 && !mOnPage) { viewPager.setCurrentItem(2); toTime(); } diff --git a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java index 9f8c009..f5576ca 100644 --- a/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java +++ b/app/src/main/java/com/tfq/finances/main/fragment/Fm_Page_A.java @@ -15,6 +15,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; +import com.hjq.permissions.permission.PermissionLists; import com.tfq.ad.ad.AdBannerUtils; import com.tfq.ad.ad.AdCQPUtils; import com.tfq.ad.ad.AdFeedUtils; @@ -115,7 +116,13 @@ public class Fm_Page_A extends BaseFragment { } else if (viewId == R.id.ll_3) { AdFeedUtils.show_ad(getActivity(), App.getInstances().getCsjIdFeed1(), fl_content,20, "page_01",1); } else if (viewId == R.id.ll_4) { - AdBannerUtils.show_ad(getActivity(), fl_content); +// AdBannerUtils.show_ad(getActivity(), fl_content); + requestPermission(PermissionLists.getManageExternalStoragePermission(), new Listener() { + @Override + public void success() { + + } + }); } } } diff --git a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar index 5122cda..abf9afd 100644 Binary files a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar and b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar differ diff --git a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.md5 b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.md5 index 1db753a..a86ebb9 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.md5 +++ b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.md5 @@ -1 +1 @@ -8484d44231bc0a42d661517b25bcf324 \ No newline at end of file +98b07722b1460fe77717dbd7ad95be80 \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha1 b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha1 index deb0384..8e0ed62 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha1 +++ b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha1 @@ -1 +1 @@ -cbb875fe2eed61f4175f5d06b03701b69e6b0ab9 \ No newline at end of file +66df3330a1e4876fa6d406325440cab408891cee \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha256 b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha256 index 1629d81..94c7151 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha256 +++ b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha256 @@ -1 +1 @@ -2115630d449cbe8977ce7d33a093b5e7c0d5342574e78ef4a721a4de41a22a5b \ No newline at end of file +b609c2becbe101f1b1c5c5c97eb8f269d32101d17422bbfbc9c54f89f5abdfac \ No newline at end of file diff --git a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha512 b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha512 index b190611..3784c52 100644 --- a/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha512 +++ b/maven/com/chuangketie/jk/lib_base/1.0.1/lib_base-1.0.1.aar.sha512 @@ -1 +1 @@ -aff9f0a6f957794a8551d622e37b202256d5e24ed3ee14c3be8c500461dc4b2f456dadc7235b83938ed40431413a8e438ed9becc76f39624cf9f9005a16507ec \ No newline at end of file +4726c207547ece5f2cf24c66a592522c83b5a1d0f61d663ba3e5d1ba730c1d534e1c23cc2ad39f48773d75659b98e71587ddfb2e5d0e1c15d9a3a9418717fc37 \ 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 51cb8d1..e559916 100644 --- a/maven/com/chuangketie/jk/lib_base/maven-metadata.xml +++ b/maven/com/chuangketie/jk/lib_base/maven-metadata.xml @@ -9,6 +9,6 @@ 1.0.0 1.0.1 - 20251120082435 + 20251120090245 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 8b4abb3..faa9b1e 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 @@ -c0eb4b622c9b34b5ed5b2a7f35607749 \ No newline at end of file +06cffa3a392d2bacba3eb72c074c80be \ 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 35dd7bf..198f694 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 @@ -5f09b653ebd212a50527b8f7c0090da8a08d53db \ No newline at end of file +9beb5b57f1a6170d2d27b1494aed2a0322a684f5 \ 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 51a0e0e..0d9df41 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 @@ -9832aa356914d02dbfb6fb17707e35b8907ee1b732decb2e084d6b6ac1fae916 \ No newline at end of file +3ef475bfae532db8a454cb2db79fa9a56887478cd0c33f1cc3e8fef9da5b260f \ 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 2688e6c..b9633bd 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 @@ -c6644c0c74578920dbcabc210653858b599728a5fafcfc8d6aa6aa434e7fa1df9091648b8bf625e142acc0ce9ddfc059188c3f81fc683cb4007a604c8592429b \ No newline at end of file +aa9cbb74ef05ab26e73a340932551d02d623f1184c4bcf0c97561357072066f855827304d5daa838f3c9239f8e967343af01c611951df7e925386814245dbea2 \ No newline at end of file