From 31e12c294e5d0c0267d9db1507200a2f4eb19624 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Fri, 29 Apr 2022 18:18:41 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ARouter=E5=92=8Cweb?= =?UTF-8?q?=E7=9A=84module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- app/proguard-rules.pro | 8 +- .../collect/article/CollectArticleFragment.kt | 10 +- build.gradle | 2 +- config.gradle | 6 +- gradle.properties | 4 +- lib_base/build.gradle | 11 ++ lib_base/proguard-rules.pro | 129 +------------ module_web/.gitignore | 1 + module_web/build.gradle | 41 +++++ module_web/proguard-rules.pro | 21 +++ .../module_web/ExampleInstrumentedTest.kt | 24 +++ module_web/src/main/AndroidManifest.xml | 13 ++ .../drawable-v24/ic_launcher_foreground.xml | 30 ++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/themes.xml | 16 ++ module_web/src/main/res/values/colors.xml | 10 ++ module_web/src/main/res/values/strings.xml | 3 + module_web/src/main/res/values/themes.xml | 16 ++ .../com/btpj/module_web/ExampleUnitTest.kt | 17 ++ settings.gradle | 1 + 33 files changed, 408 insertions(+), 139 deletions(-) create mode 100644 module_web/.gitignore create mode 100644 module_web/build.gradle create mode 100644 module_web/proguard-rules.pro create mode 100644 module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt create mode 100644 module_web/src/main/AndroidManifest.xml create mode 100644 module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 module_web/src/main/res/drawable/ic_launcher_background.xml create mode 100644 module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 module_web/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 module_web/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_web/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 module_web/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 module_web/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_web/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 module_web/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_web/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 module_web/src/main/res/values-night/themes.xml create mode 100644 module_web/src/main/res/values/colors.xml create mode 100644 module_web/src/main/res/values/strings.xml create mode 100644 module_web/src/main/res/values/themes.xml create mode 100644 module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt diff --git a/README.md b/README.md index f0da253..ea25ed1 100644 --- a/README.md +++ b/README.md @@ -32,5 +32,5 @@ MVVM版：使用kotlin+协程+liveData+viewModel+dataBinding构造的MVVM架构 - [Gitee](https://gitee.com/BTPJ_git/WanAndroid/tree/MVVM) ## 致谢 -- WanAndroid网站提供的开放Api, 和里面的一些优秀开源项目和文章 -- 参考鸡哥的些许样式和代码：https://github.com/hegaojian/JetpackMvvm +- WanAndroid网站提供的开放API, 和里面的一些优秀开源项目和文章 +- 参考鸡哥的些许样式和代码：https://github.com/hegaojian/JetpackMvvm \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 70ddb6f..3857df0 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -145,4 +145,10 @@ public (android.view.View); # bugly混淆 -dontwarn com.tencent.bugly.** --keep public class com.tencent.bugly.**{*;} \ No newline at end of file +-keep public class com.tencent.bugly.**{*;} + +# ARouter混淆 +-keep public class com.alibaba.android.arouter.routes.**{*;} +-keep public class com.alibaba.android.arouter.facade.**{*;} +-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;} +-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt index c67f426..94d53ad 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt @@ -78,11 +78,11 @@ class CollectArticleFragment : for (position in mAdapter.data.indices) { if (mAdapter.data[position].id == it.id) { // 取消收藏再次收藏会回到第一个,收藏时间也会变为 “刚刚” - // -----不想重新请求刷新的话，这种处理会有问题--start------- - // mAdapter.data[position].niceDate = "刚刚" - // mAdapter.notifyItemChanged(position) - // mAdapter.notifyItemMoved(position, 0) - // --------------------end------------------------------- + /**-----不想重新请求刷新的话，这种处理会有问题---start--------- + mAdapter.data[position].niceDate = "刚刚" + mAdapter.notifyItemChanged(position) + mAdapter.notifyItemMoved(position, 0) + --------------------end--------------------------------*/ // 采用直接操作List的方式,分页请求时重新刷新体验不太好 val oldList = ArrayList(mAdapter.data) diff --git a/build.gradle b/build.gradle index fc2d1ac..171033a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.application' version '7.1.3' apply false id 'com.android.library' version '7.1.3' apply false - id 'org.jetbrains.kotlin.android' version '1.6.20' apply false + id 'org.jetbrains.kotlin.android' version '1.6.21' apply false } apply from: 'config.gradle' diff --git a/config.gradle b/config.gradle index bd0eca9..2f963f6 100644 --- a/config.gradle +++ b/config.gradle @@ -58,6 +58,10 @@ ext { // 应用优化升级 bugly_update : 'com.tencent.bugly:crashreport_upgrade:1.5.23', bugly_nativecrashreport : 'com.tencent.bugly:nativecrashreport:3.7.1', - leakcanary : 'com.squareup.leakcanary:leakcanary-android:2.9.1' + leakcanary : 'com.squareup.leakcanary:leakcanary-android:2.9.1', + + // ARouter路由框架 + arouter_api : 'com.alibaba:arouter-api:1.5.2', + arouter_compiler : 'com.alibaba:arouter-compiler:1.5.2', ] } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index cd0519b..831abc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/lib_base/build.gradle b/lib_base/build.gradle index e14aa28..e35a294 100644 --- a/lib_base/build.gradle +++ b/lib_base/build.gradle @@ -13,6 +13,13 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" + + // ARouter配置 + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) + } + } } buildTypes { @@ -65,4 +72,8 @@ dependencies { api rootProject.ext.dependencies.converterGson api rootProject.ext.dependencies.loggingInterceptor api rootProject.ext.dependencies.PersistentCookieJar + + // ARouter路由 + api rootProject.ext.dependencies.arouter_api + kapt rootProject.ext.dependencies.arouter_compiler } \ No newline at end of file diff --git a/lib_base/proguard-rules.pro b/lib_base/proguard-rules.pro index aba0d3f..481bb43 100644 --- a/lib_base/proguard-rules.pro +++ b/lib_base/proguard-rules.pro @@ -18,131 +18,4 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile - -############## 对于一些基本指令的添加start ################## -# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改 --optimizationpasses 5 -# 混合时不使用大小写混合，混合后的类名为小写 --dontusemixedcaseclassnames -# 指定不去忽略非公共库的类 --dontskipnonpubliclibraryclasses -# 这句话能够使我们的项目混淆后产生映射文件 -# 包含有类名->混淆后类名的映射关系 --verbose -# 指定不去忽略非公共库的类成员 --dontskipnonpubliclibraryclassmembers -# 不做预校验，preverify是proguard的四个步骤之一，Android不需要preverify，去掉这一步能够加快混淆速度。 --dontpreverify -# 忽略警告 --ignorewarnings -# 保留Annotation不混淆 --keepattributes *Annotation*,InnerClasses -# 避免混淆泛型 --keepattributes Signature -# 抛出异常时保留代码行号 --keepattributes SourceFile,LineNumberTable -# 指定混淆是采用的算法，后面的参数是一个过滤器 -# 这个过滤器是谷歌推荐的算法，一般不做更改 --optimizations !code/simplification/cast,!field/*,!class/merging/* -############### 对于一些基本指令的添加end ######################### - - -############### Android开发中一些需要保留的公共部分start ################## -# 保留我们使用的四大组件，自定义的Application等等这些类不被混淆,因为这些子类都有可能被外部调用 --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class * extends android.view.View -# 保留support下的所有类及其内部类 --keep class android.support.** {*;} -# 保留继承的 --keep public class * extends android.support.v4.** --keep public class * extends android.support.v7.** --keep public class * extends android.support.annotation.** -# Androidx的混淆 --keep class com.google.android.material.** {*;} --keep class androidx.** {*;} --keep public class * extends androidx.** --keep interface androidx.** {*;} --dontwarn com.google.android.material.** --dontnote com.google.android.material.** --dontwarn androidx.** -# 保留R下面的资源 --keep class **.R$* {*;} -# 保留本地native方法不被混淆 --keepclasseswithmembernames class * { native ;} -# 保留在Activity中的方法参数是view的方法， -# 这样以来我们在layout中写的onClick就不会被影响 --keepclassmembers class * extends android.app.Activity{ public void *(android.view.View);} -# 保留枚举类不被混淆 --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} -# 保留我们自定义控件（继承自View）不被混淆 --keep public class * extends android.view.View{ - *** get*(); - void set*(***); - public (android.content.Context); - public (android.content.Context, android.util.AttributeSet); - public (android.content.Context, android.util.AttributeSet, int); -} -# 保留Parcelable序列化类不被混淆 --keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *;} -# 保留Serializable序列化的类不被混淆 --keepnames class * implements java.io.Serializable --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - private static final java.io.ObjectStreamField[] serialPersistentFields; - !static !transient ; - !private ; - !private ; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} -# 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆 --keepclassmembers class * { - void *(**On*Event); - void *(**On*Listener); -} - -# 所有实体类不能混淆 model文件夹下的所有实体类不能混淆 --keep class com.btpj.lib_base.data.bean.** {*;} --keep class com.btpj.wanandroid.data.** {*;} -############### Android开发中一些需要保留的公共部分end ################## - - -############### 第三方库中的混淆规则start ############################## -# BaseRecyclerViewAdapterHelper混淆 --keep public class * extends com.chad.library.adapter.base.viewholder.BaseViewHolder --keep public class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder --keepclassmembers class com.chad.library.adapter.base.viewholder.BaseDataBindingHolder { -public void *(android.view.View); -} --keepclassmembers class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder { -public void *(android.view.View); -} - -# Glide混淆 --keep public class * implements com.bumptech.glide.module.GlideModule --keep class * extends com.bumptech.glide.module.AppGlideModule { - (...); -} --keep public enum com.bumptech.glide.load.ImageHeaderParser$** { - **[] $VALUES; - public *; -} --keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { - *** rewind(); -} - -# bugly混淆 --dontwarn com.tencent.bugly.** --keep public class com.tencent.bugly.**{*;} \ No newline at end of file +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_web/.gitignore b/module_web/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_web/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_web/build.gradle b/module_web/build.gradle new file mode 100644 index 0000000..02ab711 --- /dev/null +++ b/module_web/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + compileSdk 32 + + defaultConfig { + applicationId "com.btpj.module_web" + minSdk 21 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'com.google.android.material:material:1.4.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' +} \ No newline at end of file diff --git a/module_web/proguard-rules.pro b/module_web/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_web/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt b/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..1c58999 --- /dev/null +++ b/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_web + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_web", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_web/src/main/AndroidManifest.xml b/module_web/src/main/AndroidManifest.xml new file mode 100644 index 0000000..81efe2a --- /dev/null +++ b/module_web/src/main/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml b/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/module_web/src/main/res/drawable/ic_launcher_background.xml b/module_web/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/module_web/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/module_web/src/main/res/mipmap-hdpi/ic_launcher.webp b/module_web/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/module_web/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_web/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/module_web/src/main/res/mipmap-xhdpi/ic_launcher.webp b/module_web/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/module_web/src/main/res/values-night/themes.xml b/module_web/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..5e6335c --- /dev/null +++ b/module_web/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_web/src/main/res/values/colors.xml b/module_web/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/module_web/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/module_web/src/main/res/values/strings.xml b/module_web/src/main/res/values/strings.xml new file mode 100644 index 0000000..45e69bc --- /dev/null +++ b/module_web/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + module_web + \ No newline at end of file diff --git a/module_web/src/main/res/values/themes.xml b/module_web/src/main/res/values/themes.xml new file mode 100644 index 0000000..cd94d18 --- /dev/null +++ b/module_web/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt b/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt new file mode 100644 index 0000000..cf8aec7 --- /dev/null +++ b/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_web + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f3bcd7c..d7192a2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,3 +17,4 @@ dependencyResolutionManagement { rootProject.name = "WanAndroid" include ':app' include ':lib_base' +include ':module_web' From a50c8e857960ce794c37a98997dce063d7a36e34 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Thu, 5 May 2022 13:28:07 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=B0lib=5Fbase=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 - app/src/main/AndroidManifest.xml | 2 +- .../main/java/com/btpj/wanandroid/base/App.kt | 25 -- .../btpj/wanandroid/data/DataRepository.kt | 3 +- .../btpj/wanandroid/data/bean/Navigation.kt | 2 + .../btpj/wanandroid/data/bean/OtherAuthor.kt | 1 + .../com/btpj/wanandroid/data/bean/Share.kt | 1 + .../java/com/btpj/wanandroid/data/http/Api.kt | 3 +- .../btpj/wanandroid/data/local/UserManager.kt | 2 +- .../wanandroid/ui/author/AuthorActivity.kt | 10 +- .../wanandroid/ui/author/AuthorViewModel.kt | 2 +- .../collect/article/CollectArticleAdapter.kt | 2 +- .../collect/article/CollectArticleFragment.kt | 6 +- .../article/CollectArticleViewModel.kt | 2 +- .../ui/collect/url/CollectUrlAdapter.kt | 2 +- .../ui/collect/url/CollectUrlFragment.kt | 2 +- .../ui/collect/url/CollectUrlViewModel.kt | 2 +- .../ui/integral/rank/IntegralRankActivity.kt | 6 +- .../wanandroid/ui/login/LoginViewModel.kt | 2 +- .../wanandroid/ui/main/home/ArticleAdapter.kt | 2 +- .../wanandroid/ui/main/home/HomeFragment.kt | 10 +- .../wanandroid/ui/main/home/HomeViewModel.kt | 4 +- .../ui/main/home/MyBannerAdapter.kt | 2 +- .../wanandroid/ui/main/mine/MineFragment.kt | 6 +- .../wanandroid/ui/main/mine/MineViewModel.kt | 2 +- .../ui/main/project/ImageArticleAdapter.kt | 2 +- .../ui/main/project/ProjectChildFragment.kt | 8 +- .../ui/main/project/ProjectChildViewModel.kt | 2 +- .../ui/main/square/ask/AskFragment.kt | 8 +- .../ui/main/square/ask/AskViewModel.kt | 2 +- .../navigation/NavigationChildAdapter.kt | 2 +- .../main/square/square/SquareChildFragment.kt | 8 +- .../square/square/SquareChildViewModel.kt | 2 +- .../ui/main/wechat/WechatChildFragment.kt | 8 +- .../ui/main/wechat/WechatChildViewModel.kt | 2 +- .../ui/search/result/SearchResultActivity.kt | 8 +- .../ui/search/result/SearchResultViewModel.kt | 2 +- .../wanandroid/ui/setting/SettingActivity.kt | 4 +- .../wanandroid/ui/setting/SettingViewModel.kt | 2 +- .../ui/share/add/AddArticleActivity.kt | 2 +- .../ui/share/list/MyArticleActivity.kt | 6 +- .../ui/share/list/MyArticleAdapter.kt | 2 +- .../ui/share/list/MyArticleViewModel.kt | 2 +- .../com/btpj/wanandroid/ui/web/WebActivity.kt | 5 +- .../btpj/wanandroid/ui/web/WebViewModel.kt | 2 +- app/src/main/res/layout/list_item_article.xml | 2 +- .../res/layout/list_item_article_image.xml | 2 +- .../res/layout/list_item_collect_article.xml | 2 +- .../main/res/layout/list_item_collect_url.xml | 2 +- .../res/layout/list_item_share_article.xml | 2 +- lib_base/build.gradle | 9 + .../btpj/lib_base/{BaseApp.kt => base/App.kt} | 12 +- .../com/btpj/lib_base}/base/AppViewModel.kt | 7 +- .../com/btpj/lib_base}/data/bean/Article.kt | 3 +- .../com/btpj/lib_base}/data/bean/Banner.kt | 2 +- .../lib_base}/data/bean/CollectArticle.kt | 2 +- .../btpj/lib_base}/data/bean/CollectData.kt | 2 +- .../btpj/lib_base}/data/bean/CollectUrl.kt | 2 +- .../java/com/btpj/lib_base}/data/bean/Tag.kt | 2 +- .../java/com/btpj/lib_base}/data/bean/User.kt | 2 +- .../com/btpj/lib_base/http/RetrofitManager.kt | 2 +- .../http/interceptor/CacheInterceptor.kt | 2 +- lib_base/src/main/res/drawable/ic_collect.xml | 9 + .../src/main/res/drawable/ic_un_collect.xml | 9 + module_web/build.gradle | 12 +- .../btpj/module_web/data/DataRepository.kt | 34 +++ .../java/com/btpj/module_web/data/http/Api.kt | 33 +++ .../com/btpj/module_web/ui/web/WebActivity.kt | 278 ++++++++++++++++++ .../btpj/module_web/ui/web/WebViewModel.kt | 64 ++++ .../src/main/res/layout/activity_web.xml | 32 ++ module_web/src/main/res/menu/menu_web.xml | 21 ++ module_web/src/main/res/values/strings.xml | 5 + module_web/src/main/res/values/themes.xml | 10 + 73 files changed, 617 insertions(+), 132 deletions(-) delete mode 100644 app/src/main/java/com/btpj/wanandroid/base/App.kt rename lib_base/src/main/java/com/btpj/lib_base/{BaseApp.kt => base/App.kt} (76%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/base/AppViewModel.kt (71%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Article.kt (92%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Banner.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/CollectArticle.kt (93%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/CollectData.kt (83%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/CollectUrl.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Tag.kt (82%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/User.kt (93%) create mode 100644 lib_base/src/main/res/drawable/ic_collect.xml create mode 100644 lib_base/src/main/res/drawable/ic_un_collect.xml create mode 100644 module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt create mode 100644 module_web/src/main/java/com/btpj/module_web/data/http/Api.kt create mode 100644 module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt create mode 100644 module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt create mode 100644 module_web/src/main/res/layout/activity_web.xml create mode 100644 module_web/src/main/res/menu/menu_web.xml diff --git a/app/build.gradle b/app/build.gradle index d7755a6..1167dc5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,9 +81,4 @@ dependencies { implementation rootProject.ext.dependencies.banner implementation rootProject.ext.dependencies.agentWeb implementation rootProject.ext.dependencies.flexbox - implementation rootProject.ext.dependencies.AndroidAutoSize - implementation rootProject.ext.dependencies.bugly_update - implementation rootProject.ext.dependencies.bugly_nativecrashreport - // 使用debugImplementation只在调试时引入 - debugImplementation rootProject.ext.dependencies.leakcanary } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8f0eed2..5c46dfb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ package="com.btpj.wanandroid"> >() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt index fb5b88a..52ce8b6 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt @@ -10,9 +10,10 @@ import android.webkit.WebView import android.widget.FrameLayout import androidx.core.content.ContextCompat import com.btpj.lib_base.ext.initClose -import com.btpj.lib_base.ext.initTitle import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.App +import com.btpj.lib_base.base.App +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.ext.initTitle import com.btpj.wanandroid.base.BaseActivity import com.btpj.wanandroid.data.bean.* import com.btpj.wanandroid.databinding.ActivityWebBinding diff --git a/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt index 83c4f9f..02059ed 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt @@ -4,7 +4,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.CollectUrl +import com.btpj.lib_base.data.bean.CollectUrl /** * @author LTP 2022/4/2 diff --git a/app/src/main/res/layout/list_item_article.xml b/app/src/main/res/layout/list_item_article.xml index 8e492e4..2068a5a 100644 --- a/app/src/main/res/layout/list_item_article.xml +++ b/app/src/main/res/layout/list_item_article.xml @@ -7,7 +7,7 @@ + type="com.btpj.lib_base.data.bean.Article" /> diff --git a/app/src/main/res/layout/list_item_article_image.xml b/app/src/main/res/layout/list_item_article_image.xml index ccced1d..0f58924 100644 --- a/app/src/main/res/layout/list_item_article_image.xml +++ b/app/src/main/res/layout/list_item_article_image.xml @@ -7,7 +7,7 @@ + type="com.btpj.lib_base.data.bean.Article" /> diff --git a/app/src/main/res/layout/list_item_collect_article.xml b/app/src/main/res/layout/list_item_collect_article.xml index 53dfc41..91d6112 100644 --- a/app/src/main/res/layout/list_item_collect_article.xml +++ b/app/src/main/res/layout/list_item_collect_article.xml @@ -7,7 +7,7 @@ + type="com.btpj.lib_base.data.bean.CollectArticle" /> diff --git a/app/src/main/res/layout/list_item_collect_url.xml b/app/src/main/res/layout/list_item_collect_url.xml index a316e90..a8c2f44 100644 --- a/app/src/main/res/layout/list_item_collect_url.xml +++ b/app/src/main/res/layout/list_item_collect_url.xml @@ -7,7 +7,7 @@ + type="com.btpj.lib_base.data.bean.CollectUrl" /> diff --git a/app/src/main/res/layout/list_item_share_article.xml b/app/src/main/res/layout/list_item_share_article.xml index 0de9d7f..4dde92b 100644 --- a/app/src/main/res/layout/list_item_share_article.xml +++ b/app/src/main/res/layout/list_item_share_article.xml @@ -7,7 +7,7 @@ + type="com.btpj.lib_base.data.bean.Article" /> diff --git a/lib_base/build.gradle b/lib_base/build.gradle index e35a294..f1d45fd 100644 --- a/lib_base/build.gradle +++ b/lib_base/build.gradle @@ -2,6 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-kapt' + id 'kotlin-parcelize' } android { @@ -60,6 +61,7 @@ dependencies { api rootProject.ext.dependencies.materialDialogsCore api rootProject.ext.dependencies.materialDialogsLifecycle api rootProject.ext.dependencies.materialDialogsbottomsheets + api rootProject.ext.dependencies.AndroidAutoSize // 存储相关 api rootProject.ext.dependencies.mmkv @@ -76,4 +78,11 @@ dependencies { // ARouter路由 api rootProject.ext.dependencies.arouter_api kapt rootProject.ext.dependencies.arouter_compiler + + // bugly + api rootProject.ext.dependencies.bugly_update + api rootProject.ext.dependencies.bugly_nativecrashreport + + // 使用debugApi只在调试时引入 + debugApi rootProject.ext.dependencies.leakcanary } \ No newline at end of file diff --git a/lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt b/lib_base/src/main/java/com/btpj/lib_base/base/App.kt similarity index 76% rename from lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt rename to lib_base/src/main/java/com/btpj/lib_base/base/App.kt index af77a45..8330601 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/App.kt @@ -1,10 +1,12 @@ -package com.btpj.lib_base +package com.btpj.lib_base.base import android.app.Application import android.content.Context import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelStore import androidx.lifecycle.ViewModelStoreOwner +import com.btpj.lib_base.BuildConfig +import com.tencent.bugly.Bugly import com.tencent.mmkv.MMKV import kotlin.properties.Delegates @@ -13,22 +15,28 @@ import kotlin.properties.Delegates * * @author LTP 2022/3/21 */ -open class BaseApp : Application(), ViewModelStoreOwner { +class App : Application(), ViewModelStoreOwner { private lateinit var mAppViewModelStore: ViewModelStore private var mFactory: ViewModelProvider.Factory? = null companion object { var appContext: Context by Delegates.notNull() + + lateinit var appViewModel: AppViewModel } override fun onCreate() { super.onCreate() appContext = applicationContext mAppViewModelStore = ViewModelStore() + appViewModel = getAppViewModelProvider().get(AppViewModel::class.java) // MMKV初始化 MMKV.initialize(this) + + // bugly初始化 + Bugly.init(applicationContext, "99ff7c64d9", BuildConfig.DEBUG) } /** 获取一个全局的ViewModel */ diff --git a/app/src/main/java/com/btpj/wanandroid/base/AppViewModel.kt b/lib_base/src/main/java/com/btpj/lib_base/base/AppViewModel.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/base/AppViewModel.kt rename to lib_base/src/main/java/com/btpj/lib_base/base/AppViewModel.kt index a752f17..29396b2 100644 --- a/app/src/main/java/com/btpj/wanandroid/base/AppViewModel.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/AppViewModel.kt @@ -1,9 +1,8 @@ -package com.btpj.wanandroid.base +package com.btpj.lib_base.base import androidx.lifecycle.MutableLiveData -import com.btpj.lib_base.base.BaseViewModel -import com.btpj.wanandroid.data.bean.CollectData -import com.btpj.wanandroid.data.bean.User +import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.data.bean.User /** * App全局ViewModel可直接替代EventBus diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Article.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Article.kt similarity index 92% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Article.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Article.kt index 36f2a20..8f5e4b9 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Article.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Article.kt @@ -1,6 +1,7 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable +import com.btpj.lib_base.data.bean.Tag import kotlinx.parcelize.Parcelize /** diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Banner.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Banner.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Banner.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Banner.kt index dad12dd..0af759c 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Banner.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Banner.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectArticle.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt similarity index 93% rename from app/src/main/java/com/btpj/wanandroid/data/bean/CollectArticle.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt index 2dda3f9..d4d7e91 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectArticle.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectData.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt similarity index 83% rename from app/src/main/java/com/btpj/wanandroid/data/bean/CollectData.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt index 48cf6e8..583bad5 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectData.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean /** * 收藏实体，主要用于全局收藏事件Event diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectUrl.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/data/bean/CollectUrl.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt index d84ed88..3bc41f9 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/CollectUrl.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Tag.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Tag.kt similarity index 82% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Tag.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Tag.kt index 6839b78..34cceb9 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Tag.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Tag.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/User.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/User.kt similarity index 93% rename from app/src/main/java/com/btpj/wanandroid/data/bean/User.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/User.kt index 1ef378d..9d73fc6 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/User.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/User.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt b/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt index 1058c5d..e1f11ed 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt @@ -1,6 +1,6 @@ package com.btpj.lib_base.http -import com.btpj.lib_base.BaseApp.Companion.appContext +import com.btpj.lib_base.base.App.Companion.appContext import com.btpj.lib_base.data.local.IpManager import com.btpj.lib_base.http.interceptor.CacheInterceptor import com.btpj.lib_base.http.interceptor.logInterceptor diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt index 69a6d75..d4133ce 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt @@ -1,6 +1,6 @@ package com.btpj.lib_base.http.interceptor -import com.btpj.lib_base.BaseApp.Companion.appContext +import com.btpj.lib_base.base.App.Companion.appContext import com.btpj.lib_base.utils.NetworkUtil import okhttp3.CacheControl import okhttp3.Interceptor diff --git a/lib_base/src/main/res/drawable/ic_collect.xml b/lib_base/src/main/res/drawable/ic_collect.xml new file mode 100644 index 0000000..8ea16be --- /dev/null +++ b/lib_base/src/main/res/drawable/ic_collect.xml @@ -0,0 +1,9 @@ + + + diff --git a/lib_base/src/main/res/drawable/ic_un_collect.xml b/lib_base/src/main/res/drawable/ic_un_collect.xml new file mode 100644 index 0000000..2f1d659 --- /dev/null +++ b/lib_base/src/main/res/drawable/ic_un_collect.xml @@ -0,0 +1,9 @@ + + + diff --git a/module_web/build.gradle b/module_web/build.gradle index 02ab711..b23399a 100644 --- a/module_web/build.gradle +++ b/module_web/build.gradle @@ -29,13 +29,13 @@ android { kotlinOptions { jvmTarget = '1.8' } + buildFeatures { + dataBinding true + } } dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.3.0' - implementation 'com.google.android.material:material:1.4.0' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation project(path: ':lib_base') + + implementation rootProject.ext.dependencies.agentWeb } \ No newline at end of file diff --git a/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt b/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt new file mode 100644 index 0000000..9baaaa4 --- /dev/null +++ b/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt @@ -0,0 +1,34 @@ +package com.btpj.module_web.data + +import com.btpj.lib_base.data.bean.ApiResponse +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.lib_base.data.bean.CollectUrl +import com.btpj.module_web.data.http.Api + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun collectArticle(id: Int): ApiResponse { + return apiCall { service.collectArticle(id) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } + +} \ No newline at end of file diff --git a/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt b/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt new file mode 100644 index 0000000..46f72b8 --- /dev/null +++ b/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt @@ -0,0 +1,33 @@ +package com.btpj.module_web.data.http + +import com.btpj.lib_base.data.bean.ApiResponse +import com.btpj.lib_base.data.bean.CollectUrl +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 收藏站内文章 */ + @POST("lg/collect/{id}/json") + suspend fun collectArticle(@Path("id") id: Int): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + +} \ No newline at end of file diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt new file mode 100644 index 0000000..ed3dcb0 --- /dev/null +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt @@ -0,0 +1,278 @@ +package com.btpj.module_web.ui.web + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.os.Bundle +import android.view.Menu +import android.view.MenuItem +import android.webkit.WebView +import android.widget.FrameLayout +import androidx.core.content.ContextCompat +import com.btpj.lib_base.base.App +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.ext.initClose +import com.btpj.lib_base.ext.initTitle +import com.btpj.module_web.R +import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.bean.Banner +import com.btpj.lib_base.data.bean.CollectArticle +import com.btpj.lib_base.data.bean.CollectUrl +import com.btpj.module_web.databinding.ActivityWebBinding +import com.just.agentweb.AgentWeb +import com.just.agentweb.WebChromeClient + +/** + * WebView，用的第三方更强大的agentWeb + * + * @author LTP 2022/4/2 + */ +class WebActivity : BaseVMBActivity(R.layout.activity_web) { + + private lateinit var mAgentWeb: AgentWeb + + private var mArticle: Article? = null + private var mCollectArticle: CollectArticle? = null + private var mCollectUrl: CollectUrl? = null + private var mBanner: Banner? = null + + private lateinit var mUrl: String + private var mCollect = false + private lateinit var mTitle: String + + companion object { + private const val EXTRA_ARTICLE = "extra_article" + private const val EXTRA_COLLECT_ARTICLE = "extra_collect_article" + private const val EXTRA_COLLECT_URL = "extra_collect_url" + private const val EXTRA_BANNER = "extra_banner" + + /** + * 页面跳转 + * + * @param context Context + * @param article Article + */ + fun launch(context: Context, article: Article) { + context.startActivity(Intent(context, WebActivity::class.java).apply { + putExtra(EXTRA_ARTICLE, article) + }) + } + + /** + * 页面跳转 + * + * @param context Context + * @param collectArticle CollectArticle + */ + fun launch(context: Context, collectArticle: CollectArticle) { + context.startActivity(Intent(context, WebActivity::class.java).apply { + putExtra(EXTRA_COLLECT_ARTICLE, collectArticle) + }) + } + + /** + * 页面跳转 + * + * @param context Context + * @param collectUrl CollectUrl + */ + fun launch(context: Context, collectUrl: CollectUrl) { + context.startActivity(Intent(context, WebActivity::class.java).apply { + putExtra(EXTRA_COLLECT_URL, collectUrl) + }) + } + + /** + * 页面跳转 + * + * @param context Context + * @param banner Banner + */ + fun launch(context: Context, banner: Banner) { + context.startActivity(Intent(context, WebActivity::class.java).apply { + putExtra(EXTRA_BANNER, banner) + }) + } + } + + override fun initView(savedInstanceState: Bundle?) { + mBinding.toolbar.apply { + setSupportActionBar(this) + initTitle("加载中...") + initClose { onBackPressed() } + } + + intent.apply { + mArticle = getParcelableExtra(EXTRA_ARTICLE) + mCollectArticle = getParcelableExtra(EXTRA_COLLECT_ARTICLE) + mCollectUrl = getParcelableExtra(EXTRA_COLLECT_URL) + mBanner = getParcelableExtra(EXTRA_BANNER) + } + + when { + mArticle != null -> { + mUrl = mArticle!!.link + mCollect = mArticle!!.collect + } + mCollectArticle != null -> { + mUrl = mCollectArticle!!.link + mCollect = true + } + mCollectUrl != null -> { + mUrl = mCollectUrl!!.link + mCollect = true + } + else -> { + mUrl = mBanner!!.url + mCollect = false // 无法得知是否收藏直接置为false + } + } + + mAgentWeb = AgentWeb.with(this) + .setAgentWebParent(mBinding.flWeb, FrameLayout.LayoutParams(-1, -1)) + .useDefaultIndicator() + .setWebChromeClient(object : WebChromeClient() { + override fun onReceivedTitle(view: WebView?, title: String?) { + super.onReceivedTitle(view, title) + mTitle = title ?: "" + mBinding.toolbar.title = mTitle + } + }) + .createAgentWeb() + .ready() + .go(mUrl) + } + + override fun onCreateOptionsMenu(menu: Menu): Boolean { + menuInflater.inflate(R.menu.menu_web, menu) + return super.onCreateOptionsMenu(menu) + } + + override fun onPrepareOptionsMenu(menu: Menu?): Boolean { + menu?.findItem(R.id.item_collect)?.icon = ContextCompat.getDrawable( + this, + if (mCollect) com.btpj.lib_base.R.drawable.ic_collect else com.btpj.lib_base.R.drawable.ic_un_collect + ) + return super.onPrepareOptionsMenu(menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + // 注意：item.setIcon(R.drawable.ic_un_collect)这样设置一点击菜单就恢复成onPrepareOptionsMenu的初始状态 + when (item.itemId) { + R.id.item_collect -> { // 收藏 + handleCollect() + } + R.id.item_share -> { // 分享 + startActivity(Intent.createChooser(Intent().apply { + action = Intent.ACTION_SEND + putExtra(Intent.EXTRA_TEXT, "${mTitle}:$mUrl") + type = "text/plain" + }, "分享到")) + } + R.id.item_refresh -> { // 刷新 + mAgentWeb.urlLoader.reload() + } + R.id.item_openByBrowser -> { // 用默认浏览器打开 + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(mUrl))) + } + } + return super.onOptionsItemSelected(item) + } + + /** 收藏与取消收藏处理 */ + private fun handleCollect() { + when { + mArticle != null -> { + if (mCollect) { + mViewModel.unCollectArticle(mArticle!!.id) { + // 重置mCollect为false然后强制刷新menu即可 + mCollect = !mCollect + invalidateOptionsMenu() + App.appViewModel.collectEvent.setValue( + CollectData(mArticle!!.id, collect = false) + ) + } + } else { + mViewModel.collectArticle(mArticle!!.id) { + mCollect = !mCollect + invalidateOptionsMenu() + App.appViewModel.collectEvent.setValue( + CollectData(mArticle!!.id, collect = true) + ) + } + } + } + mCollectArticle != null -> { + if (mCollect) { + mViewModel.unCollectArticle(mCollectArticle!!.originId) { + mCollect = !mCollect + invalidateOptionsMenu() + App.appViewModel.collectEvent.setValue( + CollectData(mCollectArticle!!.id, collect = false) + ) + } + } else { + mViewModel.collectArticle(mCollectArticle!!.originId) { + mCollect = !mCollect + invalidateOptionsMenu() + App.appViewModel.collectEvent.setValue( + CollectData(mCollectArticle!!.id, collect = true) + ) + } + } + } + mCollectUrl != null -> { + if (mCollect) { + mViewModel.unCollectUrl(mCollectUrl!!.id) { + mCollect = !mCollect + invalidateOptionsMenu() + // 连续收藏取消收藏，id会变这里直接以link为唯一标志 + App.appViewModel.collectEvent.setValue( + CollectData(mCollectUrl!!.id, mCollectUrl!!.link, false) + ) + } + } else { + mViewModel.collectUrl(mCollectUrl!!.name, mCollectUrl!!.link) { + mCollect = !mCollect + invalidateOptionsMenu() + // 取消后再重新收藏id会变，故重新赋值 + mCollectUrl = it + App.appViewModel.collectEvent.setValue( + CollectData(mCollectUrl!!.id, mCollectUrl!!.link, true) + ) + } + } + } + else -> { + if (mCollect) { + mViewModel.unCollectUrl(mBanner!!.id) { + // 重置mCollect为false然后强制刷新menu即可 + mCollect = !mCollect + invalidateOptionsMenu() + } + } else { + mViewModel.collectUrl(mBanner!!.title, mBanner!!.url) { + mCollect = !mCollect + invalidateOptionsMenu() + } + } + } + } + } + + override fun onResume() { + mAgentWeb.webLifeCycle.onResume() + super.onResume() + } + + override fun onPause() { + mAgentWeb.webLifeCycle.onPause() + super.onPause() + } + + override fun onDestroy() { + mAgentWeb.webLifeCycle.onDestroy() + super.onDestroy() + } +} diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt new file mode 100644 index 0000000..0900770 --- /dev/null +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt @@ -0,0 +1,64 @@ +package com.btpj.module_web.ui.web + +import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.ext.handleRequest +import com.btpj.lib_base.ext.launch +import com.btpj.module_web.data.DataRepository +import com.btpj.lib_base.data.bean.CollectUrl + +/** + * @author LTP 2022/4/2 + */ +class WebViewModel : BaseViewModel() { + override fun start() {} + + /** + * 收藏文章 + * @param id 文章id + */ + fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { + launch({ + handleRequest(DataRepository.collectArticle(id), { + successCallBack.invoke() + }) + }) + } + + /** + * 取消收藏文章 + * @param id 文章id + */ + fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { + launch({ + handleRequest(DataRepository.unCollectArticle(id), { + successCallBack.invoke() + }) + }) + } + + /** + * 收藏网址 + * @param name 网址名 + * @param link 网址链接 + */ + fun collectUrl( + name: String, + link: String, + successCallBack: (CollectUrl: CollectUrl?) -> Any? = {} + ) { + launch({ + handleRequest(DataRepository.collectUrl(name, link), { + successCallBack.invoke(it.data) + }) + }) + } + + /** 取消收藏网址*/ + fun unCollectUrl(id: Int, successCallBack: () -> Any? = {}) { + launch({ + handleRequest(DataRepository.unCollectUrl(id), { + successCallBack.invoke() + }) + }) + } +} \ No newline at end of file diff --git a/module_web/src/main/res/layout/activity_web.xml b/module_web/src/main/res/layout/activity_web.xml new file mode 100644 index 0000000..7e71d4a --- /dev/null +++ b/module_web/src/main/res/layout/activity_web.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_web/src/main/res/menu/menu_web.xml b/module_web/src/main/res/menu/menu_web.xml new file mode 100644 index 0000000..4b057e3 --- /dev/null +++ b/module_web/src/main/res/menu/menu_web.xml @@ -0,0 +1,21 @@ + +

+ + + + + \ No newline at end of file diff --git a/module_web/src/main/res/values/strings.xml b/module_web/src/main/res/values/strings.xml index 45e69bc..cd893cb 100644 --- a/module_web/src/main/res/values/strings.xml +++ b/module_web/src/main/res/values/strings.xml @@ -1,3 +1,8 @@ module_web + + 收藏 + 刷新 + 用浏览器打开 + 分享 \ No newline at end of file diff --git a/module_web/src/main/res/values/themes.xml b/module_web/src/main/res/values/themes.xml index cd94d18..eba7d97 100644 --- a/module_web/src/main/res/values/themes.xml +++ b/module_web/src/main/res/values/themes.xml @@ -13,4 +13,14 @@ ?attr/colorPrimaryVariant + + + + + + \ No newline at end of file From 5ccfc8f817f76eccb44fd949205dbdc6bbb1fcd5 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Thu, 5 May 2022 13:37:09 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E5=89=94=E9=99=A4=E6=97=A0=E7=94=A8impor?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt | 5 ++--- .../java/com/btpj/module_web/ExampleInstrumentedTest.kt | 6 ++---- .../main/java/com/btpj/module_web/data/DataRepository.kt | 2 +- .../src/main/java/com/btpj/module_web/data/http/Api.kt | 4 +++- .../src/main/java/com/btpj/module_web/ui/web/WebActivity.kt | 6 +----- .../main/java/com/btpj/module_web/ui/web/WebViewModel.kt | 2 +- .../src/test/java/com/btpj/module_web/ExampleUnitTest.kt | 3 +-- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt index 52ce8b6..5d0e669 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt @@ -9,13 +9,12 @@ import android.view.MenuItem import android.webkit.WebView import android.widget.FrameLayout import androidx.core.content.ContextCompat -import com.btpj.lib_base.ext.initClose -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initTitle +import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.data.bean.* import com.btpj.wanandroid.databinding.ActivityWebBinding import com.just.agentweb.AgentWeb import com.just.agentweb.WebChromeClient diff --git a/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt b/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt index 1c58999..7442a40 100644 --- a/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt +++ b/module_web/src/androidTest/java/com/btpj/module_web/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package com.btpj.module_web -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * diff --git a/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt b/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt index 9baaaa4..989efc2 100644 --- a/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt +++ b/module_web/src/main/java/com/btpj/module_web/data/DataRepository.kt @@ -1,9 +1,9 @@ package com.btpj.module_web.data import com.btpj.lib_base.data.bean.ApiResponse +import com.btpj.lib_base.data.bean.CollectUrl import com.btpj.lib_base.http.BaseRepository import com.btpj.lib_base.http.RetrofitManager -import com.btpj.lib_base.data.bean.CollectUrl import com.btpj.module_web.data.http.Api /** diff --git a/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt b/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt index 46f72b8..5b580d0 100644 --- a/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt +++ b/module_web/src/main/java/com/btpj/module_web/data/http/Api.kt @@ -2,7 +2,9 @@ package com.btpj.module_web.data.http import com.btpj.lib_base.data.bean.ApiResponse import com.btpj.lib_base.data.bean.CollectUrl -import retrofit2.http.* +import retrofit2.http.POST +import retrofit2.http.Path +import retrofit2.http.Query /** * Http接口，Retrofit的请求Service diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt index ed3dcb0..1b717ac 100644 --- a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt @@ -11,14 +11,10 @@ import android.widget.FrameLayout import androidx.core.content.ContextCompat import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity -import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.data.bean.* import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initTitle import com.btpj.module_web.R -import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.data.bean.Banner -import com.btpj.lib_base.data.bean.CollectArticle -import com.btpj.lib_base.data.bean.CollectUrl import com.btpj.module_web.databinding.ActivityWebBinding import com.just.agentweb.AgentWeb import com.just.agentweb.WebChromeClient diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt index 0900770..f0869f1 100644 --- a/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebViewModel.kt @@ -1,10 +1,10 @@ package com.btpj.module_web.ui.web import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.bean.CollectUrl import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.module_web.data.DataRepository -import com.btpj.lib_base.data.bean.CollectUrl /** * @author LTP 2022/4/2 diff --git a/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt b/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt index cf8aec7..fb645a6 100644 --- a/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt +++ b/module_web/src/test/java/com/btpj/module_web/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package com.btpj.module_web +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * From eb40ce8e6fbf7cc0c6e883bab4fd28035b648821 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Fri, 6 May 2022 17:16:25 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=AE=8C=E6=88=90module=5Fweb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 14 +- app/src/main/AndroidManifest.xml | 4 - .../btpj/wanandroid/data/DataRepository.kt | 2 +- .../data/bean/{System.kt => MySystem.kt} | 2 +- .../java/com/btpj/wanandroid/data/http/Api.kt | 2 +- .../collect/article/CollectArticleAdapter.kt | 9 +- .../ui/collect/url/CollectUrlAdapter.kt | 9 +- .../ui/integral/rank/IntegralRankActivity.kt | 16 +- .../wanandroid/ui/main/home/ArticleAdapter.kt | 9 +- .../ui/main/home/MyBannerAdapter.kt | 12 +- .../wanandroid/ui/main/mine/MineFragment.kt | 13 +- .../ui/main/project/ImageArticleAdapter.kt | 9 +- .../ui/main/square/system/SystemAdapter.kt | 6 +- .../ui/main/square/system/SystemViewModel.kt | 4 +- .../wanandroid/ui/setting/SettingActivity.kt | 13 +- .../ui/share/list/MyArticleAdapter.kt | 9 +- .../com/btpj/wanandroid/ui/web/WebActivity.kt | 274 ------------------ .../btpj/wanandroid/ui/web/WebViewModel.kt | 64 ---- app/src/main/res/menu/menu_web.xml | 21 -- config.gradle | 3 + .../main/java/com/btpj/lib_base/base/App.kt | 10 +- .../com/btpj/lib_base/data/local/Constants.kt | 18 ++ module.build.gradle | 69 +++++ module_web/build.gradle | 37 +-- module_web/src/main/AndroidManifest.xml | 13 +- module_web/src/main/alone/AndroidManifest.xml | 26 ++ .../com/btpj/module_web/ui/web/WebActivity.kt | 97 ++----- .../drawable-v24/ic_launcher_foreground.xml | 30 -- .../res/drawable/ic_launcher_background.xml | 170 ----------- ...{activity_web.xml => web_activity_web.xml} | 2 +- .../menu/{menu_web.xml => web_menu_web.xml} | 8 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes .../src/main/res/values-night/themes.xml | 2 +- module_web/src/main/res/values/colors.xml | 10 - module_web/src/main/res/values/strings.xml | 10 +- module_web/src/main/res/values/themes.xml | 8 +- 42 files changed, 269 insertions(+), 746 deletions(-) rename app/src/main/java/com/btpj/wanandroid/data/bean/{System.kt => MySystem.kt} (95%) delete mode 100644 app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt delete mode 100644 app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt delete mode 100644 app/src/main/res/menu/menu_web.xml create mode 100644 lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt create mode 100644 module.build.gradle create mode 100644 module_web/src/main/alone/AndroidManifest.xml delete mode 100644 module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 module_web/src/main/res/drawable/ic_launcher_background.xml rename module_web/src/main/res/layout/{activity_web.xml => web_activity_web.xml} (94%) rename module_web/src/main/res/menu/{menu_web.xml => web_menu_web.xml} (74%) delete mode 100644 module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 module_web/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 module_web/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 module_web/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 module_web/src/main/res/values/colors.xml diff --git a/app/build.gradle b/app/build.gradle index 1167dc5..c7a3789 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' + id 'kotlin-android' + id 'kotlin-kapt' id 'kotlin-parcelize' } @@ -23,6 +24,13 @@ android { resConfigs('zh-rCN') testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + // ARouter配置 + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) + } + } } // 调试版设置统一的Key，多人开发时更方便， @@ -81,4 +89,8 @@ dependencies { implementation rootProject.ext.dependencies.banner implementation rootProject.ext.dependencies.agentWeb implementation rootProject.ext.dependencies.flexbox + + if(!rootProject.ext.isBuildModule){ + implementation project(path: ':module_web') + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5c46dfb..2c094aa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,10 +51,6 @@ android:name=".ui.login.register.RegisterActivity" android:exported="false" android:screenOrientation="portrait" /> - > { + override suspend fun getTreeList(): ApiResponse> { return apiCall { service.getTreeList() } } diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/System.kt b/app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt similarity index 95% rename from app/src/main/java/com/btpj/wanandroid/data/bean/System.kt rename to app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt index ccd3c5e..d44471c 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/System.kt +++ b/app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt @@ -3,7 +3,7 @@ package com.btpj.wanandroid.data.bean /** * @author LTP 2022/4/7 */ -data class System( +data class MySystem( val author: String, val children: List, val courseId: Int, diff --git a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt b/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt index 8ace88c..f8a1cf5 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt +++ b/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt @@ -83,7 +83,7 @@ interface Api { /** 获取体系数据 */ @GET("tree/json") - suspend fun getTreeList(): ApiResponse> + suspend fun getTreeList(): ApiResponse> /** 获取导航数据 */ @GET("navi/json") diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt index cb9ed51..2199250 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt @@ -1,9 +1,10 @@ package com.btpj.wanandroid.ui.collect.article +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.CollectArticle +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.databinding.ListItemCollectArticleBinding -import com.btpj.wanandroid.ui.web.WebActivity import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -31,7 +32,11 @@ class CollectArticleAdapter : collectArticle = item executePendingBindings() - clItem.setOnClickListener { WebActivity.launch(context, item) } + clItem.setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_COLLECT_ARTICLE, item) + .navigation() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt index 401f6ca..4430d57 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt @@ -1,9 +1,10 @@ package com.btpj.wanandroid.ui.collect.url +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.CollectUrl +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.databinding.ListItemCollectUrlBinding -import com.btpj.wanandroid.ui.web.WebActivity import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -24,7 +25,11 @@ class CollectUrlAdapter : collectUrl = item executePendingBindings() - clItem.setOnClickListener { WebActivity.launch(context, item) } + clItem.setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_COLLECT_URL, item) + .navigation() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt index d430860..70ddb72 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt @@ -4,18 +4,19 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initClose import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseActivity import com.btpj.lib_base.data.bean.Banner +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.ext.initTitle import com.btpj.wanandroid.data.bean.CoinInfo import com.btpj.wanandroid.databinding.ActivityIntegralRankBinding import com.btpj.wanandroid.ui.integral.record.IntegralRecordActivity -import com.btpj.wanandroid.ui.web.WebActivity /** * 积分排行 @@ -52,13 +53,14 @@ class IntegralRankActivity : when (it.itemId) { R.id.item_integralRule -> // 积分规则 - WebActivity.launch( - this@IntegralRankActivity, - Banner( - title = "积分规则", - url = "https://www.wanandroid.com/blog/show/2653" + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable( + Constants.ROUTER_WEB_EXTRA_BANNER, Banner( + title = "积分规则", + url = "https://www.wanandroid.com/blog/show/2653" + ) ) - ) + .navigation() R.id.item_integralRecord -> // 积分记录 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt index a52fb85..1dedbe0 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt @@ -1,9 +1,10 @@ package com.btpj.wanandroid.ui.main.home +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.databinding.ListItemArticleBinding -import com.btpj.wanandroid.ui.web.WebActivity import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -26,7 +27,11 @@ class ArticleAdapter : article = item executePendingBindings() - clItem.setOnClickListener { WebActivity.launch(context, item) } + clItem.setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) + .navigation() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt index a084c3a..4903b6c 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt @@ -3,11 +3,13 @@ package com.btpj.wanandroid.ui.main.home import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView -import com.btpj.lib_base.ext.load +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.Banner -import com.btpj.wanandroid.ui.web.WebActivity +import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.ext.load import com.youth.banner.adapter.BannerAdapter + /** * 图片轮播Banner的Adapter * @@ -30,7 +32,11 @@ class MyBannerAdapter(dataList: ArrayList) : override fun onBindView(holder: BannerViewHolder, data: Banner, position: Int, size: Int) { holder.imageView.apply { load(data.imagePath) - setOnClickListener { WebActivity.launch(context, data) } + setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_BANNER, data) + .navigation() + } } } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt index f6f9c3d..140d9cf 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt @@ -1,10 +1,12 @@ package com.btpj.wanandroid.ui.main.mine import android.annotation.SuppressLint +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.base.App import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Banner +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.initColors import com.btpj.wanandroid.data.local.UserManager import com.btpj.wanandroid.databinding.FragmentMineBinding @@ -14,7 +16,6 @@ import com.btpj.wanandroid.ui.integral.rank.IntegralRankActivity import com.btpj.wanandroid.ui.login.LoginActivity import com.btpj.wanandroid.ui.setting.SettingActivity import com.btpj.wanandroid.ui.share.list.MyArticleActivity -import com.btpj.wanandroid.ui.web.WebActivity /** * 我的Tab @@ -57,10 +58,12 @@ class MineFragment : BaseFragment(R.layout.f // 开源网站 tvWeb.setOnClickListener { - WebActivity.launch( - requireContext(), - Banner(title = "玩Android网站", url = "https://www.wanandroid.com/") - ) + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable( + Constants.ROUTER_WEB_EXTRA_BANNER, + Banner(title = "玩Android网站", url = "https://www.wanandroid.com/") + ) + .navigation() } // 设置 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt index 44c4322..2cdfba3 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt @@ -1,9 +1,10 @@ package com.btpj.wanandroid.ui.main.project +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.databinding.ListItemArticleImageBinding -import com.btpj.wanandroid.ui.web.WebActivity import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -29,7 +30,11 @@ class ImageArticleAdapter : article = item executePendingBindings() - clItem.setOnClickListener { WebActivity.launch(context, item) } + clItem.setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) + .navigation() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt index 85362ac..2fec936 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt @@ -1,7 +1,7 @@ package com.btpj.wanandroid.ui.main.square.system import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.System +import com.btpj.wanandroid.data.bean.MySystem import com.btpj.wanandroid.databinding.ListItemSystemBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule @@ -14,14 +14,14 @@ import com.google.android.flexbox.FlexboxLayoutManager * @author LTP 2022/3/23 */ class SystemAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_system), + BaseQuickAdapter>(layoutResId = R.layout.list_item_system), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: System) { + override fun convert(holder: BaseDataBindingHolder, item: MySystem) { holder.dataBinding?.apply { text = item.name executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt index f28b7c1..b1f5cc4 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt @@ -5,12 +5,12 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.System +import com.btpj.wanandroid.data.bean.MySystem class SystemViewModel : BaseViewModel() { /** 体系列表LiveData */ - val systemListLiveData = MutableLiveData>() + val systemListLiveData = MutableLiveData>() override fun start() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt index 0ca5ef8..4933ddd 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt @@ -3,6 +3,7 @@ package com.btpj.wanandroid.ui.setting import android.content.Context import android.content.Intent import android.os.Bundle +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.ext.showDialog import com.btpj.lib_base.http.RetrofitManager import com.btpj.lib_base.utils.AppUtil @@ -11,9 +12,9 @@ import com.btpj.wanandroid.R import com.btpj.lib_base.base.App import com.btpj.wanandroid.base.BaseActivity import com.btpj.lib_base.data.bean.Banner +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.data.local.UserManager import com.btpj.wanandroid.databinding.ActivitySettingBinding -import com.btpj.wanandroid.ui.web.WebActivity /** * 设置 @@ -57,10 +58,12 @@ class SettingActivity : // 项目源码 tvSourceCode.setOnClickListener { - WebActivity.launch( - this@SettingActivity, - Banner(title = "项目源码", url = "https://gitee.com/BTPJ_git/WanAndroid") - ) + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable( + Constants.ROUTER_WEB_EXTRA_BANNER, + Banner(title = "项目源码", url = "https://gitee.com/BTPJ_git/WanAndroid") + ) + .navigation() } // 退出登录 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt index 1c5288b..9c216bd 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt @@ -1,10 +1,11 @@ package com.btpj.wanandroid.ui.share.list import android.annotation.SuppressLint +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.local.Constants import com.btpj.wanandroid.databinding.ListItemShareArticleBinding -import com.btpj.wanandroid.ui.web.WebActivity import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -32,7 +33,11 @@ class MyArticleAdapter : article = item executePendingBindings() - clItem.setOnClickListener { WebActivity.launch(context, item) } + clItem.setOnClickListener { + ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) + .navigation() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt deleted file mode 100644 index 5d0e669..0000000 --- a/app/src/main/java/com/btpj/wanandroid/ui/web/WebActivity.kt +++ /dev/null @@ -1,274 +0,0 @@ -package com.btpj.wanandroid.ui.web - -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.view.Menu -import android.view.MenuItem -import android.webkit.WebView -import android.widget.FrameLayout -import androidx.core.content.ContextCompat -import com.btpj.lib_base.base.App -import com.btpj.lib_base.data.bean.* -import com.btpj.lib_base.ext.initClose -import com.btpj.lib_base.ext.initTitle -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityWebBinding -import com.just.agentweb.AgentWeb -import com.just.agentweb.WebChromeClient - -/** - * WebView，用的第三方更强大的agentWeb - * - * @author LTP 2022/4/2 - */ -class WebActivity : BaseActivity(R.layout.activity_web) { - - private lateinit var mAgentWeb: AgentWeb - - private var mArticle: Article? = null - private var mCollectArticle: CollectArticle? = null - private var mCollectUrl: CollectUrl? = null - private var mBanner: Banner? = null - - private lateinit var mUrl: String - private var mCollect = false - private lateinit var mTitle: String - - companion object { - private const val EXTRA_ARTICLE = "extra_article" - private const val EXTRA_COLLECT_ARTICLE = "extra_collect_article" - private const val EXTRA_COLLECT_URL = "extra_collect_url" - private const val EXTRA_BANNER = "extra_banner" - - /** - * 页面跳转 - * - * @param context Context - * @param article Article - */ - fun launch(context: Context, article: Article) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_ARTICLE, article) - }) - } - - /** - * 页面跳转 - * - * @param context Context - * @param collectArticle CollectArticle - */ - fun launch(context: Context, collectArticle: CollectArticle) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_COLLECT_ARTICLE, collectArticle) - }) - } - - /** - * 页面跳转 - * - * @param context Context - * @param collectUrl CollectUrl - */ - fun launch(context: Context, collectUrl: CollectUrl) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_COLLECT_URL, collectUrl) - }) - } - - /** - * 页面跳转 - * - * @param context Context - * @param banner Banner - */ - fun launch(context: Context, banner: Banner) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_BANNER, banner) - }) - } - } - - override fun initView(savedInstanceState: Bundle?) { - mBinding.toolbar.apply { - setSupportActionBar(this) - initTitle("加载中...") - initClose { onBackPressed() } - } - - intent.apply { - mArticle = getParcelableExtra(EXTRA_ARTICLE) - mCollectArticle = getParcelableExtra(EXTRA_COLLECT_ARTICLE) - mCollectUrl = getParcelableExtra(EXTRA_COLLECT_URL) - mBanner = getParcelableExtra(EXTRA_BANNER) - } - - when { - mArticle != null -> { - mUrl = mArticle!!.link - mCollect = mArticle!!.collect - } - mCollectArticle != null -> { - mUrl = mCollectArticle!!.link - mCollect = true - } - mCollectUrl != null -> { - mUrl = mCollectUrl!!.link - mCollect = true - } - else -> { - mUrl = mBanner!!.url - mCollect = false // 无法得知是否收藏直接置为false - } - } - - mAgentWeb = AgentWeb.with(this) - .setAgentWebParent(mBinding.flWeb, FrameLayout.LayoutParams(-1, -1)) - .useDefaultIndicator() - .setWebChromeClient(object : WebChromeClient() { - override fun onReceivedTitle(view: WebView?, title: String?) { - super.onReceivedTitle(view, title) - mTitle = title ?: "" - mBinding.toolbar.title = mTitle - } - }) - .createAgentWeb() - .ready() - .go(mUrl) - } - - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.menu_web, menu) - return super.onCreateOptionsMenu(menu) - } - - override fun onPrepareOptionsMenu(menu: Menu?): Boolean { - menu?.findItem(R.id.item_collect)?.icon = ContextCompat.getDrawable( - this, - if (mCollect) R.drawable.ic_collect else R.drawable.ic_un_collect - ) - return super.onPrepareOptionsMenu(menu) - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - // 注意：item.setIcon(R.drawable.ic_un_collect)这样设置一点击菜单就恢复成onPrepareOptionsMenu的初始状态 - when (item.itemId) { - R.id.item_collect -> { // 收藏 - handleCollect() - } - R.id.item_share -> { // 分享 - startActivity(Intent.createChooser(Intent().apply { - action = Intent.ACTION_SEND - putExtra(Intent.EXTRA_TEXT, "${mTitle}:$mUrl") - type = "text/plain" - }, "分享到")) - } - R.id.item_refresh -> { // 刷新 - mAgentWeb.urlLoader.reload() - } - R.id.item_openByBrowser -> { // 用默认浏览器打开 - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(mUrl))) - } - } - return super.onOptionsItemSelected(item) - } - - /** 收藏与取消收藏处理 */ - private fun handleCollect() { - when { - mArticle != null -> { - if (mCollect) { - mViewModel.unCollectArticle(mArticle!!.id) { - // 重置mCollect为false然后强制刷新menu即可 - mCollect = !mCollect - invalidateOptionsMenu() - App.appViewModel.collectEvent.setValue( - CollectData(mArticle!!.id, collect = false) - ) - } - } else { - mViewModel.collectArticle(mArticle!!.id) { - mCollect = !mCollect - invalidateOptionsMenu() - App.appViewModel.collectEvent.setValue( - CollectData(mArticle!!.id, collect = true) - ) - } - } - } - mCollectArticle != null -> { - if (mCollect) { - mViewModel.unCollectArticle(mCollectArticle!!.originId) { - mCollect = !mCollect - invalidateOptionsMenu() - App.appViewModel.collectEvent.setValue( - CollectData(mCollectArticle!!.id, collect = false) - ) - } - } else { - mViewModel.collectArticle(mCollectArticle!!.originId) { - mCollect = !mCollect - invalidateOptionsMenu() - App.appViewModel.collectEvent.setValue( - CollectData(mCollectArticle!!.id, collect = true) - ) - } - } - } - mCollectUrl != null -> { - if (mCollect) { - mViewModel.unCollectUrl(mCollectUrl!!.id) { - mCollect = !mCollect - invalidateOptionsMenu() - // 连续收藏取消收藏，id会变这里直接以link为唯一标志 - App.appViewModel.collectEvent.setValue( - CollectData(mCollectUrl!!.id, mCollectUrl!!.link, false) - ) - } - } else { - mViewModel.collectUrl(mCollectUrl!!.name, mCollectUrl!!.link) { - mCollect = !mCollect - invalidateOptionsMenu() - // 取消后再重新收藏id会变，故重新赋值 - mCollectUrl = it - App.appViewModel.collectEvent.setValue( - CollectData(mCollectUrl!!.id, mCollectUrl!!.link, true) - ) - } - } - } - else -> { - if (mCollect) { - mViewModel.unCollectUrl(mBanner!!.id) { - // 重置mCollect为false然后强制刷新menu即可 - mCollect = !mCollect - invalidateOptionsMenu() - } - } else { - mViewModel.collectUrl(mBanner!!.title, mBanner!!.url) { - mCollect = !mCollect - invalidateOptionsMenu() - } - } - } - } - } - - override fun onResume() { - mAgentWeb.webLifeCycle.onResume() - super.onResume() - } - - override fun onPause() { - mAgentWeb.webLifeCycle.onPause() - super.onPause() - } - - override fun onDestroy() { - mAgentWeb.webLifeCycle.onDestroy() - super.onDestroy() - } -} diff --git a/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt deleted file mode 100644 index 02059ed..0000000 --- a/app/src/main/java/com/btpj/wanandroid/ui/web/WebViewModel.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.btpj.wanandroid.ui.web - -import com.btpj.lib_base.base.BaseViewModel -import com.btpj.lib_base.ext.handleRequest -import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository -import com.btpj.lib_base.data.bean.CollectUrl - -/** - * @author LTP 2022/4/2 - */ -class WebViewModel : BaseViewModel() { - override fun start() {} - - /** - * 收藏文章 - * @param id 文章id - */ - fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { - launch({ - handleRequest(DataRepository.collectArticle(id), { - successCallBack.invoke() - }) - }) - } - - /** - * 取消收藏文章 - * @param id 文章id - */ - fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { - launch({ - handleRequest(DataRepository.unCollectArticle(id), { - successCallBack.invoke() - }) - }) - } - - /** - * 收藏网址 - * @param name 网址名 - * @param link 网址链接 - */ - fun collectUrl( - name: String, - link: String, - successCallBack: (CollectUrl: CollectUrl?) -> Any? = {} - ) { - launch({ - handleRequest(DataRepository.collectUrl(name, link), { - successCallBack.invoke(it.data) - }) - }) - } - - /** 取消收藏网址*/ - fun unCollectUrl(id: Int, successCallBack: () -> Any? = {}) { - launch({ - handleRequest(DataRepository.unCollectUrl(id), { - successCallBack.invoke() - }) - }) - } -} \ No newline at end of file diff --git a/app/src/main/res/menu/menu_web.xml b/app/src/main/res/menu/menu_web.xml deleted file mode 100644 index 4b057e3..0000000 --- a/app/src/main/res/menu/menu_web.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/config.gradle b/config.gradle index 2f963f6..c84c488 100644 --- a/config.gradle +++ b/config.gradle @@ -1,4 +1,7 @@ ext { + // module是否独立运行 + isBuildModule = false + android = [ compileSdk : 31, minSdk : 21, diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/App.kt b/lib_base/src/main/java/com/btpj/lib_base/base/App.kt index 8330601..c1dc57c 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/base/App.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/App.kt @@ -5,6 +5,7 @@ import android.content.Context import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelStore import androidx.lifecycle.ViewModelStoreOwner +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.BuildConfig import com.tencent.bugly.Bugly import com.tencent.mmkv.MMKV @@ -37,10 +38,17 @@ class App : Application(), ViewModelStoreOwner { // bugly初始化 Bugly.init(applicationContext, "99ff7c64d9", BuildConfig.DEBUG) + + // ARouter初始化 + if (BuildConfig.DEBUG) { // 这两行必须写在init之前，否则这些配置在init过程中将无效 + ARouter.openLog() // 打印日志 + ARouter.openDebug() // 开启调试模式(如果在InstantRun模式下运行，必须开启调试模式！线上版本需要关闭,否则有安全风险) + } + ARouter.init(this) // 尽可能早，推荐在Application中初始化 } /** 获取一个全局的ViewModel */ - fun getAppViewModelProvider(): ViewModelProvider { + private fun getAppViewModelProvider(): ViewModelProvider { return ViewModelProvider(this, getAppFactory()) } diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt new file mode 100644 index 0000000..85e115c --- /dev/null +++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt @@ -0,0 +1,18 @@ +package com.btpj.lib_base.data.local + +/** + * @author LTP 2022/5/6 + */ +object Constants { + + //------- ARouter相关启动变量 start -------------- + + // Web Module + const val ROUTER_WEB_WEB_ACTIVITY = "/web/WebActivity" + const val ROUTER_WEB_EXTRA_BANNER = "extra_banner" + const val ROUTER_WEB_EXTRA_ARTICLE = "extra_article" + const val ROUTER_WEB_EXTRA_COLLECT_ARTICLE = "extra_collect_article" + const val ROUTER_WEB_EXTRA_COLLECT_URL = "extra_collect_url" + + //------- ARouter相关启动变量 end -------------- +} \ No newline at end of file diff --git a/module.build.gradle b/module.build.gradle new file mode 100644 index 0000000..c0262e4 --- /dev/null +++ b/module.build.gradle @@ -0,0 +1,69 @@ +//-----------------所有module共有的配置-------------- +// 作为组件/APP应用运行 +apply plugin: rootProject.ext.isBuildModule ? 'com.android.application' : 'com.android.library' + +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-parcelize' +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion rootProject.ext.android.compileSdk + + defaultConfig { + minSdk rootProject.ext.android.minSdk + targetSdk rootProject.ext.android.targetSdk + versionCode rootProject.ext.android.versionCode + versionName rootProject.ext.android.versionName + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + // ARouter配置 + kapt { + arguments { + arg("AROUTER_MODULE_NAME", project.getName()) + } + } + } + kotlinOptions { + jvmTarget = "1.8" + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + sourceSets { + main { + jniLibs.srcDirs = ['libs'] + if (rootProject.ext.isBuildModule) { + //独立运行 + manifest.srcFile 'src/main/alone/AndroidManifest.xml' + } else { + //合并到宿主 + manifest.srcFile 'src/main/AndroidManifest.xml' + resources { + //正式版本时，排除alone文件夹下所有调试文件 + exclude 'src/main/alone/*' + } + } + } + } + buildTypes { + debug { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + buildFeatures { + dataBinding true + } +} + +dependencies { + implementation project(path: ':lib_base') + + // kapt无法像api那样穿透（从lib_base带过来），所以还需要引用一次 + kapt rootProject.ext.dependencies.arouter_compiler +} \ No newline at end of file diff --git a/module_web/build.gradle b/module_web/build.gradle index b23399a..ad1fb35 100644 --- a/module_web/build.gradle +++ b/module_web/build.gradle @@ -1,41 +1,16 @@ -plugins { - id 'com.android.application' - id 'org.jetbrains.kotlin.android' -} +apply from: "../module.build.gradle" android { - compileSdk 32 - defaultConfig { - applicationId "com.btpj.module_web" - minSdk 21 - targetSdk 32 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_web" } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' - } - buildFeatures { - dataBinding true - } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "web_" } dependencies { - implementation project(path: ':lib_base') - implementation rootProject.ext.dependencies.agentWeb } \ No newline at end of file diff --git a/module_web/src/main/AndroidManifest.xml b/module_web/src/main/AndroidManifest.xml index 81efe2a..c2c92dc 100644 --- a/module_web/src/main/AndroidManifest.xml +++ b/module_web/src/main/AndroidManifest.xml @@ -2,12 +2,11 @@ - + + + \ No newline at end of file diff --git a/module_web/src/main/alone/AndroidManifest.xml b/module_web/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..0c909ea --- /dev/null +++ b/module_web/src/main/alone/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt index 1b717ac..81f23a3 100644 --- a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt @@ -1,6 +1,5 @@ package com.btpj.module_web.ui.web -import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle @@ -9,13 +8,17 @@ import android.view.MenuItem import android.webkit.WebView import android.widget.FrameLayout import androidx.core.content.ContextCompat +import com.alibaba.android.arouter.facade.annotation.Autowired +import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initTitle import com.btpj.module_web.R -import com.btpj.module_web.databinding.ActivityWebBinding +import com.btpj.module_web.databinding.WebActivityWebBinding import com.just.agentweb.AgentWeb import com.just.agentweb.WebChromeClient @@ -24,88 +27,42 @@ import com.just.agentweb.WebChromeClient * * @author LTP 2022/4/2 */ -class WebActivity : BaseVMBActivity(R.layout.activity_web) { +@Route(path = Constants.ROUTER_WEB_WEB_ACTIVITY) +class WebActivity : + BaseVMBActivity(R.layout.web_activity_web) { private lateinit var mAgentWeb: AgentWeb - private var mArticle: Article? = null - private var mCollectArticle: CollectArticle? = null - private var mCollectUrl: CollectUrl? = null - private var mBanner: Banner? = null + @Autowired(name = Constants.ROUTER_WEB_EXTRA_ARTICLE) + @JvmField + var mArticle: Article? = null - private lateinit var mUrl: String - private var mCollect = false - private lateinit var mTitle: String - - companion object { - private const val EXTRA_ARTICLE = "extra_article" - private const val EXTRA_COLLECT_ARTICLE = "extra_collect_article" - private const val EXTRA_COLLECT_URL = "extra_collect_url" - private const val EXTRA_BANNER = "extra_banner" - - /** - * 页面跳转 - * - * @param context Context - * @param article Article - */ - fun launch(context: Context, article: Article) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_ARTICLE, article) - }) - } + @Autowired(name = Constants.ROUTER_WEB_EXTRA_COLLECT_ARTICLE) + @JvmField + var mCollectArticle: CollectArticle? = null - /** - * 页面跳转 - * - * @param context Context - * @param collectArticle CollectArticle - */ - fun launch(context: Context, collectArticle: CollectArticle) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_COLLECT_ARTICLE, collectArticle) - }) - } + @Autowired(name = Constants.ROUTER_WEB_EXTRA_COLLECT_URL) + @JvmField + var mCollectUrl: CollectUrl? = null - /** - * 页面跳转 - * - * @param context Context - * @param collectUrl CollectUrl - */ - fun launch(context: Context, collectUrl: CollectUrl) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_COLLECT_URL, collectUrl) - }) - } + @Autowired(name = Constants.ROUTER_WEB_EXTRA_BANNER) + @JvmField + var mBanner: Banner? = null - /** - * 页面跳转 - * - * @param context Context - * @param banner Banner - */ - fun launch(context: Context, banner: Banner) { - context.startActivity(Intent(context, WebActivity::class.java).apply { - putExtra(EXTRA_BANNER, banner) - }) - } - } + private lateinit var mUrl: String + private var mCollect = false + private lateinit var mTitle: String override fun initView(savedInstanceState: Bundle?) { + // 自动完成参数注入 + ARouter.getInstance().inject(this) + mBinding.toolbar.apply { setSupportActionBar(this) initTitle("加载中...") initClose { onBackPressed() } } - intent.apply { - mArticle = getParcelableExtra(EXTRA_ARTICLE) - mCollectArticle = getParcelableExtra(EXTRA_COLLECT_ARTICLE) - mCollectUrl = getParcelableExtra(EXTRA_COLLECT_URL) - mBanner = getParcelableExtra(EXTRA_BANNER) - } - when { mArticle != null -> { mUrl = mArticle!!.link @@ -141,7 +98,7 @@ class WebActivity : BaseVMBActivity(R.layout.a } override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.menu_web, menu) + menuInflater.inflate(R.menu.web_menu_web, menu) return super.onCreateOptionsMenu(menu) } diff --git a/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml b/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/module_web/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/module_web/src/main/res/drawable/ic_launcher_background.xml b/module_web/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/module_web/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/module_web/src/main/res/layout/activity_web.xml b/module_web/src/main/res/layout/web_activity_web.xml similarity index 94% rename from module_web/src/main/res/layout/activity_web.xml rename to module_web/src/main/res/layout/web_activity_web.xml index 7e71d4a..76aac6b 100644 --- a/module_web/src/main/res/layout/activity_web.xml +++ b/module_web/src/main/res/layout/web_activity_web.xml @@ -20,7 +20,7 @@ android:background="@color/purple_500" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/ToolbarPopTheme" /> + app:popupTheme="@style/web_toolbarPopTheme" /> + android:title="@string/web_collect" /> + android:title="@string/web_share" /> + android:title="@string/web_refresh" /> + android:title="@string/web_openByBrowser" /> \ No newline at end of file diff --git a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/module_web/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/module_web/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/module_web/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/module_web/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/module_web/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/module_web/src/main/res/values-night/themes.xml b/module_web/src/main/res/values-night/themes.xml index 5e6335c..6ec4c12 100644 --- a/module_web/src/main/res/values-night/themes.xml +++ b/module_web/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file From 7638e05195950b258dbf486911bccd331638afa7 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Sat, 7 May 2022 18:45:44 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86modul?= =?UTF-8?q?e=5Fmine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 20 ++--- .../com/btpj/wanandroid/base/BaseActivity.kt | 3 +- .../com/btpj/wanandroid/base/BaseFragment.kt | 3 +- .../btpj/wanandroid/data/DataRepository.kt | 29 ------- .../java/com/btpj/wanandroid/data/http/Api.kt | 34 -------- .../java/com/btpj/wanandroid/ext/ViewExt.kt | 32 -------- .../wanandroid/ui/author/AuthorViewModel.kt | 2 +- .../collect/article/CollectArticleFragment.kt | 6 +- .../ui/collect/url/CollectUrlFragment.kt | 6 +- .../btpj/wanandroid/ui/main/MainActivity.kt | 4 +- .../wanandroid/ui/main/home/HomeFragment.kt | 2 +- .../wanandroid/ui/main/mine/MineFragment.kt | 16 ++-- .../wanandroid/ui/main/mine/MineViewModel.kt | 12 +-- .../ui/main/project/ProjectChildFragment.kt | 6 +- .../ui/main/project/ProjectFragment.kt | 2 +- .../ui/main/project/ProjectViewModel.kt | 2 +- .../ui/main/square/SquareFragment.kt | 7 +- .../ui/main/square/ask/AskFragment.kt | 4 +- .../square/navigation/NavigationAdapter.kt | 2 +- .../square/navigation/NavigationFragment.kt | 5 +- .../square/navigation/NavigationViewModel.kt | 2 +- .../main/square/square/SquareChildFragment.kt | 4 +- .../ui/main/square/system/SystemAdapter.kt | 2 +- .../main/square/system/SystemChildAdapter.kt | 2 +- .../ui/main/square/system/SystemFragment.kt | 5 +- .../ui/main/square/system/SystemViewModel.kt | 2 +- .../ui/main/wechat/WechatChildFragment.kt | 4 +- .../ui/main/wechat/WechatFragment.kt | 2 +- .../ui/main/wechat/WechatViewModel.kt | 2 +- .../wanandroid/ui/search/HotSearchAdapter.kt | 2 +- .../wanandroid/ui/search/SearchActivity.kt | 2 +- .../ui/search/SearchHistoryAdapter.kt | 6 +- .../wanandroid/ui/search/SearchViewModel.kt | 2 +- .../wanandroid/ui/splash/SplashActivity.kt | 6 +- app/src/main/res/drawable/ic_collect.xml | 9 --- app/src/main/res/drawable/ic_un_collect.xml | 9 --- ...{list_item_ip.xml => list_item_search.xml} | 0 app/src/main/res/values/strings.xml | 52 +----------- lib_base/build.gradle | 1 - .../com/btpj/lib_base}/data/bean/Classify.kt | 2 +- .../com/btpj/lib_base}/data/bean/CoinInfo.kt | 2 +- .../com/btpj/lib_base}/data/bean/HotSearch.kt | 2 +- .../lib_base}/data/bean/IntegralRecord.kt | 2 +- .../com/btpj/lib_base}/data/bean/MySystem.kt | 2 +- .../btpj/lib_base}/data/bean/Navigation.kt | 2 +- .../btpj/lib_base}/data/bean/OtherAuthor.kt | 3 +- .../btpj/lib_base}/data/bean/ProjectTitle.kt | 2 +- .../com/btpj/lib_base}/data/bean/Share.kt | 5 +- .../com/btpj/lib_base/data/local/Constants.kt | 3 + .../btpj/lib_base}/data/local/UserManager.kt | 2 +- .../java/com/btpj/lib_base/ext/ViewExt.kt | 34 ++++++++ .../drawable-xxhdpi/default_project_img.webp | Bin .../main/res/drawable-xxhdpi/ic_splash.webp | Bin .../main/res/drawable-xxhdpi/ic_splash2.webp | Bin .../main/res/drawable-xxhdpi/ic_splash3.webp | Bin .../src/main/res/drawable/frame_green.xml | 0 .../src/main/res/drawable/frame_red.xml | 0 .../src/main/res/drawable/ic_add.xml | 0 .../src/main/res/drawable/ic_arrow_right.xml | 0 .../src/main/res/drawable/ic_article.xml | 0 .../src/main/res/drawable/ic_clear.xml | 0 .../main/res/drawable/ic_integral_record.xml | 0 .../main/res/drawable/ic_integral_rule.xml | 0 .../src/main/res/drawable/ic_points.xml | 0 .../src/main/res/drawable/ic_search.xml | 0 .../src/main/res/drawable/ic_settings.xml | 0 .../src/main/res/drawable/ic_tab_home.xml | 0 .../src/main/res/drawable/ic_tab_mine.xml | 0 .../src/main/res/drawable/ic_tab_project.xml | 0 .../src/main/res/drawable/ic_tab_square.xml | 0 .../src/main/res/drawable/ic_tab_wechat.xml | 0 .../src/main/res/drawable/ic_user.xml | 0 .../src/main/res/drawable/ic_web.xml | 0 .../src/main/res/drawable/selector_bg_tv.xml | 0 .../src/main/res/layout/include_line.xml | 0 .../include_swiperefresh_recyclerview.xml | 0 .../src/main/res/layout/include_toolbar.xml | 0 lib_base/src/main/res/values-night/themes.xml | 16 ++++ lib_base/src/main/res/values/colors.xml | 1 + lib_base/src/main/res/values/strings.xml | 54 +++++++++++++ lib_base/src/main/res/values/themes.xml | 36 +++++++++ module_mine/.gitignore | 1 + module_mine/build.gradle | 12 +++ module_mine/proguard-rules.pro | 21 +++++ .../module_mine/ExampleInstrumentedTest.kt | 24 ++++++ module_mine/src/main/AndroidManifest.xml | 19 +++++ .../src/main/alone/AndroidManifest.xml | 31 ++++++++ .../btpj/module_mine/data/DataRepository.kt | 67 ++++++++++++++++ .../com/btpj/module_mine/data/http/Api.kt | 75 ++++++++++++++++++ .../ui/integral/rank/IntegralAdapter.kt | 17 ++-- .../ui/integral/rank/IntegralRankActivity.kt | 20 ++--- .../ui/integral/rank/IntegralRankViewModel.kt | 8 +- .../integral/record/IntegralRecordActivity.kt | 14 ++-- .../integral/record/IntegralRecordAdapter.kt | 14 ++-- .../record/IntegralRecordViewModel.kt | 6 +- .../module_mine}/ui/ip/ChangeIpActivity.kt | 10 +-- .../module_mine}/ui/ip/ChangeIpViewModel.kt | 2 +- .../btpj/module_mine}/ui/ip/IpListAdapter.kt | 10 +-- .../module_mine}/ui/login/LoginActivity.kt | 18 +++-- .../module_mine}/ui/login/LoginViewModel.kt | 6 +- .../ui/login/register/RegisterActivity.kt | 10 +-- .../ui/login/register/RegisterViewModel.kt | 6 +- .../ui/setting/SettingActivity.kt | 14 ++-- .../ui/setting/SettingViewModel.kt | 5 +- .../ui/share/add/AddArticleActivity.kt | 16 ++-- .../ui/share/add/AddArticleViewModel.kt | 6 +- .../ui/share/list/MyArticleActivity.kt | 18 ++--- .../ui/share/list/MyArticleAdapter.kt | 12 +-- .../ui/share/list/MyArticleViewModel.kt | 4 +- .../res/layout/mine_activity_add_article.xml | 4 +- .../res/layout/mine_activity_change_ip.xml | 4 +- .../layout/mine_activity_integral_rank.xml | 4 +- .../layout/mine_activity_integral_record.xml | 2 +- .../main/res/layout/mine_activity_login.xml | 4 +- .../res/layout/mine_activity_register.xml | 4 +- .../main/res/layout/mine_activity_setting.xml | 4 +- .../layout/mine_dialog_share_article_tip.xml | 0 .../res/layout/mine_list_item_integral.xml | 2 +- .../layout/mine_list_item_integral_record.xml | 2 +- .../src/main/res/layout/mine_list_item_ip.xml | 55 +++++++++++++ .../layout/mine_list_item_share_article.xml | 0 .../main/res/menu/mine_menu_integral_rank.xml | 16 ++++ .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 ++++ module_mine/src/main/res/values/themes.xml | 16 ++++ .../com/btpj/module_mine/ExampleUnitTest.kt | 17 ++++ module_web/src/main/alone/AndroidManifest.xml | 2 +- module_web/src/main/res/menu/web_menu_web.xml | 8 +- module_web/src/main/res/values/strings.xml | 8 -- settings.gradle | 1 + 135 files changed, 726 insertions(+), 389 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_collect.xml delete mode 100644 app/src/main/res/drawable/ic_un_collect.xml rename app/src/main/res/layout/{list_item_ip.xml => list_item_search.xml} (100%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Classify.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/CoinInfo.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/HotSearch.kt (82%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/IntegralRecord.kt (86%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/MySystem.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Navigation.kt (83%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/OtherAuthor.kt (76%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/ProjectTitle.kt (91%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/bean/Share.kt (52%) rename {app/src/main/java/com/btpj/wanandroid => lib_base/src/main/java/com/btpj/lib_base}/data/local/UserManager.kt (98%) rename {app => lib_base}/src/main/res/drawable-xxhdpi/default_project_img.webp (100%) rename {app => lib_base}/src/main/res/drawable-xxhdpi/ic_splash.webp (100%) rename {app => lib_base}/src/main/res/drawable-xxhdpi/ic_splash2.webp (100%) rename {app => lib_base}/src/main/res/drawable-xxhdpi/ic_splash3.webp (100%) rename {app => lib_base}/src/main/res/drawable/frame_green.xml (100%) rename {app => lib_base}/src/main/res/drawable/frame_red.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_add.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_arrow_right.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_article.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_clear.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_integral_record.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_integral_rule.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_points.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_search.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_settings.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_tab_home.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_tab_mine.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_tab_project.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_tab_square.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_tab_wechat.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_user.xml (100%) rename {app => lib_base}/src/main/res/drawable/ic_web.xml (100%) rename {app => lib_base}/src/main/res/drawable/selector_bg_tv.xml (100%) rename {app => lib_base}/src/main/res/layout/include_line.xml (100%) rename {app => lib_base}/src/main/res/layout/include_swiperefresh_recyclerview.xml (100%) rename {app => lib_base}/src/main/res/layout/include_toolbar.xml (100%) create mode 100644 lib_base/src/main/res/values-night/themes.xml create mode 100644 lib_base/src/main/res/values/themes.xml create mode 100644 module_mine/.gitignore create mode 100644 module_mine/build.gradle create mode 100644 module_mine/proguard-rules.pro create mode 100644 module_mine/src/androidTest/java/com/btpj/module_mine/ExampleInstrumentedTest.kt create mode 100644 module_mine/src/main/AndroidManifest.xml create mode 100644 module_mine/src/main/alone/AndroidManifest.xml create mode 100644 module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt create mode 100644 module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/rank/IntegralAdapter.kt (51%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/rank/IntegralRankActivity.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/rank/IntegralRankViewModel.kt (85%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/record/IntegralRecordActivity.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/record/IntegralRecordAdapter.kt (67%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/integral/record/IntegralRecordViewModel.kt (82%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/ip/ChangeIpActivity.kt (86%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/ip/ChangeIpViewModel.kt (96%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/ip/IpListAdapter.kt (71%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/login/LoginActivity.kt (79%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/login/LoginViewModel.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/login/register/RegisterActivity.kt (87%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/login/register/RegisterViewModel.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/setting/SettingActivity.kt (88%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/setting/SettingViewModel.kt (92%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/share/add/AddArticleActivity.kt (83%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/share/add/AddArticleViewModel.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/share/list/MyArticleActivity.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/share/list/MyArticleAdapter.kt (73%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/share/list/MyArticleViewModel.kt (92%) rename app/src/main/res/layout/activity_add_article.xml => module_mine/src/main/res/layout/mine_activity_add_article.xml (96%) rename app/src/main/res/layout/activity_change_ip.xml => module_mine/src/main/res/layout/mine_activity_change_ip.xml (96%) rename app/src/main/res/layout/activity_integral_rank.xml => module_mine/src/main/res/layout/mine_activity_integral_rank.xml (95%) rename app/src/main/res/layout/activity_integral_record.xml => module_mine/src/main/res/layout/mine_activity_integral_record.xml (89%) rename app/src/main/res/layout/activity_login.xml => module_mine/src/main/res/layout/mine_activity_login.xml (97%) rename app/src/main/res/layout/activity_register.xml => module_mine/src/main/res/layout/mine_activity_register.xml (97%) rename app/src/main/res/layout/activity_setting.xml => module_mine/src/main/res/layout/mine_activity_setting.xml (98%) rename app/src/main/res/layout/dialog_share_article_tip.xml => module_mine/src/main/res/layout/mine_dialog_share_article_tip.xml (100%) rename app/src/main/res/layout/list_item_integral.xml => module_mine/src/main/res/layout/mine_list_item_integral.xml (97%) rename app/src/main/res/layout/list_item_integral_record.xml => module_mine/src/main/res/layout/mine_list_item_integral_record.xml (97%) create mode 100644 module_mine/src/main/res/layout/mine_list_item_ip.xml rename app/src/main/res/layout/list_item_share_article.xml => module_mine/src/main/res/layout/mine_list_item_share_article.xml (100%) create mode 100644 module_mine/src/main/res/menu/mine_menu_integral_rank.xml create mode 100644 module_mine/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_mine/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_mine/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_mine/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_mine/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_mine/src/main/res/values-night/themes.xml create mode 100644 module_mine/src/main/res/values/themes.xml create mode 100644 module_mine/src/test/java/com/btpj/module_mine/ExampleUnitTest.kt delete mode 100644 module_web/src/main/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index c7a3789..af1e5e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,6 +91,7 @@ dependencies { implementation rootProject.ext.dependencies.flexbox if(!rootProject.ext.isBuildModule){ + implementation project(path: ':module_mine') implementation project(path: ':module_web') } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2c094aa..f80cb21 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,35 +32,27 @@ android:exported="false" android:screenOrientation="portrait" /> - - (contentView if (it?.errorCode == -1001) { // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 - LoginActivity.launch(this) +// com.btpj.module_user.ui.login.LoginActivity.launch(this) } } } diff --git a/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt b/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt index f55076a..4a92775 100644 --- a/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt @@ -3,7 +3,6 @@ package com.btpj.wanandroid.base import androidx.databinding.ViewDataBinding import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.base.BaseViewModel -import com.btpj.wanandroid.ui.login.LoginActivity /** * 继承自BaseVMBFragment @@ -18,7 +17,7 @@ abstract class BaseFragment(contentView super.createObserve() mViewModel.errorResponse.observe(viewLifecycleOwner) { if (it?.errorCode == -1001) { // 需要登录 - LoginActivity.launch(requireContext()) +// com.btpj.module_user.ui.login.LoginActivity.launch(requireContext()) } } } diff --git a/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt b/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt index f2b7fe9..5ab35a5 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt +++ b/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt @@ -3,7 +3,6 @@ package com.btpj.wanandroid.data import com.btpj.lib_base.data.bean.* import com.btpj.lib_base.http.BaseRepository import com.btpj.lib_base.http.RetrofitManager -import com.btpj.wanandroid.data.bean.* import com.btpj.wanandroid.data.http.Api import retrofit2.http.Path import retrofit2.http.Query @@ -17,18 +16,6 @@ object DataRepository : BaseRepository(), Api { private val service by lazy { RetrofitManager.getService(Api::class.java) } - override suspend fun login(username: String, pwd: String): ApiResponse { - return apiCall { service.login(username, pwd) } - } - - override suspend fun register( - username: String, - pwd: String, - pwdSure: String - ): ApiResponse { - return apiCall { service.register(username, pwd, pwdSure) } - } - override suspend fun getBanner(): ApiResponse> { return apiCall { service.getBanner() } } @@ -104,18 +91,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } } - override suspend fun getUserIntegral(): ApiResponse { - return apiCall { service.getUserIntegral() } - } - - override suspend fun getIntegralRankPageList(pageNo: Int): ApiResponse> { - return apiCall { service.getIntegralRankPageList(pageNo) } - } - - override suspend fun getIntegralRecordPageList(pageNo: Int): ApiResponse> { - return apiCall { service.getIntegralRecordPageList(pageNo) } - } - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { return apiCall { service.getCollectArticlePageList(pageNo) } } @@ -124,10 +99,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.getCollectUrlList() } } - override suspend fun getMyShareArticlePageList(pageNo: Int): ApiResponse { - return apiCall { service.getMyShareArticlePageList(pageNo) } - } - override suspend fun addArticle(title: String, link: String): ApiResponse { return apiCall { service.addArticle(title, link) } } diff --git a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt b/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt index f8a1cf5..3208241 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt +++ b/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt @@ -1,7 +1,6 @@ package com.btpj.wanandroid.data.http import com.btpj.lib_base.data.bean.* -import com.btpj.wanandroid.data.bean.* import retrofit2.http.* /** @@ -11,23 +10,6 @@ import retrofit2.http.* */ interface Api { - /** 登录 */ - @FormUrlEncoded - @POST("user/login") - suspend fun login( - @Field("username") username: String, - @Field("password") pwd: String - ): ApiResponse - - /** 注册 */ - @FormUrlEncoded - @POST("user/register") - suspend fun register( - @Field("username") username: String, - @Field("password") pwd: String, - @Field("repassword") pwdSure: String - ): ApiResponse - /** 获取首页banner数据 */ @GET("banner/json") suspend fun getBanner(): ApiResponse> @@ -101,18 +83,6 @@ interface Api { @Query("page_size") pageSize: Int ): ApiResponse> - /** 获取个人积分 */ - @GET("lg/coin/userinfo/json") - suspend fun getUserIntegral(): ApiResponse - - /** 获取积分排行列表分页 */ - @GET("coin/rank/{pageNo}/json") - suspend fun getIntegralRankPageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取积分历史 */ - @GET("lg/coin/list/{pageNo}/json") - suspend fun getIntegralRecordPageList(@Path("pageNo") pageNo: Int): ApiResponse> - /** 获取收藏文章分页列表 */ @GET("lg/collect/list/{pageNo}/json") suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> @@ -121,10 +91,6 @@ interface Api { @GET("lg/collect/usertools/json") suspend fun getCollectUrlList(): ApiResponse> - /** 获取我分享的文章分页列表 */ - @GET("user/lg/private_articles/{pageNo}/json") - suspend fun getMyShareArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse - /** 添加要分享的文章 */ @POST("lg/user_article/add/json") @FormUrlEncoded diff --git a/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt b/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt index 4d01f32..c79a547 100644 --- a/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt +++ b/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt @@ -3,37 +3,5 @@ package com.btpj.wanandroid.ext import android.content.Context import android.view.View import android.view.ViewGroup -import com.btpj.wanandroid.data.local.UserManager -import com.btpj.wanandroid.ui.login.LoginActivity import com.google.android.material.bottomnavigation.BottomNavigationView -/** - * 一些扩展函数 - * @author LTP 2022/4/12 - */ - -/** - * 需要验证登录状态的操作 - * - * @param action 函数参数，已登录状态时的处理 - */ -fun Context.launchCheckLogin(action: (context: Context) -> Unit) { - if (UserManager.isLogin()) { - action.invoke(this) - } else { - LoginActivity.launch(this) - } -} - -/** - * 处理BottomNavigationView中的tab长按出现toast的问题 - * - * @param ids tab项的id集 - */ -fun BottomNavigationView.clearLongClickToast(ids: MutableList) { - val bottomNavigationView: ViewGroup = getChildAt(0) as ViewGroup - for (position in 0 until ids.size) { - bottomNavigationView.getChildAt(position).findViewById(ids[position]) - .setOnLongClickListener { true } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt index 2995bc0..33a9547 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt @@ -8,7 +8,7 @@ import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article -import com.btpj.wanandroid.data.bean.CoinInfo +import com.btpj.lib_base.data.bean.CoinInfo /** * @author LTP 2022/3/9 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt index 239451a..17c308c 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt @@ -3,12 +3,12 @@ package com.btpj.wanandroid.ui.collect.article import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.CollectArticle +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.wanandroid.R import java.util.* /** @@ -17,7 +17,7 @@ import java.util.* * @author LTP 2022/3/10 */ class CollectArticleFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 页数 */ private var mPageNo: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt index a66cfba..067be23 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt @@ -3,10 +3,10 @@ package com.btpj.wanandroid.ui.collect.url import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding /** * 收藏的文章 @@ -14,7 +14,7 @@ import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding * @author LTP 2022/3/10 */ class CollectUrlFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { private val mAdapter by lazy { CollectUrlAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt index 7dcb1a4..ce7c082 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt @@ -4,11 +4,11 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment +import com.btpj.lib_base.ext.clearLongClickToast import com.btpj.lib_base.utils.ToastUtil import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseActivity import com.btpj.wanandroid.databinding.ActivityMainBinding -import com.btpj.wanandroid.ext.clearLongClickToast import com.btpj.wanandroid.ui.main.home.HomeFragment import com.btpj.wanandroid.ui.main.mine.MineFragment import com.btpj.wanandroid.ui.main.project.ProjectFragment @@ -154,7 +154,7 @@ class MainActivity : // 重写返回键监听实现双击退出 if (System.currentTimeMillis() - lastBackMills > 2000) { lastBackMills = System.currentTimeMillis() - ToastUtil.showShort(this, getString(R.string.toast_double_back_exit)) + ToastUtil.showShort(this, getString(com.btpj.lib_base.R.string.toast_double_back_exit)) } else { super.onBackPressed() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt index 027f1ef..07e9304 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt @@ -60,7 +60,7 @@ class HomeFragment : BaseFragment(R.layout.f } mBinding.apply { - titleLayout.setRightView(R.drawable.ic_search) { + titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_search) { SearchActivity.launch(requireContext()) } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt index 140d9cf..19c0e13 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt @@ -7,15 +7,11 @@ import com.btpj.lib_base.base.App import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.lib_base.ext.launchCheckLogin import com.btpj.wanandroid.databinding.FragmentMineBinding -import com.btpj.wanandroid.ext.launchCheckLogin import com.btpj.wanandroid.ui.collect.CollectActivity -import com.btpj.wanandroid.ui.integral.rank.IntegralRankActivity -import com.btpj.wanandroid.ui.login.LoginActivity -import com.btpj.wanandroid.ui.setting.SettingActivity -import com.btpj.wanandroid.ui.share.list.MyArticleActivity /** * 我的Tab @@ -37,13 +33,13 @@ class MineFragment : BaseFragment(R.layout.f clUser.setOnClickListener { if (!UserManager.isLogin()) { - LoginActivity.launch(requireContext()) + ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() } } // 我的积分 tvPoints.setOnClickListener { - IntegralRankActivity.launch(requireContext()) +// IntegralRankActivity.launch(requireContext()) } // 我的收藏（需要登录） @@ -53,7 +49,7 @@ class MineFragment : BaseFragment(R.layout.f // 我分享的文章（需要登录） tvArticle.setOnClickListener { - requireContext().launchCheckLogin { MyArticleActivity.launch(it) } +// requireContext().launchCheckLogin { MyArticleActivity.launch(it) } } // 开源网站 @@ -67,7 +63,7 @@ class MineFragment : BaseFragment(R.layout.f } // 设置 - tvSettings.setOnClickListener { SettingActivity.launch(requireContext()) } +// tvSettings.setOnClickListener { SettingActivity.launch(requireContext()) } } onRefresh() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt index 4fc91e1..0ff996e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt @@ -3,12 +3,12 @@ package com.btpj.wanandroid.ui.main.mine import androidx.databinding.ObservableField import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.bean.CoinInfo import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.CoinInfo import com.btpj.lib_base.data.bean.User -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.lib_base.data.local.UserManager class MineViewModel : BaseViewModel() { val user = ObservableField() @@ -29,10 +29,10 @@ class MineViewModel : BaseViewModel() { /** 获取个人积分 */ fun fetchPoints() { launch({ - val response = DataRepository.getUserIntegral() - handleRequest(response, { - integral.value = response.data - }) +// val response = DataRepository.getUserIntegral() +// handleRequest(response, { +// integral.value = response.data +// }) }) } } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt index 04ad273..f02f4b9 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt @@ -5,13 +5,13 @@ import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.wanandroid.R import com.btpj.wanandroid.ui.author.AuthorActivity import com.btpj.wanandroid.ui.main.home.HomeViewModel @@ -21,7 +21,7 @@ import com.btpj.wanandroid.ui.main.home.HomeViewModel * @author LTP 2022/3/10 */ class ProjectChildFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt index 22e1bd5..b292d1b 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt @@ -6,7 +6,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter import com.btpj.lib_base.ext.toHtml import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.data.bean.ProjectTitle +import com.btpj.lib_base.data.bean.ProjectTitle import com.btpj.wanandroid.databinding.FragmentViewpagerBinding import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt index 036dbc0..8371e39 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt @@ -5,7 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.ProjectTitle +import com.btpj.lib_base.data.bean.ProjectTitle class ProjectViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt index ec483a6..69683ed 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt @@ -8,12 +8,11 @@ import com.btpj.lib_base.utils.ScreenUtil import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment import com.btpj.wanandroid.databinding.FragmentViewpagerBinding -import com.btpj.wanandroid.ext.launchCheckLogin +import com.btpj.lib_base.ext.launchCheckLogin import com.btpj.wanandroid.ui.main.square.ask.AskFragment import com.btpj.wanandroid.ui.main.square.navigation.NavigationFragment import com.btpj.wanandroid.ui.main.square.square.SquareChildFragment import com.btpj.wanandroid.ui.main.square.system.SystemFragment -import com.btpj.wanandroid.ui.share.add.AddArticleActivity import com.google.android.material.tabs.TabLayoutMediator /** @@ -35,8 +34,8 @@ class SquareFragment : override fun onPageSelected(position: Int) { super.onPageSelected(position) if (position == 0) { - mBinding.titleLayout.setRightView(R.drawable.ic_add) { - requireContext().launchCheckLogin { AddArticleActivity.launch(it) } + mBinding.titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_add) { +// requireContext().launchCheckLogin { AddArticleActivity.launch(it) } } } else { mBinding.titleLayout.setRightView("") diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt index f365ed8..7aa8396 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt @@ -10,7 +10,7 @@ import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.wanandroid.ui.author.AuthorActivity import com.btpj.wanandroid.ui.main.home.ArticleAdapter @@ -20,7 +20,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class AskFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt index 02d2224..4b1fed4 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt @@ -1,7 +1,7 @@ package com.btpj.wanandroid.ui.main.square.navigation import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.Navigation +import com.btpj.lib_base.data.bean.Navigation import com.btpj.wanandroid.databinding.ListItemSystemBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt index b6c3b97..8ed194a 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt @@ -3,9 +3,10 @@ package com.btpj.wanandroid.ui.main.square.navigation import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.R + /** * 广场Tab下的体系 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt index c9b85c0..533ce64 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt @@ -5,7 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.Navigation +import com.btpj.lib_base.data.bean.Navigation class NavigationViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt index 5f7f0f1..f82e021 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt @@ -10,7 +10,7 @@ import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.wanandroid.ui.author.AuthorActivity import com.btpj.wanandroid.ui.main.home.ArticleAdapter @@ -20,7 +20,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class SquareChildFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 页数 */ private var mPageNo: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt index 2fec936..a69feeb 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt @@ -1,7 +1,7 @@ package com.btpj.wanandroid.ui.main.square.system import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.MySystem +import com.btpj.lib_base.data.bean.MySystem import com.btpj.wanandroid.databinding.ListItemSystemBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt index 2bb8ea5..c103cbc 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt @@ -1,7 +1,7 @@ package com.btpj.wanandroid.ui.main.square.system import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.Classify +import com.btpj.lib_base.data.bean.Classify import com.btpj.wanandroid.databinding.ListItemTvBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt index afe7eab..2337895 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt @@ -3,9 +3,8 @@ package com.btpj.wanandroid.ui.main.square.system import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding /** * 广场Tab下的体系 @@ -13,7 +12,7 @@ import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding * @author LTP 2022/4/7 */ class SystemFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { private val mAdapter by lazy { SystemAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt index b1f5cc4..943d9db 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt @@ -5,7 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.MySystem +import com.btpj.lib_base.data.bean.MySystem class SystemViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt index beef51a..00e042f 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt @@ -11,7 +11,7 @@ import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.wanandroid.ui.author.AuthorActivity import com.btpj.wanandroid.ui.main.home.ArticleAdapter @@ -21,7 +21,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class WechatChildFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt index 955db5f..516f819 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt @@ -5,7 +5,7 @@ import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter import com.btpj.wanandroid.R import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.data.bean.Classify +import com.btpj.lib_base.data.bean.Classify import com.btpj.wanandroid.databinding.FragmentViewpagerBinding import com.google.android.material.tabs.TabLayoutMediator diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt index 3b8f031..055fa91 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt @@ -5,7 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.Classify +import com.btpj.lib_base.data.bean.Classify class WechatViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt index b1b6e08..a51106b 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt @@ -1,7 +1,7 @@ package com.btpj.wanandroid.ui.search import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.HotSearch +import com.btpj.lib_base.data.bean.HotSearch import com.btpj.wanandroid.databinding.ListItemTvBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt index c5dee19..daa7575 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt @@ -40,7 +40,7 @@ class SearchActivity : override fun initView(savedInstanceState: Bundle?) { mBinding.apply { // toolbar + SearchView挺麻烦不想用 - titleLayout.setRightView(R.drawable.ic_search) { + titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_search) { handleSearch() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt index 36fdb10..04572d5 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt @@ -2,7 +2,7 @@ package com.btpj.wanandroid.ui.search import android.view.View import com.btpj.wanandroid.R -import com.btpj.wanandroid.databinding.ListItemIpBinding +import com.btpj.wanandroid.databinding.ListItemSearchBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class SearchHistoryAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_ip), + BaseQuickAdapter>(layoutResId = R.layout.list_item_search), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: String) { + override fun convert(holder: BaseDataBindingHolder, item: String) { holder.dataBinding?.apply { this.item = item executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt index e57e7da..a32acab 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt @@ -5,7 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.HotSearch +import com.btpj.lib_base.data.bean.HotSearch import com.btpj.wanandroid.data.local.CacheManager /** diff --git a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt b/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt index b451206..916fc7b 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt @@ -21,7 +21,11 @@ class SplashActivity : BaseActivity(R.layout.activity_splash) { private val mBannerList = - listOf(R.drawable.ic_splash, R.drawable.ic_splash2, R.drawable.ic_splash3) + listOf( + com.btpj.lib_base.R.drawable.ic_splash, + com.btpj.lib_base.R.drawable.ic_splash2, + com.btpj.lib_base.R.drawable.ic_splash3 + ) private val mAdapter by lazy { SplashBannerAdapter(mBannerList) } diff --git a/app/src/main/res/drawable/ic_collect.xml b/app/src/main/res/drawable/ic_collect.xml deleted file mode 100644 index 8ea16be..0000000 --- a/app/src/main/res/drawable/ic_collect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_un_collect.xml b/app/src/main/res/drawable/ic_un_collect.xml deleted file mode 100644 index 2f1d659..0000000 --- a/app/src/main/res/drawable/ic_un_collect.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/list_item_ip.xml b/app/src/main/res/layout/list_item_search.xml similarity index 100% rename from app/src/main/res/layout/list_item_ip.xml rename to app/src/main/res/layout/list_item_search.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ed76147..f2017f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,54 +1,4 @@ + 玩Android - 首页 - 项目 - 广场 - 公众号 - 我的 - - 再按一次退出程序 - 置顶 - 新 - 收藏 - 刷新 - 用浏览器打开 - 我的积分: - 我的收藏 - 我分享的文章 - 开源网站 - 系统设置 - 登录 - 账号 - 密码 - 确认密码 - 用户名 - 去注册 - 基本设置 - 清除缓存 - 退出登录 - 版本 - 作者 - 项目源码 - id：—　排名：— - 积分排行 - 积分规则 - 积分记录 - 分享文章 - 标题 - 文章标题 - 链接 - 分享人 - 分享 - 文章链接 - 热门搜索 - 搜索历史 - 清空 - 搜索 - 输入关键字搜索 - 立即进入 - 注册 - 切换IP - 请输入IP和端口 - 确认 - 历史IP与端口(可选择) \ No newline at end of file diff --git a/lib_base/build.gradle b/lib_base/build.gradle index f1d45fd..3e9cc00 100644 --- a/lib_base/build.gradle +++ b/lib_base/build.gradle @@ -77,7 +77,6 @@ dependencies { // ARouter路由 api rootProject.ext.dependencies.arouter_api - kapt rootProject.ext.dependencies.arouter_compiler // bugly api rootProject.ext.dependencies.bugly_update diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Classify.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Classify.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Classify.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Classify.kt index 6bececc..917d80c 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Classify.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Classify.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean data class Classify( val author: String, diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/CoinInfo.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/data/bean/CoinInfo.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt index f91589c..d192a06 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/CoinInfo.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/HotSearch.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt similarity index 82% rename from app/src/main/java/com/btpj/wanandroid/data/bean/HotSearch.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt index b1e8a22..38798cf 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/HotSearch.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean /** * 热门搜索 diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/IntegralRecord.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt similarity index 86% rename from app/src/main/java/com/btpj/wanandroid/data/bean/IntegralRecord.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt index 52648a1..b76844c 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/IntegralRecord.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean /** * 积分记录 diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt index d44471c..7d8cba0 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/MySystem.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean /** * @author LTP 2022/4/7 diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Navigation.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt similarity index 83% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Navigation.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt index 2b64eda..a0577ce 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Navigation.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import com.btpj.lib_base.data.bean.Article diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/OtherAuthor.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt similarity index 76% rename from app/src/main/java/com/btpj/wanandroid/data/bean/OtherAuthor.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt index af6ea03..776d738 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/OtherAuthor.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt @@ -1,6 +1,7 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.bean.CoinInfo import com.btpj.lib_base.data.bean.PageResponse /** diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/ProjectTitle.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt similarity index 91% rename from app/src/main/java/com/btpj/wanandroid/data/bean/ProjectTitle.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt index 147a4ee..b4ab437 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/ProjectTitle.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.bean +package com.btpj.lib_base.data.bean /** * 项目标题实体 diff --git a/app/src/main/java/com/btpj/wanandroid/data/bean/Share.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Share.kt similarity index 52% rename from app/src/main/java/com/btpj/wanandroid/data/bean/Share.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/bean/Share.kt index a2d09dc..7ac7771 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/bean/Share.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/Share.kt @@ -1,7 +1,4 @@ -package com.btpj.wanandroid.data.bean - -import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.data.bean.PageResponse +package com.btpj.lib_base.data.bean /** * 我的分享 diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt index 85e115c..2986040 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt @@ -7,6 +7,9 @@ object Constants { //------- ARouter相关启动变量 start -------------- + // mine Module + const val ROUTER_MINE_LOGIN_ACTIVITY = "/mine/loginActivity" + // Web Module const val ROUTER_WEB_WEB_ACTIVITY = "/web/WebActivity" const val ROUTER_WEB_EXTRA_BANNER = "extra_banner" diff --git a/app/src/main/java/com/btpj/wanandroid/data/local/UserManager.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/UserManager.kt similarity index 98% rename from app/src/main/java/com/btpj/wanandroid/data/local/UserManager.kt rename to lib_base/src/main/java/com/btpj/lib_base/data/local/UserManager.kt index 6b30417..97c1d1e 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/local/UserManager.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/UserManager.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.local +package com.btpj.lib_base.data.local import com.btpj.lib_base.data.bean.User import com.tencent.mmkv.MMKV diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt b/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt index 847980d..46360f5 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt @@ -1,6 +1,7 @@ package com.btpj.lib_base.ext import android.annotation.SuppressLint +import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -17,11 +18,44 @@ import com.afollestad.materialdialogs.customview.customView import com.afollestad.materialdialogs.customview.getCustomView import com.afollestad.materialdialogs.lifecycle.lifecycleOwner import com.btpj.lib_base.R +import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.utils.ScreenUtil import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions +import com.google.android.material.bottomnavigation.BottomNavigationView + +/** + * 一些扩展函数 + * @author LTP 2022/4/12 + */ + +/** + * 需要验证登录状态的操作 + * + * @param action 函数参数，已登录状态时的处理 + */ +fun Context.launchCheckLogin(action: (context: Context) -> Unit) { + if (UserManager.isLogin()) { + action.invoke(this) + } else { +// com.btpj.module_user.ui.login.LoginActivity.launch(this) + } +} + +/** + * 处理BottomNavigationView中的tab长按出现toast的问题 + * + * @param ids tab项的id集 + */ +fun BottomNavigationView.clearLongClickToast(ids: MutableList) { + val bottomNavigationView: ViewGroup = getChildAt(0) as ViewGroup + for (position in 0 until ids.size) { + bottomNavigationView.getChildAt(position).findViewById(ids[position]) + .setOnLongClickListener { true } + } +} /** * ImageView利用Glide加载图片 diff --git a/app/src/main/res/drawable-xxhdpi/default_project_img.webp b/lib_base/src/main/res/drawable-xxhdpi/default_project_img.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/default_project_img.webp rename to lib_base/src/main/res/drawable-xxhdpi/default_project_img.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash.webp b/lib_base/src/main/res/drawable-xxhdpi/ic_splash.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_splash.webp rename to lib_base/src/main/res/drawable-xxhdpi/ic_splash.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash2.webp b/lib_base/src/main/res/drawable-xxhdpi/ic_splash2.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_splash2.webp rename to lib_base/src/main/res/drawable-xxhdpi/ic_splash2.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_splash3.webp b/lib_base/src/main/res/drawable-xxhdpi/ic_splash3.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_splash3.webp rename to lib_base/src/main/res/drawable-xxhdpi/ic_splash3.webp diff --git a/app/src/main/res/drawable/frame_green.xml b/lib_base/src/main/res/drawable/frame_green.xml similarity index 100% rename from app/src/main/res/drawable/frame_green.xml rename to lib_base/src/main/res/drawable/frame_green.xml diff --git a/app/src/main/res/drawable/frame_red.xml b/lib_base/src/main/res/drawable/frame_red.xml similarity index 100% rename from app/src/main/res/drawable/frame_red.xml rename to lib_base/src/main/res/drawable/frame_red.xml diff --git a/app/src/main/res/drawable/ic_add.xml b/lib_base/src/main/res/drawable/ic_add.xml similarity index 100% rename from app/src/main/res/drawable/ic_add.xml rename to lib_base/src/main/res/drawable/ic_add.xml diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/lib_base/src/main/res/drawable/ic_arrow_right.xml similarity index 100% rename from app/src/main/res/drawable/ic_arrow_right.xml rename to lib_base/src/main/res/drawable/ic_arrow_right.xml diff --git a/app/src/main/res/drawable/ic_article.xml b/lib_base/src/main/res/drawable/ic_article.xml similarity index 100% rename from app/src/main/res/drawable/ic_article.xml rename to lib_base/src/main/res/drawable/ic_article.xml diff --git a/app/src/main/res/drawable/ic_clear.xml b/lib_base/src/main/res/drawable/ic_clear.xml similarity index 100% rename from app/src/main/res/drawable/ic_clear.xml rename to lib_base/src/main/res/drawable/ic_clear.xml diff --git a/app/src/main/res/drawable/ic_integral_record.xml b/lib_base/src/main/res/drawable/ic_integral_record.xml similarity index 100% rename from app/src/main/res/drawable/ic_integral_record.xml rename to lib_base/src/main/res/drawable/ic_integral_record.xml diff --git a/app/src/main/res/drawable/ic_integral_rule.xml b/lib_base/src/main/res/drawable/ic_integral_rule.xml similarity index 100% rename from app/src/main/res/drawable/ic_integral_rule.xml rename to lib_base/src/main/res/drawable/ic_integral_rule.xml diff --git a/app/src/main/res/drawable/ic_points.xml b/lib_base/src/main/res/drawable/ic_points.xml similarity index 100% rename from app/src/main/res/drawable/ic_points.xml rename to lib_base/src/main/res/drawable/ic_points.xml diff --git a/app/src/main/res/drawable/ic_search.xml b/lib_base/src/main/res/drawable/ic_search.xml similarity index 100% rename from app/src/main/res/drawable/ic_search.xml rename to lib_base/src/main/res/drawable/ic_search.xml diff --git a/app/src/main/res/drawable/ic_settings.xml b/lib_base/src/main/res/drawable/ic_settings.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings.xml rename to lib_base/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/res/drawable/ic_tab_home.xml b/lib_base/src/main/res/drawable/ic_tab_home.xml similarity index 100% rename from app/src/main/res/drawable/ic_tab_home.xml rename to lib_base/src/main/res/drawable/ic_tab_home.xml diff --git a/app/src/main/res/drawable/ic_tab_mine.xml b/lib_base/src/main/res/drawable/ic_tab_mine.xml similarity index 100% rename from app/src/main/res/drawable/ic_tab_mine.xml rename to lib_base/src/main/res/drawable/ic_tab_mine.xml diff --git a/app/src/main/res/drawable/ic_tab_project.xml b/lib_base/src/main/res/drawable/ic_tab_project.xml similarity index 100% rename from app/src/main/res/drawable/ic_tab_project.xml rename to lib_base/src/main/res/drawable/ic_tab_project.xml diff --git a/app/src/main/res/drawable/ic_tab_square.xml b/lib_base/src/main/res/drawable/ic_tab_square.xml similarity index 100% rename from app/src/main/res/drawable/ic_tab_square.xml rename to lib_base/src/main/res/drawable/ic_tab_square.xml diff --git a/app/src/main/res/drawable/ic_tab_wechat.xml b/lib_base/src/main/res/drawable/ic_tab_wechat.xml similarity index 100% rename from app/src/main/res/drawable/ic_tab_wechat.xml rename to lib_base/src/main/res/drawable/ic_tab_wechat.xml diff --git a/app/src/main/res/drawable/ic_user.xml b/lib_base/src/main/res/drawable/ic_user.xml similarity index 100% rename from app/src/main/res/drawable/ic_user.xml rename to lib_base/src/main/res/drawable/ic_user.xml diff --git a/app/src/main/res/drawable/ic_web.xml b/lib_base/src/main/res/drawable/ic_web.xml similarity index 100% rename from app/src/main/res/drawable/ic_web.xml rename to lib_base/src/main/res/drawable/ic_web.xml diff --git a/app/src/main/res/drawable/selector_bg_tv.xml b/lib_base/src/main/res/drawable/selector_bg_tv.xml similarity index 100% rename from app/src/main/res/drawable/selector_bg_tv.xml rename to lib_base/src/main/res/drawable/selector_bg_tv.xml diff --git a/app/src/main/res/layout/include_line.xml b/lib_base/src/main/res/layout/include_line.xml similarity index 100% rename from app/src/main/res/layout/include_line.xml rename to lib_base/src/main/res/layout/include_line.xml diff --git a/app/src/main/res/layout/include_swiperefresh_recyclerview.xml b/lib_base/src/main/res/layout/include_swiperefresh_recyclerview.xml similarity index 100% rename from app/src/main/res/layout/include_swiperefresh_recyclerview.xml rename to lib_base/src/main/res/layout/include_swiperefresh_recyclerview.xml diff --git a/app/src/main/res/layout/include_toolbar.xml b/lib_base/src/main/res/layout/include_toolbar.xml similarity index 100% rename from app/src/main/res/layout/include_toolbar.xml rename to lib_base/src/main/res/layout/include_toolbar.xml diff --git a/lib_base/src/main/res/values-night/themes.xml b/lib_base/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..82bd055 --- /dev/null +++ b/lib_base/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/lib_base/src/main/res/values/colors.xml b/lib_base/src/main/res/values/colors.xml index 0f46bfb..b006380 100644 --- a/lib_base/src/main/res/values/colors.xml +++ b/lib_base/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #FF03DAC5 #FF018786 #FF000000 + #FFFFFFFF #333333 #3700B3 diff --git a/lib_base/src/main/res/values/strings.xml b/lib_base/src/main/res/values/strings.xml index 8beea1a..6d0175b 100644 --- a/lib_base/src/main/res/values/strings.xml +++ b/lib_base/src/main/res/values/strings.xml @@ -4,4 +4,58 @@ 网络连接失败，请稍后重试 网络请求超时，请稍后重试 请求网络中… + + 首页 + 项目 + 广场 + 公众号 + 我的 + + 再按一次退出程序 + 置顶 + 新 + 收藏 + 刷新 + 用浏览器打开 + 浏览器 + 我的积分: + 我的收藏 + 我分享的文章 + 开源网站 + 系统设置 + + 基本设置 + 清除缓存 + 退出登录 + 版本 + 作者 + 项目源码 + id：—　排名：— + 积分排行 + 积分规则 + 积分记录 + 分享文章 + 标题 + 文章标题 + 链接 + 分享人 + 分享 + 文章链接 + 热门搜索 + 搜索历史 + 清空 + 搜索 + 输入关键字搜索 + 立即进入 + 注册 + 切换IP + 请输入IP和端口 + 确认 + 历史IP与端口(可选择) + 登录 + 账号 + 密码 + 确认密码 + 用户名 + 去注册 \ No newline at end of file diff --git a/lib_base/src/main/res/values/themes.xml b/lib_base/src/main/res/values/themes.xml new file mode 100644 index 0000000..4d2e2de --- /dev/null +++ b/lib_base/src/main/res/values/themes.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_mine/.gitignore b/module_mine/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_mine/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_mine/build.gradle b/module_mine/build.gradle new file mode 100644 index 0000000..7c0a589 --- /dev/null +++ b/module_mine/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_mine" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "mine_" +} \ No newline at end of file diff --git a/module_mine/proguard-rules.pro b/module_mine/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_mine/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_mine/src/androidTest/java/com/btpj/module_mine/ExampleInstrumentedTest.kt b/module_mine/src/androidTest/java/com/btpj/module_mine/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..7fcf16a --- /dev/null +++ b/module_mine/src/androidTest/java/com/btpj/module_mine/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_mine + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_user", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_mine/src/main/AndroidManifest.xml b/module_mine/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3369669 --- /dev/null +++ b/module_mine/src/main/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + + + + \ No newline at end of file diff --git a/module_mine/src/main/alone/AndroidManifest.xml b/module_mine/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..f2fdedb --- /dev/null +++ b/module_mine/src/main/alone/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt new file mode 100644 index 0000000..e61b218 --- /dev/null +++ b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt @@ -0,0 +1,67 @@ +package com.btpj.module_mine.data + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.lib_base.data.bean.IntegralRecord +import com.btpj.lib_base.data.bean.Share +import com.btpj.module_mine.data.http.Api + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun login(username: String, pwd: String): ApiResponse { + return apiCall { service.login(username, pwd) } + } + + override suspend fun register( + username: String, + pwd: String, + pwdSure: String + ): ApiResponse { + return apiCall { service.register(username, pwd, pwdSure) } + } + + override suspend fun getUserIntegral(): ApiResponse { + return apiCall { service.getUserIntegral() } + } + + override suspend fun getIntegralRankPageList(pageNo: Int): ApiResponse> { + return apiCall { service.getIntegralRankPageList(pageNo) } + } + + override suspend fun getIntegralRecordPageList(pageNo: Int): ApiResponse> { + return apiCall { service.getIntegralRecordPageList(pageNo) } + } + + override suspend fun getCollectUrlList(): ApiResponse> { + return apiCall { service.getCollectUrlList() } + } + + override suspend fun getMyShareArticlePageList(pageNo: Int): ApiResponse { + return apiCall { service.getMyShareArticlePageList(pageNo) } + } + + override suspend fun addArticle(title: String, link: String): ApiResponse { + return apiCall { service.addArticle(title, link) } + } + + override suspend fun deleteShareArticle(id: Int): ApiResponse { + return apiCall { service.deleteShareArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } +} \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt new file mode 100644 index 0000000..aacc41a --- /dev/null +++ b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt @@ -0,0 +1,75 @@ +package com.btpj.module_mine.data.http + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.lib_base.data.bean.IntegralRecord +import com.btpj.lib_base.data.bean.Share +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 登录 */ + @FormUrlEncoded + @POST("user/login") + suspend fun login( + @Field("username") username: String, + @Field("password") pwd: String + ): ApiResponse + + /** 注册 */ + @FormUrlEncoded + @POST("user/register") + suspend fun register( + @Field("username") username: String, + @Field("password") pwd: String, + @Field("repassword") pwdSure: String + ): ApiResponse + + /** 获取个人积分 */ + @GET("lg/coin/userinfo/json") + suspend fun getUserIntegral(): ApiResponse + + /** 获取积分排行列表分页 */ + @GET("coin/rank/{pageNo}/json") + suspend fun getIntegralRankPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取积分历史 */ + @GET("lg/coin/list/{pageNo}/json") + suspend fun getIntegralRecordPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取收藏网址列表 */ + @GET("lg/collect/usertools/json") + suspend fun getCollectUrlList(): ApiResponse> + + /** 获取我分享的文章分页列表 */ + @GET("user/lg/private_articles/{pageNo}/json") + suspend fun getMyShareArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse + + /** 添加要分享的文章 */ + @POST("lg/user_article/add/json") + @FormUrlEncoded + suspend fun addArticle( + @Field("title") title: String, + @Field("link") link: String + ): ApiResponse + + /** 删除自己分享的文章 */ + @POST("lg/user_article/delete/{id}/json") + suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralAdapter.kt similarity index 51% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralAdapter.kt index 76ee15d..6ad024e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.integral.rank +package com.btpj.module_mine.ui.integral.rank -import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.CoinInfo -import com.btpj.wanandroid.databinding.ListItemIntegralBinding +import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemIntegralBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,19 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class IntegralAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_integral), + BaseQuickAdapter>( + layoutResId = R.layout.mine_list_item_integral + ), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: CoinInfo) { + override fun convert( + holder: BaseDataBindingHolder, + item: CoinInfo + ) { holder.dataBinding?.apply { integral = item executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt index 70ddb72..2165452 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt @@ -1,22 +1,22 @@ -package com.btpj.wanandroid.ui.integral.rank +package com.btpj.module_mine.ui.integral.rank import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.ext.initTitle import com.btpj.lib_base.ext.initClose -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.local.Constants -import com.btpj.lib_base.ext.initColors -import com.btpj.lib_base.ext.initTitle -import com.btpj.wanandroid.data.bean.CoinInfo -import com.btpj.wanandroid.databinding.ActivityIntegralRankBinding -import com.btpj.wanandroid.ui.integral.record.IntegralRecordActivity +import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.module_mine.ui.integral.record.IntegralRecordActivity +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityIntegralRankBinding /** * 积分排行 @@ -24,7 +24,7 @@ import com.btpj.wanandroid.ui.integral.record.IntegralRecordActivity * @author LTP 2022/4/12 */ class IntegralRankActivity : - BaseActivity(R.layout.activity_integral_rank) { + BaseVMBActivity(R.layout.mine_activity_integral_rank) { /** 页数 */ private var mPageNo: Int = 0 @@ -48,7 +48,7 @@ class IntegralRankActivity : .apply { initTitle("积分排行") initClose { onBackPressed() } - inflateMenu(R.menu.menu_integral_rank) + inflateMenu(R.menu.mine_menu_integral_rank) setOnMenuItemClickListener { when (it.itemId) { R.id.item_integralRule -> diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankViewModel.kt similarity index 85% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankViewModel.kt index 6ddd104..90d7a16 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/rank/IntegralRankViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankViewModel.kt @@ -1,14 +1,14 @@ -package com.btpj.wanandroid.ui.integral.rank +package com.btpj.module_mine.ui.integral.rank import androidx.databinding.ObservableField import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.bean.CoinInfo import com.btpj.lib_base.data.bean.PageResponse +import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.CoinInfo -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.module_mine.data.DataRepository class IntegralRankViewModel : BaseViewModel() { /** 我的积分信息 */ diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordActivity.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordActivity.kt index 3c7e606..052369d 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordActivity.kt @@ -1,16 +1,16 @@ -package com.btpj.wanandroid.ui.integral.record +package com.btpj.module_mine.ui.integral.record import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.data.bean.IntegralRecord import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView -import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.data.bean.IntegralRecord -import com.btpj.wanandroid.databinding.ActivityIntegralRecordBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityIntegralRecordBinding /** * 积分记录 @@ -18,7 +18,7 @@ import com.btpj.wanandroid.databinding.ActivityIntegralRecordBinding * @author LTP 2022/4/12 */ class IntegralRecordActivity : - BaseActivity(R.layout.activity_integral_record) { + BaseVMBActivity(R.layout.mine_activity_integral_record) { /** 页数 */ private var mPageNo: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordAdapter.kt similarity index 67% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordAdapter.kt index 2683c59..b73420a 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordAdapter.kt @@ -1,9 +1,9 @@ -package com.btpj.wanandroid.ui.integral.record +package com.btpj.module_mine.ui.integral.record import android.annotation.SuppressLint -import com.btpj.wanandroid.R -import com.btpj.wanandroid.data.bean.IntegralRecord -import com.btpj.wanandroid.databinding.ListItemIntegralRecordBinding +import com.btpj.lib_base.data.bean.IntegralRecord +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemIntegralRecordBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -14,8 +14,8 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class IntegralRecordAdapter : - BaseQuickAdapter>( - layoutResId = R.layout.list_item_integral_record + BaseQuickAdapter>( + layoutResId = R.layout.mine_list_item_integral_record ), LoadMoreModule { init { @@ -24,7 +24,7 @@ class IntegralRecordAdapter : @SuppressLint("SetTextI18n") override fun convert( - holder: BaseDataBindingHolder, + holder: BaseDataBindingHolder, item: IntegralRecord ) { holder.dataBinding?.apply { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordViewModel.kt similarity index 82% rename from app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordViewModel.kt index a5b931c..56cf721 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/integral/record/IntegralRecordViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/record/IntegralRecordViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.integral.record +package com.btpj.module_mine.ui.integral.record import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.bean.IntegralRecord import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.bean.IntegralRecord +import com.btpj.module_mine.data.DataRepository class IntegralRecordViewModel : BaseViewModel() { val integralRecordPageList = MutableLiveData>() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpActivity.kt similarity index 86% rename from app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpActivity.kt index 431c387..9edda6d 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpActivity.kt @@ -1,16 +1,16 @@ -package com.btpj.wanandroid.ui.ip +package com.btpj.module_mine.ui.ip import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.local.IpManager import com.btpj.lib_base.ext.showDialog import com.btpj.lib_base.http.RetrofitManager import com.btpj.lib_base.utils.KeyboardUtil -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityChangeIpBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityChangeIpBinding /** * 切换Ip的界面 @@ -18,7 +18,7 @@ import com.btpj.wanandroid.databinding.ActivityChangeIpBinding * @author LTP 2019/8/5 */ class ChangeIpActivity : - BaseActivity(R.layout.activity_change_ip) { + BaseVMBActivity(R.layout.mine_activity_change_ip) { companion object { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpViewModel.kt similarity index 96% rename from app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpViewModel.kt index c8690eb..f999f78 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/ip/ChangeIpViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/ChangeIpViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.ip +package com.btpj.module_mine.ui.ip import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel diff --git a/app/src/main/java/com/btpj/wanandroid/ui/ip/IpListAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/IpListAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/ip/IpListAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/ip/IpListAdapter.kt index d6614b4..fc8f225 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/ip/IpListAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/ip/IpListAdapter.kt @@ -1,9 +1,9 @@ -package com.btpj.wanandroid.ui.ip +package com.btpj.module_mine.ui.ip import android.view.View import com.btpj.lib_base.data.local.IpManager -import com.btpj.wanandroid.R -import com.btpj.wanandroid.databinding.ListItemIpBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemIpBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -14,13 +14,13 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @param currentIp 当前IP */ class IpListAdapter(private val currentIp: String) : - BaseQuickAdapter>(R.layout.list_item_ip) { + BaseQuickAdapter>(R.layout.mine_list_item_ip) { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: String) { + override fun convert(holder: BaseDataBindingHolder, item: String) { holder.dataBinding?.apply { this.item = item executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/login/LoginActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt similarity index 79% rename from app/src/main/java/com/btpj/wanandroid/ui/login/LoginActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt index c466e63..ac198b8 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/login/LoginActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt @@ -1,17 +1,19 @@ -package com.btpj.wanandroid.ui.login +package com.btpj.module_mine.ui.login import android.content.Context import android.content.Intent import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.lifecycleScope +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.ext.showLoading -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityLoginBinding -import com.btpj.wanandroid.ui.ip.ChangeIpActivity -import com.btpj.wanandroid.ui.login.register.RegisterActivity +import com.btpj.module_mine.ui.ip.ChangeIpActivity +import com.btpj.module_mine.ui.login.register.RegisterActivity +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityLoginBinding import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -20,12 +22,12 @@ import kotlinx.coroutines.launch * * @author LTP 2022/4/8 */ +@Route(path = Constants.ROUTER_MINE_LOGIN_ACTIVITY) class LoginActivity : - BaseActivity(R.layout.activity_login) { + BaseVMBActivity(R.layout.mine_activity_login) { companion object { - /** * 页面启动 * @param context Context diff --git a/app/src/main/java/com/btpj/wanandroid/ui/login/LoginViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginViewModel.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/login/LoginViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginViewModel.kt index 4a157f0..65c4414 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/login/LoginViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.login +package com.btpj.module_mine.ui.login import androidx.databinding.ObservableBoolean import androidx.databinding.ObservableField @@ -6,8 +6,8 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.lib_base.base.App -import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.module_mine.data.DataRepository +import com.btpj.lib_base.data.local.UserManager /** * @author LTP 2022/3/9 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterActivity.kt similarity index 87% rename from app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterActivity.kt index ad469bd..cab997d 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterActivity.kt @@ -1,14 +1,14 @@ -package com.btpj.wanandroid.ui.login.register +package com.btpj.module_mine.ui.login.register import android.content.Context import android.content.Intent import android.os.Bundle +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.ext.showLoading import com.btpj.lib_base.utils.ToastUtil -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityRegisterBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityRegisterBinding /** * 注册 @@ -16,7 +16,7 @@ import com.btpj.wanandroid.databinding.ActivityRegisterBinding * @author LTP 2022/4/8 */ class RegisterActivity : - BaseActivity(R.layout.activity_register) { + BaseVMBActivity(R.layout.mine_activity_register) { companion object { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterViewModel.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterViewModel.kt index 25ae436..6728bf4 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/login/register/RegisterViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/register/RegisterViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.login.register +package com.btpj.module_mine.ui.login.register import androidx.databinding.ObservableBoolean import androidx.databinding.ObservableField import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.module_mine.data.DataRepository +import com.btpj.lib_base.data.local.UserManager /** * @author LTP 2022/3/9 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt similarity index 88% rename from app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt index 4933ddd..1120f3a 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt @@ -1,20 +1,20 @@ -package com.btpj.wanandroid.ui.setting +package com.btpj.module_mine.ui.setting import android.content.Context import android.content.Intent import android.os.Bundle import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.lib_base.ext.showDialog import com.btpj.lib_base.http.RetrofitManager import com.btpj.lib_base.utils.AppUtil import com.btpj.lib_base.utils.CacheUtil -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseActivity +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.data.local.UserManager -import com.btpj.wanandroid.databinding.ActivitySettingBinding +import com.btpj.lib_base.data.local.UserManager +import com.btpj.lib_base.ext.showDialog +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivitySettingBinding /** * 设置 @@ -22,7 +22,7 @@ import com.btpj.wanandroid.databinding.ActivitySettingBinding * @author LTP 2022/4/11 */ class SettingActivity : - BaseActivity(R.layout.activity_setting) { + BaseVMBActivity(R.layout.mine_activity_setting) { companion object { /** diff --git a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingViewModel.kt similarity index 92% rename from app/src/main/java/com/btpj/wanandroid/ui/setting/SettingViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingViewModel.kt index 9d6ba5c..19703fa 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/setting/SettingViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingViewModel.kt @@ -1,13 +1,12 @@ -package com.btpj.wanandroid.ui.setting +package com.btpj.module_mine.ui.setting import androidx.databinding.ObservableBoolean import com.btpj.lib_base.base.App.Companion.appContext import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.utils.ToastUtil -import com.btpj.wanandroid.data.local.UserManager import com.tencent.bugly.beta.Beta - /** * @author LTP 2022/4/11 */ diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt similarity index 83% rename from app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt index e91e479..5c26428 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.share.add +package com.btpj.module_mine.ui.share.add import android.content.Context import android.content.Intent @@ -8,12 +8,12 @@ import com.afollestad.materialdialogs.bottomsheets.BottomSheet import com.afollestad.materialdialogs.customview.customView import com.afollestad.materialdialogs.lifecycle.lifecycleOwner import com.btpj.lib_base.ext.hideLoading -import com.btpj.lib_base.ext.showLoading import com.btpj.lib_base.utils.ToastUtil -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityAddArticleBinding +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.ext.showLoading +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityAddArticleBinding /** * 添加分享的文章 @@ -21,7 +21,7 @@ import com.btpj.wanandroid.databinding.ActivityAddArticleBinding * @author LTP 2022/4/12 */ class AddArticleActivity : - BaseActivity(R.layout.activity_add_article) { + BaseVMBActivity(R.layout.mine_activity_add_article) { companion object { @@ -36,13 +36,13 @@ class AddArticleActivity : override fun initView(savedInstanceState: Bundle?) { mBinding.apply { - titleLayout.setRightView(R.drawable.ic_integral_rule) { + titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_integral_rule) { MaterialDialog(this@AddArticleActivity, BottomSheet()) .lifecycleOwner(this@AddArticleActivity) .show { title(text = "温馨提示") customView( - R.layout.dialog_share_article_tip, + R.layout.mine_dialog_share_article_tip, scrollable = true, horizontalPadding = true ) diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleViewModel.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleViewModel.kt index f089bde..8540007 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/add/AddArticleViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.share.add +package com.btpj.module_mine.ui.share.add import androidx.databinding.ObservableBoolean import androidx.databinding.ObservableField import com.btpj.lib_base.base.BaseViewModel +import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository -import com.btpj.wanandroid.data.local.UserManager +import com.btpj.module_mine.data.DataRepository class AddArticleViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt index 90bcddd..0c119f6 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.share.list +package com.btpj.module_mine.ui.share.list import android.annotation.SuppressLint import android.content.Context @@ -7,14 +7,14 @@ import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView -import com.btpj.lib_base.ext.showDialog -import com.btpj.wanandroid.R +import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseActivity +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.ActivityIntegralRecordBinding -import com.btpj.wanandroid.ui.share.add.AddArticleActivity +import com.btpj.lib_base.ext.showDialog +import com.btpj.module_mine.ui.share.add.AddArticleActivity +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityIntegralRecordBinding /** * 我分享的文章列表 @@ -22,7 +22,7 @@ import com.btpj.wanandroid.ui.share.add.AddArticleActivity * @author LTP 2022/4/12 */ class MyArticleActivity : - BaseActivity(R.layout.activity_integral_record) { + BaseVMBActivity(R.layout.mine_activity_integral_record) { /** 页数 */ private var mPageNo: Int = 0 @@ -43,7 +43,7 @@ class MyArticleActivity : override fun initView(savedInstanceState: Bundle?) { mBinding.apply { titleLayout.setTitleText("我分享的文章") - .setRightView(R.drawable.ic_add) { AddArticleActivity.launch(this@MyArticleActivity) } + .setRightView(com.btpj.lib_base.R.drawable.ic_add) { AddArticleActivity.launch(this@MyArticleActivity) } includeList.apply { recyclerView.apply { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt similarity index 73% rename from app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt index 9c216bd..429bcbf 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt @@ -1,11 +1,11 @@ -package com.btpj.wanandroid.ui.share.list +package com.btpj.module_mine.ui.share.list import android.annotation.SuppressLint import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.databinding.ListItemShareArticleBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemShareArticleBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -16,8 +16,8 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class MyArticleAdapter : - BaseQuickAdapter>( - layoutResId = R.layout.list_item_share_article + BaseQuickAdapter>( + layoutResId = R.layout.mine_list_item_share_article ), LoadMoreModule { init { @@ -26,7 +26,7 @@ class MyArticleAdapter : @SuppressLint("SetTextI18n") override fun convert( - holder: BaseDataBindingHolder, + holder: BaseDataBindingHolder, item: Article ) { holder.dataBinding?.apply { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleViewModel.kt similarity index 92% rename from app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleViewModel.kt index 77f9ffb..ad2faec 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/share/list/MyArticleViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.share.list +package com.btpj.module_mine.ui.share.list import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article +import com.btpj.module_mine.data.DataRepository class MyArticleViewModel : BaseViewModel() { val articlePageList = MutableLiveData>() diff --git a/app/src/main/res/layout/activity_add_article.xml b/module_mine/src/main/res/layout/mine_activity_add_article.xml similarity index 96% rename from app/src/main/res/layout/activity_add_article.xml rename to module_mine/src/main/res/layout/mine_activity_add_article.xml index 9b8df42..b6cb068 100644 --- a/app/src/main/res/layout/activity_add_article.xml +++ b/module_mine/src/main/res/layout/mine_activity_add_article.xml @@ -7,14 +7,14 @@ + type="com.btpj.module_mine.ui.share.add.AddArticleViewModel" /> + tools:context="com.btpj.module_mine.ui.share.add.AddArticleActivity"> + type="com.btpj.module_mine.ui.ip.ChangeIpViewModel" /> + tools:context="com.btpj.module_mine.ui.ip.ChangeIpActivity"> + type="com.btpj.module_mine.ui.integral.rank.IntegralRankViewModel" /> + tools:context="layout.IntegralRankActivity"> + tools:context="com.btpj.module_mine.ui.integral.record.IntegralRecordActivity"> + type="com.btpj.module_mine.ui.login.LoginViewModel" /> + tools:context="com.btpj.module_mine.ui.login.LoginActivity"> + type="com.btpj.module_mine.ui.login.register.RegisterViewModel" /> + tools:context="com.btpj.module_mine.ui.login.register.RegisterActivity"> + type="com.btpj.module_mine.ui.setting.SettingViewModel" /> @@ -15,7 +15,7 @@ + tools:context="com.btpj.module_mine.ui.setting.SettingActivity"> + type="com.btpj.lib_base.data.bean.CoinInfo" /> + type="com.btpj.lib_base.data.bean.IntegralRecord" /> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_share_article.xml b/module_mine/src/main/res/layout/mine_list_item_share_article.xml similarity index 100% rename from app/src/main/res/layout/list_item_share_article.xml rename to module_mine/src/main/res/layout/mine_list_item_share_article.xml diff --git a/module_mine/src/main/res/menu/mine_menu_integral_rank.xml b/module_mine/src/main/res/menu/mine_menu_integral_rank.xml new file mode 100644 index 0000000..579933b --- /dev/null +++ b/module_mine/src/main/res/menu/mine_menu_integral_rank.xml @@ -0,0 +1,16 @@ + +

+ + + \ No newline at end of file diff --git a/module_mine/src/main/res/mipmap-hdpi/ic_launcher.webp b/module_mine/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_mine/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_mine/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_mine/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_mine/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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 + + + \ No newline at end of file diff --git a/module_mine/src/main/res/values/themes.xml b/module_mine/src/main/res/values/themes.xml new file mode 100644 index 0000000..8c0c7ef --- /dev/null +++ b/module_mine/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_mine/src/test/java/com/btpj/module_mine/ExampleUnitTest.kt b/module_mine/src/test/java/com/btpj/module_mine/ExampleUnitTest.kt new file mode 100644 index 0000000..731aceb --- /dev/null +++ b/module_mine/src/test/java/com/btpj/module_mine/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_mine + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_web/src/main/alone/AndroidManifest.xml b/module_web/src/main/alone/AndroidManifest.xml index 0c909ea..524dd05 100644 --- a/module_web/src/main/alone/AndroidManifest.xml +++ b/module_web/src/main/alone/AndroidManifest.xml @@ -6,7 +6,7 @@ diff --git a/module_web/src/main/res/menu/web_menu_web.xml b/module_web/src/main/res/menu/web_menu_web.xml index db0630d..4b057e3 100644 --- a/module_web/src/main/res/menu/web_menu_web.xml +++ b/module_web/src/main/res/menu/web_menu_web.xml @@ -8,14 +8,14 @@ android:checked="false" android:icon="@drawable/ic_un_collect" app:showAsAction="always" - android:title="@string/web_collect" /> + android:title="@string/collect" /> + android:title="@string/share" /> + android:title="@string/refresh" /> + android:title="@string/openByBrowser" /> \ No newline at end of file diff --git a/module_web/src/main/res/values/strings.xml b/module_web/src/main/res/values/strings.xml deleted file mode 100644 index db149ae..0000000 --- a/module_web/src/main/res/values/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - module_web - - 收藏 - 刷新 - 用浏览器打开 - 分享 - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d7192a2..b86a226 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,3 +18,4 @@ rootProject.name = "WanAndroid" include ':app' include ':lib_base' include ':module_web' +include ':module_mine' From 5a0271b31beab3ba0e97753b2c8413e4d6f8bbec Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Sat, 7 May 2022 18:55:50 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86modul?= =?UTF-8?q?e=5Fmine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 24 ------------------- module_mine/src/main/AndroidManifest.xml | 24 +++++++++++++++++++ .../src/main/alone/AndroidManifest.xml | 24 +++++++++++++++++++ 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f80cb21..d303e65 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,30 +31,6 @@ android:name=".ui.collect.CollectActivity" android:exported="false" android:screenOrientation="portrait" /> - - - - - - + + + + + + \ No newline at end of file diff --git a/module_mine/src/main/alone/AndroidManifest.xml b/module_mine/src/main/alone/AndroidManifest.xml index f2fdedb..c9e56b1 100644 --- a/module_mine/src/main/alone/AndroidManifest.xml +++ b/module_mine/src/main/alone/AndroidManifest.xml @@ -26,6 +26,30 @@ android:exported="false" android:screenOrientation="portrait" tools:ignore="LockedOrientationActivity" /> + + + + + + \ No newline at end of file From 743732f5af8402bc16a38fe49128e37d6ecf0f66 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Sat, 7 May 2022 19:07:05 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86modul?= =?UTF-8?q?e=5Fmine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/btpj/lib_base/base/BaseVMBActivity.kt | 8 ++++++++ .../main/java/com/btpj/lib_base/base/BaseVMBFragment.kt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt index 1cff493..2c63d7b 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt @@ -5,8 +5,10 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.BR import com.btpj.lib_base.R +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.utils.LogUtil import com.btpj.lib_base.utils.StatusBarUtil @@ -100,6 +102,12 @@ abstract class BaseVMBActivity(private it?.errorMsg?.run { ToastUtil.showShort(this@BaseVMBActivity, this) } + + if (it?.errorCode == -1001) { + // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 + // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 + ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + } } } } diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt index a592ca3..456ae41 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt @@ -9,8 +9,10 @@ import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.BR import com.btpj.lib_base.R +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.utils.LogUtil import com.btpj.lib_base.utils.ToastUtil @@ -111,6 +113,12 @@ abstract class BaseVMBFragment(private it?.errorMsg?.run { ToastUtil.showShort(requireContext(), this) } + + if (it?.errorCode == -1001) { + // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 + // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 + ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + } } } } From 09197ee6ad523de3092d40db2ee05b917f587fc4 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Mon, 9 May 2022 10:19:39 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E5=AE=8C=E6=88=90module=5Fmine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 --- .../btpj/wanandroid/ui/main/MainActivity.kt | 7 +++-- .../com/btpj/lib_base/data/local/Constants.kt | 1 + .../java/com/btpj/lib_base/ext/ViewExt.kt | 4 ++- module_mine/src/main/AndroidManifest.xml | 4 +++ .../btpj/module_mine/data/DataRepository.kt | 8 ++++++ .../com/btpj/module_mine/data/http/Api.kt | 8 ++++++ .../ui/collect/CollectActivity.kt | 14 +++++----- .../ui/collect/CollectViewModel.kt | 2 +- .../collect/article/CollectArticleAdapter.kt | 12 ++++----- .../collect/article/CollectArticleFragment.kt | 8 +++--- .../article/CollectArticleViewModel.kt | 4 +-- .../ui/collect/url/CollectUrlAdapter.kt | 13 +++++---- .../ui/collect/url/CollectUrlFragment.kt | 12 ++++----- .../ui/collect/url/CollectUrlViewModel.kt | 4 +-- .../btpj/module_mine/ui}/mine/MineFragment.kt | 27 ++++++++++++------- .../module_mine/ui}/mine/MineViewModel.kt | 14 +++++----- .../main/res/layout/mine_activity_collect.xml | 2 +- .../main/res/layout/mine_fragment_mine.xml | 2 +- .../layout/mine_list_item_collect_article.xml | 0 .../res/layout/mine_list_item_collect_url.xml | 0 21 files changed, 91 insertions(+), 59 deletions(-) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/CollectActivity.kt (81%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/CollectViewModel.kt (75%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/article/CollectArticleAdapter.kt (71%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/article/CollectArticleFragment.kt (95%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/article/CollectArticleViewModel.kt (91%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/url/CollectUrlAdapter.kt (66%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/url/CollectUrlFragment.kt (91%) rename {app/src/main/java/com/btpj/wanandroid => module_mine/src/main/java/com/btpj/module_mine}/ui/collect/url/CollectUrlViewModel.kt (90%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_mine/src/main/java/com/btpj/module_mine/ui}/mine/MineFragment.kt (73%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_mine/src/main/java/com/btpj/module_mine/ui}/mine/MineViewModel.kt (77%) rename app/src/main/res/layout/activity_collect.xml => module_mine/src/main/res/layout/mine_activity_collect.xml (95%) rename app/src/main/res/layout/fragment_mine.xml => module_mine/src/main/res/layout/mine_fragment_mine.xml (99%) rename app/src/main/res/layout/list_item_collect_article.xml => module_mine/src/main/res/layout/mine_list_item_collect_article.xml (100%) rename app/src/main/res/layout/list_item_collect_url.xml => module_mine/src/main/res/layout/mine_list_item_collect_url.xml (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d303e65..23cc00e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,10 +27,6 @@ android:name=".ui.author.AuthorActivity" android:exported="false" android:screenOrientation="portrait" /> - Unit) { if (UserManager.isLogin()) { action.invoke(this) } else { -// com.btpj.module_user.ui.login.LoginActivity.launch(this) + ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() } } diff --git a/module_mine/src/main/AndroidManifest.xml b/module_mine/src/main/AndroidManifest.xml index 131a4ce..da63404 100644 --- a/module_mine/src/main/AndroidManifest.xml +++ b/module_mine/src/main/AndroidManifest.xml @@ -38,6 +38,10 @@ android:name=".ui.ip.ChangeIpActivity" android:exported="false" android:screenOrientation="portrait" /> + \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt index e61b218..7a9f4bd 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt @@ -64,4 +64,12 @@ object DataRepository : BaseRepository(), Api { override suspend fun unCollectUrl(id: Int): ApiResponse { return apiCall { service.unCollectUrl(id) } } + + override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { + return apiCall { service.getCollectArticlePageList(pageNo) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } } \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt index aacc41a..73d853c 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt @@ -72,4 +72,12 @@ interface Api { /** 取消收藏站内文章 */ @POST("lg/collect/deletetool/json") suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + + /** 获取收藏文章分页列表 */ + @GET("lg/collect/list/{pageNo}/json") + suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse } \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/CollectActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectActivity.kt similarity index 81% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/CollectActivity.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectActivity.kt index 3d7a8ca..b622dd8 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/CollectActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectActivity.kt @@ -1,15 +1,15 @@ -package com.btpj.wanandroid.ui.collect +package com.btpj.module_mine.ui.collect import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityCollectBinding -import com.btpj.wanandroid.ui.collect.article.CollectArticleFragment -import com.btpj.wanandroid.ui.collect.url.CollectUrlFragment +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineActivityCollectBinding +import com.btpj.module_mine.ui.collect.article.CollectArticleFragment +import com.btpj.module_mine.ui.collect.url.CollectUrlFragment import com.google.android.material.tabs.TabLayoutMediator /** @@ -18,7 +18,7 @@ import com.google.android.material.tabs.TabLayoutMediator * @author LTP 2022/4/13 */ class CollectActivity : - BaseActivity(R.layout.activity_collect) { + BaseVMBActivity(R.layout.mine_activity_collect) { /** 标题 */ private val mTitleList = arrayListOf("文章", "网址") diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/CollectViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectViewModel.kt similarity index 75% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/CollectViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectViewModel.kt index 7e73b92..30fdaf9 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/CollectViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/CollectViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.collect +package com.btpj.module_mine.ui.collect import com.btpj.lib_base.base.BaseViewModel diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt index 2199250..5773015 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt @@ -1,10 +1,10 @@ -package com.btpj.wanandroid.ui.collect.article +package com.btpj.module_mine.ui.collect.article import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.CollectArticle import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.databinding.ListItemCollectArticleBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemCollectArticleBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -15,8 +15,8 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class CollectArticleAdapter : - BaseQuickAdapter>( - layoutResId = R.layout.list_item_collect_article + BaseQuickAdapter>( + layoutResId = R.layout.mine_list_item_collect_article ), LoadMoreModule { @@ -25,7 +25,7 @@ class CollectArticleAdapter : } override fun convert( - holder: BaseDataBindingHolder, + holder: BaseDataBindingHolder, item: CollectArticle ) { holder.dataBinding?.apply { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleFragment.kt similarity index 95% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleFragment.kt index 17c308c..6ff3d17 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleFragment.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleFragment.kt @@ -1,14 +1,14 @@ -package com.btpj.wanandroid.ui.collect.article +package com.btpj.module_mine.ui.collect.article import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.CollectArticle import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R +import com.btpj.module_mine.R import java.util.* /** @@ -17,7 +17,7 @@ import java.util.* * @author LTP 2022/3/10 */ class CollectArticleFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { /** 页数 */ private var mPageNo: Int = 0 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleViewModel.kt similarity index 91% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleViewModel.kt index 22d513d..ffb344f 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/article/CollectArticleViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.collect.article +package com.btpj.module_mine.ui.collect.article import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.CollectArticle +import com.btpj.module_mine.data.DataRepository class CollectArticleViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt similarity index 66% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt index 4430d57..784131e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt @@ -1,10 +1,10 @@ -package com.btpj.wanandroid.ui.collect.url +package com.btpj.module_mine.ui.collect.url import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.CollectUrl import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.databinding.ListItemCollectUrlBinding +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineListItemCollectUrlBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -14,13 +14,16 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class CollectUrlAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_collect_url) { + BaseQuickAdapter>(layoutResId = R.layout.mine_list_item_collect_url) { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: CollectUrl) { + override fun convert( + holder: BaseDataBindingHolder, + item: CollectUrl + ) { holder.dataBinding?.apply { collectUrl = item executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlFragment.kt similarity index 91% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlFragment.kt index 067be23..91dbb08 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlFragment.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlFragment.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.collect.url +package com.btpj.module_mine.ui.collect.url import androidx.recyclerview.widget.LinearLayoutManager -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.base.App +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.ext.initColors +import com.btpj.module_mine.R /** * 收藏的文章 @@ -14,7 +14,7 @@ import com.btpj.wanandroid.base.BaseFragment * @author LTP 2022/3/10 */ class CollectUrlFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { private val mAdapter by lazy { CollectUrlAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlViewModel.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlViewModel.kt index 0583184..d638cec 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/collect/url/CollectUrlViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlViewModel.kt @@ -1,11 +1,11 @@ -package com.btpj.wanandroid.ui.collect.url +package com.btpj.module_mine.ui.collect.url import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.CollectUrl +import com.btpj.module_mine.data.DataRepository class CollectUrlViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt similarity index 73% rename from app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt index 19c0e13..e6c1c50 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineFragment.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt @@ -1,24 +1,31 @@ -package com.btpj.wanandroid.ui.main.mine +package com.btpj.module_mine.ui.mine import android.annotation.SuppressLint +import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.data.local.UserManager import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.ext.launchCheckLogin -import com.btpj.wanandroid.databinding.FragmentMineBinding -import com.btpj.wanandroid.ui.collect.CollectActivity +import com.btpj.module_mine.R +import com.btpj.module_mine.databinding.MineFragmentMineBinding +import com.btpj.module_mine.ui.collect.CollectActivity +import com.btpj.module_mine.ui.integral.rank.IntegralRankActivity +import com.btpj.module_mine.ui.login.LoginActivity +import com.btpj.module_mine.ui.setting.SettingActivity +import com.btpj.module_mine.ui.share.list.MyArticleActivity /** * 我的Tab * * @author LTP 2022/3/10 */ -class MineFragment : BaseFragment(R.layout.fragment_mine) { +@Route(path = Constants.ROUTER_MINE_MINE_FRAGMENT) +class MineFragment : + BaseVMBFragment(R.layout.mine_fragment_mine) { companion object { fun newInstance() = MineFragment() @@ -33,13 +40,13 @@ class MineFragment : BaseFragment(R.layout.f clUser.setOnClickListener { if (!UserManager.isLogin()) { - ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + LoginActivity.launch(requireContext()) } } // 我的积分 tvPoints.setOnClickListener { -// IntegralRankActivity.launch(requireContext()) + IntegralRankActivity.launch(requireContext()) } // 我的收藏（需要登录） @@ -49,7 +56,7 @@ class MineFragment : BaseFragment(R.layout.f // 我分享的文章（需要登录） tvArticle.setOnClickListener { -// requireContext().launchCheckLogin { MyArticleActivity.launch(it) } + requireContext().launchCheckLogin { MyArticleActivity.launch(it) } } // 开源网站 @@ -63,7 +70,7 @@ class MineFragment : BaseFragment(R.layout.f } // 设置 -// tvSettings.setOnClickListener { SettingActivity.launch(requireContext()) } + tvSettings.setOnClickListener { SettingActivity.launch(requireContext()) } } onRefresh() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineViewModel.kt similarity index 77% rename from app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt rename to module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineViewModel.kt index 0ff996e..21aa54c 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/mine/MineViewModel.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineViewModel.kt @@ -1,14 +1,14 @@ -package com.btpj.wanandroid.ui.main.mine +package com.btpj.module_mine.ui.mine import androidx.databinding.ObservableField import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.CoinInfo -import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.User import com.btpj.lib_base.data.local.UserManager +import com.btpj.lib_base.ext.handleRequest +import com.btpj.module_mine.data.DataRepository class MineViewModel : BaseViewModel() { val user = ObservableField() @@ -29,10 +29,10 @@ class MineViewModel : BaseViewModel() { /** 获取个人积分 */ fun fetchPoints() { launch({ -// val response = DataRepository.getUserIntegral() -// handleRequest(response, { -// integral.value = response.data -// }) + val response = DataRepository.getUserIntegral() + handleRequest(response, { + integral.value = response.data + }) }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_collect.xml b/module_mine/src/main/res/layout/mine_activity_collect.xml similarity index 95% rename from app/src/main/res/layout/activity_collect.xml rename to module_mine/src/main/res/layout/mine_activity_collect.xml index 0a11ab7..9c479b3 100644 --- a/app/src/main/res/layout/activity_collect.xml +++ b/module_mine/src/main/res/layout/mine_activity_collect.xml @@ -10,7 +10,7 @@ + tools:context="com.btpj.module_mine.ui.collect.CollectActivity"> + type="com.btpj.module_mine.ui.mine.MineViewModel" /> Date: Mon, 9 May 2022 15:30:17 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8C=96=EF=BC=8C=E5=BE=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- app/src/main/AndroidManifest.xml | 26 ---- .../com/btpj/wanandroid/base/BaseActivity.kt | 26 ---- .../com/btpj/wanandroid/base/BaseFragment.kt | 24 ---- .../java/com/btpj/wanandroid/ext/ViewExt.kt | 7 - app/src/main/res/layout/activity_web.xml | 32 ----- app/src/main/res/menu/menu_integral_rank.xml | 16 --- app/src/main/res/values/colors.xml | 10 -- app/src/main/res/values/themes.xml | 9 -- lib_base/build.gradle | 4 + lib_base/src/main/AndroidManifest.xml | 2 + .../btpj/lib_base/adapter}/ArticleAdapter.kt | 10 +- .../com/btpj/lib_base/data/local/Constants.kt | 20 ++- .../res/layout/common_fragment_viewpager.xml | 2 +- .../res/layout/common_list_item_article.xml | 0 .../main/res/layout/common_list_item_tv.xml | 0 lib_base/src/main/res/values/strings.xml | 1 + module_home/.gitignore | 1 + module_home/build.gradle | 12 ++ module_home/proguard-rules.pro | 21 +++ .../module_home/ExampleInstrumentedTest.kt | 24 ++++ module_home/src/main/AndroidManifest.xml | 20 +++ .../src/main/alone/AndroidManifest.xml | 36 +++++ .../btpj/module_home}/data/DataRepository.kt | 4 +- .../com/btpj/module_home}/data/http/Api.kt | 2 +- .../module_home/data/local/CacheManager.kt | 44 ++++++ .../module_home}/ui/author/AuthorActivity.kt | 19 +-- .../module_home}/ui/author/AuthorViewModel.kt | 4 +- .../btpj/module_home/ui}/home/HomeFragment.kt | 40 +++--- .../module_home/ui}/home/HomeViewModel.kt | 4 +- .../module_home/ui}/home/MyBannerAdapter.kt | 3 +- .../ui/search/HotSearchAdapter.kt | 10 +- .../module_home}/ui/search/SearchActivity.kt | 14 +- .../ui/search/SearchHistoryAdapter.kt | 10 +- .../module_home}/ui/search/SearchViewModel.kt | 6 +- .../ui/search/result/SearchResultActivity.kt | 25 ++-- .../ui/search/result/SearchResultViewModel.kt | 4 +- .../main/res/layout/home_activity_author.xml | 6 +- .../main/res/layout/home_activity_search.xml | 4 +- .../layout/home_activity_search_result.xml | 2 +- .../main/res/layout/home_fragment_home.xml | 2 +- .../main/res/layout/home_header_banner.xml | 0 .../main/res/layout/home_list_item_search.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 +++ module_home/src/main/res/values/themes.xml | 16 +++ .../com/btpj/module_home/ExampleUnitTest.kt | 17 +++ module_main/.gitignore | 1 + module_main/build.gradle | 12 ++ module_main/proguard-rules.pro | 21 +++ .../module_main/ExampleInstrumentedTest.kt | 24 ++++ module_main/src/main/AndroidManifest.xml | 22 +++ .../src/main/alone/AndroidManifest.xml | 29 ++++ .../btpj/module_main/data/DataRepository.kt | 135 ++++++++++++++++++ .../com/btpj/module_main/data/http/Api.kt | 134 +++++++++++++++++ .../module_main}/data/local/CacheManager.kt | 0 .../btpj/module_main}/ui/main/MainActivity.kt | 37 +++-- .../module_main}/ui/main/MainViewModel.kt | 2 +- .../module_main}/ui/splash/SplashActivity.kt | 12 +- .../ui/splash/SplashBannerAdapter.kt | 2 +- .../module_main}/ui/splash/SplashViewModel.kt | 2 +- .../main/res/layout/main_activity_main.xml | 4 +- .../main/res/layout/main_activity_splash.xml | 4 +- .../main/res/menu/main_menu_bottom_nav.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 +++ module_main/src/main/res/values/themes.xml | 26 ++++ .../com/btpj/module_main/ExampleUnitTest.kt | 17 +++ .../src/main/alone/AndroidManifest.xml | 20 ++- module_project/.gitignore | 1 + module_project/build.gradle | 12 ++ module_project/proguard-rules.pro | 21 +++ .../module_project/ExampleInstrumentedTest.kt | 24 ++++ module_project/src/main/AndroidManifest.xml | 2 + .../src/main/alone/AndroidManifest.xml | 14 ++ .../module_project/data/DataRepository.kt | 135 ++++++++++++++++++ .../com/btpj/module_project/data/http/Api.kt | 134 +++++++++++++++++ .../ui}/project/ImageArticleAdapter.kt | 10 +- .../ui}/project/ProjectChildFragment.kt | 20 ++- .../ui}/project/ProjectChildViewModel.kt | 4 +- .../ui}/project/ProjectFragment.kt | 15 +- .../ui}/project/ProjectViewModel.kt | 4 +- .../project_list_item_article_image.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 +++ module_project/src/main/res/values/themes.xml | 16 +++ .../btpj/module_project/ExampleUnitTest.kt | 17 +++ module_square/.gitignore | 1 + module_square/build.gradle | 12 ++ module_square/proguard-rules.pro | 21 +++ .../module_square/ExampleInstrumentedTest.kt | 24 ++++ module_square/src/main/AndroidManifest.xml | 4 + .../src/main/alone/AndroidManifest.xml | 15 ++ .../btpj/module_square/data/DataRepository.kt | 135 ++++++++++++++++++ .../com/btpj/module_square/data/http/Api.kt | 134 +++++++++++++++++ .../ui}/square/SquareFragment.kt | 29 ++-- .../ui}/square/SquareViewModel.kt | 2 +- .../ui}/square/ask/AskFragment.kt | 26 ++-- .../ui}/square/ask/AskViewModel.kt | 9 +- .../square/navigation/NavigationAdapter.kt | 13 +- .../navigation/NavigationChildAdapter.kt | 10 +- .../square/navigation/NavigationFragment.kt | 8 +- .../square/navigation/NavigationViewModel.kt | 5 +- .../ui}/square/square/SquareChildFragment.kt | 26 ++-- .../ui}/square/square/SquareChildViewModel.kt | 9 +- .../ui}/square/system/SystemAdapter.kt | 13 +- .../ui}/square/system/SystemChildAdapter.kt | 10 +- .../ui}/square/system/SystemFragment.kt | 11 +- .../ui}/square/system/SystemViewModel.kt | 5 +- .../res/layout/square_fragment_square.xml | 2 +- .../res/layout/square_list_item_system.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 +++ module_square/src/main/res/values/themes.xml | 16 +++ .../com/btpj/module_square/ExampleUnitTest.kt | 17 +++ module_web/build.gradle | 4 - .../src/main/res/layout/web_activity_web.xml | 2 +- .../src/main/res/values-night/themes.xml | 2 +- module_web/src/main/res/values/themes.xml | 8 +- module_wechat/.gitignore | 1 + module_wechat/build.gradle | 12 ++ module_wechat/proguard-rules.pro | 21 +++ .../module_wechat/ExampleInstrumentedTest.kt | 24 ++++ module_wechat/src/main/AndroidManifest.xml | 2 + .../src/main/alone/AndroidManifest.xml | 14 ++ .../btpj/module_wechat/data/DataRepository.kt | 135 ++++++++++++++++++ .../com/btpj/module_wechat/data/http/Api.kt | 134 +++++++++++++++++ .../ui}/wechat/WechatChildFragment.kt | 26 ++-- .../ui}/wechat/WechatChildViewModel.kt | 4 +- .../ui}/wechat/WechatFragment.kt | 13 +- .../ui}/wechat/WechatViewModel.kt | 4 +- .../res/layout/wechat_fragment_wechat.xml | 2 +- .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../src/main/res/values-night/themes.xml | 16 +++ module_wechat/src/main/res/values/themes.xml | 16 +++ .../com/btpj/module_wechat/ExampleUnitTest.kt | 17 +++ settings.gradle | 5 + 157 files changed, 2153 insertions(+), 412 deletions(-) delete mode 100644 app/src/main/java/com/btpj/wanandroid/base/BaseActivity.kt delete mode 100644 app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt delete mode 100644 app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt delete mode 100644 app/src/main/res/layout/activity_web.xml delete mode 100644 app/src/main/res/menu/menu_integral_rank.xml delete mode 100644 app/src/main/res/values/colors.xml rename {app/src/main/java/com/btpj/wanandroid/ui/main/home => lib_base/src/main/java/com/btpj/lib_base/adapter}/ArticleAdapter.kt (71%) rename app/src/main/res/layout/fragment_viewpager.xml => lib_base/src/main/res/layout/common_fragment_viewpager.xml (96%) rename app/src/main/res/layout/list_item_article.xml => lib_base/src/main/res/layout/common_list_item_article.xml (100%) rename app/src/main/res/layout/list_item_tv.xml => lib_base/src/main/res/layout/common_list_item_tv.xml (100%) create mode 100644 module_home/.gitignore create mode 100644 module_home/build.gradle create mode 100644 module_home/proguard-rules.pro create mode 100644 module_home/src/androidTest/java/com/btpj/module_home/ExampleInstrumentedTest.kt create mode 100644 module_home/src/main/AndroidManifest.xml create mode 100644 module_home/src/main/alone/AndroidManifest.xml rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/data/DataRepository.kt (98%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/data/http/Api.kt (99%) create mode 100644 module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/author/AuthorActivity.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/author/AuthorViewModel.kt (96%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_home/src/main/java/com/btpj/module_home/ui}/home/HomeFragment.kt (87%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_home/src/main/java/com/btpj/module_home/ui}/home/HomeViewModel.kt (97%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_home/src/main/java/com/btpj/module_home/ui}/home/MyBannerAdapter.kt (97%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/HotSearchAdapter.kt (60%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/SearchActivity.kt (90%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/SearchHistoryAdapter.kt (61%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/SearchViewModel.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/result/SearchResultActivity.kt (89%) rename {app/src/main/java/com/btpj/wanandroid => module_home/src/main/java/com/btpj/module_home}/ui/search/result/SearchResultViewModel.kt (93%) rename app/src/main/res/layout/activity_author.xml => module_home/src/main/res/layout/home_activity_author.xml (96%) rename app/src/main/res/layout/activity_search.xml => module_home/src/main/res/layout/home_activity_search.xml (97%) rename app/src/main/res/layout/activity_search_result.xml => module_home/src/main/res/layout/home_activity_search_result.xml (88%) rename app/src/main/res/layout/fragment_home.xml => module_home/src/main/res/layout/home_fragment_home.xml (92%) rename app/src/main/res/layout/header_banner.xml => module_home/src/main/res/layout/home_header_banner.xml (100%) rename app/src/main/res/layout/list_item_search.xml => module_home/src/main/res/layout/home_list_item_search.xml (100%) create mode 100644 module_home/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_home/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_home/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_home/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_home/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_home/src/main/res/values-night/themes.xml create mode 100644 module_home/src/main/res/values/themes.xml create mode 100644 module_home/src/test/java/com/btpj/module_home/ExampleUnitTest.kt create mode 100644 module_main/.gitignore create mode 100644 module_main/build.gradle create mode 100644 module_main/proguard-rules.pro create mode 100644 module_main/src/androidTest/java/com/btpj/module_main/ExampleInstrumentedTest.kt create mode 100644 module_main/src/main/AndroidManifest.xml create mode 100644 module_main/src/main/alone/AndroidManifest.xml create mode 100644 module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt create mode 100644 module_main/src/main/java/com/btpj/module_main/data/http/Api.kt rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/data/local/CacheManager.kt (100%) rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/ui/main/MainActivity.kt (84%) rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/ui/main/MainViewModel.kt (80%) rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/ui/splash/SplashActivity.kt (86%) rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/ui/splash/SplashBannerAdapter.kt (96%) rename {app/src/main/java/com/btpj/wanandroid => module_main/src/main/java/com/btpj/module_main}/ui/splash/SplashViewModel.kt (90%) rename app/src/main/res/layout/activity_main.xml => module_main/src/main/res/layout/main_activity_main.xml (88%) rename app/src/main/res/layout/activity_splash.xml => module_main/src/main/res/layout/main_activity_splash.xml (92%) rename app/src/main/res/menu/menu_bottom_nav.xml => module_main/src/main/res/menu/main_menu_bottom_nav.xml (100%) create mode 100644 module_main/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_main/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_main/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_main/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_main/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_main/src/main/res/values-night/themes.xml create mode 100644 module_main/src/main/res/values/themes.xml create mode 100644 module_main/src/test/java/com/btpj/module_main/ExampleUnitTest.kt create mode 100644 module_project/.gitignore create mode 100644 module_project/build.gradle create mode 100644 module_project/proguard-rules.pro create mode 100644 module_project/src/androidTest/java/com/btpj/module_project/ExampleInstrumentedTest.kt create mode 100644 module_project/src/main/AndroidManifest.xml create mode 100644 module_project/src/main/alone/AndroidManifest.xml create mode 100644 module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt create mode 100644 module_project/src/main/java/com/btpj/module_project/data/http/Api.kt rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_project/src/main/java/com/btpj/module_project/ui}/project/ImageArticleAdapter.kt (71%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_project/src/main/java/com/btpj/module_project/ui}/project/ProjectChildFragment.kt (91%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_project/src/main/java/com/btpj/module_project/ui}/project/ProjectChildViewModel.kt (94%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_project/src/main/java/com/btpj/module_project/ui}/project/ProjectFragment.kt (86%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_project/src/main/java/com/btpj/module_project/ui}/project/ProjectViewModel.kt (88%) rename app/src/main/res/layout/list_item_article_image.xml => module_project/src/main/res/layout/project_list_item_article_image.xml (100%) create mode 100644 module_project/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_project/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_project/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_project/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_project/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_project/src/main/res/values-night/themes.xml create mode 100644 module_project/src/main/res/values/themes.xml create mode 100644 module_project/src/test/java/com/btpj/module_project/ExampleUnitTest.kt create mode 100644 module_square/.gitignore create mode 100644 module_square/build.gradle create mode 100644 module_square/proguard-rules.pro create mode 100644 module_square/src/androidTest/java/com/btpj/module_square/ExampleInstrumentedTest.kt create mode 100644 module_square/src/main/AndroidManifest.xml create mode 100644 module_square/src/main/alone/AndroidManifest.xml create mode 100644 module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt create mode 100644 module_square/src/main/java/com/btpj/module_square/data/http/Api.kt rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/SquareFragment.kt (73%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/SquareViewModel.kt (74%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/ask/AskFragment.kt (90%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/ask/AskViewModel.kt (77%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/navigation/NavigationAdapter.kt (71%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/navigation/NavigationChildAdapter.kt (60%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/navigation/NavigationFragment.kt (88%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/navigation/NavigationViewModel.kt (78%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/square/SquareChildFragment.kt (89%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/square/SquareChildViewModel.kt (78%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/system/SystemAdapter.kt (71%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/system/SystemChildAdapter.kt (60%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/system/SystemFragment.kt (86%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_square/src/main/java/com/btpj/module_square/ui}/square/system/SystemViewModel.kt (71%) rename app/src/main/res/layout/fragment_square.xml => module_square/src/main/res/layout/square_fragment_square.xml (92%) rename app/src/main/res/layout/list_item_system.xml => module_square/src/main/res/layout/square_list_item_system.xml (100%) create mode 100644 module_square/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_square/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_square/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_square/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_square/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_square/src/main/res/values-night/themes.xml create mode 100644 module_square/src/main/res/values/themes.xml create mode 100644 module_square/src/test/java/com/btpj/module_square/ExampleUnitTest.kt create mode 100644 module_wechat/.gitignore create mode 100644 module_wechat/build.gradle create mode 100644 module_wechat/proguard-rules.pro create mode 100644 module_wechat/src/androidTest/java/com/btpj/module_wechat/ExampleInstrumentedTest.kt create mode 100644 module_wechat/src/main/AndroidManifest.xml create mode 100644 module_wechat/src/main/alone/AndroidManifest.xml create mode 100644 module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt create mode 100644 module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_wechat/src/main/java/com/btpj/module_wechat/ui}/wechat/WechatChildFragment.kt (90%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_wechat/src/main/java/com/btpj/module_wechat/ui}/wechat/WechatChildViewModel.kt (94%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_wechat/src/main/java/com/btpj/module_wechat/ui}/wechat/WechatFragment.kt (84%) rename {app/src/main/java/com/btpj/wanandroid/ui/main => module_wechat/src/main/java/com/btpj/module_wechat/ui}/wechat/WechatViewModel.kt (88%) rename app/src/main/res/layout/fragment_wechat.xml => module_wechat/src/main/res/layout/wechat_fragment_wechat.xml (92%) create mode 100644 module_wechat/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 module_wechat/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 module_wechat/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 module_wechat/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 module_wechat/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 module_wechat/src/main/res/values-night/themes.xml create mode 100644 module_wechat/src/main/res/values/themes.xml create mode 100644 module_wechat/src/test/java/com/btpj/module_wechat/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index af1e5e0..9bbea23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,12 +85,12 @@ android { dependencies { implementation project(path: ':lib_base') - // 轮播图 https://github.com/youth5201314/banner - implementation rootProject.ext.dependencies.banner - implementation rootProject.ext.dependencies.agentWeb - implementation rootProject.ext.dependencies.flexbox - if(!rootProject.ext.isBuildModule){ + implementation project(path: ':module_main') + implementation project(path: ':module_home') + implementation project(path: ':module_project') + implementation project(path: ':module_square') + implementation project(path: ':module_wechat') implementation project(path: ':module_mine') implementation project(path: ':module_web') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23cc00e..274c368 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,32 +12,6 @@ android:supportsRtl="true" android:theme="@style/Theme.WanAndroid" tools:ignore="LockedOrientationActivity,UnusedAttribute"> - - - - - - - - - - - (contentViewResId: Int) : - BaseVMBActivity(contentViewResId) { - - override fun createObserve() { - super.createObserve() - mViewModel.errorResponse.observe(this) { - if (it?.errorCode == -1001) { - // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 - // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 -// com.btpj.module_user.ui.login.LoginActivity.launch(this) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt b/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt deleted file mode 100644 index 4a92775..0000000 --- a/app/src/main/java/com/btpj/wanandroid/base/BaseFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.btpj.wanandroid.base - -import androidx.databinding.ViewDataBinding -import com.btpj.lib_base.base.BaseVMBFragment -import com.btpj.lib_base.base.BaseViewModel - -/** - * 继承自BaseVMBFragment - * 在这里只做了统一处理跳转登录页面的逻辑 - * - * @author LTP 2021/11/23 - */ -abstract class BaseFragment(contentViewResId: Int) : - BaseVMBFragment(contentViewResId) { - - override fun createObserve() { - super.createObserve() - mViewModel.errorResponse.observe(viewLifecycleOwner) { - if (it?.errorCode == -1001) { // 需要登录 -// com.btpj.module_user.ui.login.LoginActivity.launch(requireContext()) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt b/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt deleted file mode 100644 index c79a547..0000000 --- a/app/src/main/java/com/btpj/wanandroid/ext/ViewExt.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.btpj.wanandroid.ext - -import android.content.Context -import android.view.View -import android.view.ViewGroup -import com.google.android.material.bottomnavigation.BottomNavigationView - diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml deleted file mode 100644 index 7e71d4a..0000000 --- a/app/src/main/res/layout/activity_web.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_integral_rank.xml b/app/src/main/res/menu/menu_integral_rank.xml deleted file mode 100644 index 579933b..0000000 --- a/app/src/main/res/menu/menu_integral_rank.xml +++ /dev/null @@ -1,16 +0,0 @@ - -

- - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index f8c6127..0000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 107554e..b3c6923 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -34,13 +34,4 @@ 16sp - - \ No newline at end of file diff --git a/lib_base/build.gradle b/lib_base/build.gradle index 3e9cc00..a4aaeb2 100644 --- a/lib_base/build.gradle +++ b/lib_base/build.gradle @@ -62,6 +62,10 @@ dependencies { api rootProject.ext.dependencies.materialDialogsLifecycle api rootProject.ext.dependencies.materialDialogsbottomsheets api rootProject.ext.dependencies.AndroidAutoSize + api rootProject.ext.dependencies.agentWeb + // 轮播图 https://github.com/youth5201314/banner + api rootProject.ext.dependencies.banner + api rootProject.ext.dependencies.flexbox // 存储相关 api rootProject.ext.dependencies.mmkv diff --git a/lib_base/src/main/AndroidManifest.xml b/lib_base/src/main/AndroidManifest.xml index 71deb47..ffc2bc5 100644 --- a/lib_base/src/main/AndroidManifest.xml +++ b/lib_base/src/main/AndroidManifest.xml @@ -5,4 +5,6 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt b/lib_base/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt rename to lib_base/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt index 1dedbe0..505188f 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/ArticleAdapter.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt @@ -1,10 +1,10 @@ -package com.btpj.wanandroid.ui.main.home +package com.btpj.lib_base.adapter import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R +import com.btpj.lib_base.R import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.databinding.ListItemArticleBinding +import com.btpj.lib_base.databinding.CommonListItemArticleBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -15,14 +15,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class ArticleAdapter : - BaseQuickAdapter>(R.layout.list_item_article), + BaseQuickAdapter>(R.layout.common_list_item_article), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: Article) { + override fun convert(holder: BaseDataBindingHolder, item: Article) { holder.dataBinding?.apply { article = item executePendingBindings() diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt index b1a072d..fc17c5b 100644 --- a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt +++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt @@ -6,10 +6,26 @@ package com.btpj.lib_base.data.local object Constants { //------- ARouter相关启动变量 start -------------- + // main Module + + // home module + const val ROUTER_HOME_HOME_FRAGMENT = "/home/HomeFragment" + const val ROUTER_HOME_AUTHOR_ACTIVITY = "/home/AuthorActivity" + const val ROUTER_HOME_EXTRA_AUTHOR_ID = "extra_author_id" + + // project Module + const val ROUTER_PROJECT_PROJECT_FRAGMENT = "/project/ProjectFragment" + + // square Module + const val ROUTER_SQUARE_SQUARE_FRAGMENT = "/square/SquareFragment" + + // wechat Module + const val ROUTER_WECHAT_WECHAT_FRAGMENT = "/wechat/WechatFragment" // mine Module - const val ROUTER_MINE_LOGIN_ACTIVITY = "/mine/loginActivity" - const val ROUTER_MINE_MINE_FRAGMENT = "/mine/mineFragment" + const val ROUTER_MINE_LOGIN_ACTIVITY = "/mine/LoginActivity" + const val ROUTER_MINE_MINE_FRAGMENT = "/mine/MineFragment" + const val ROUTER_MINE_ADD_ARTICLE_ACTIVITY = "/mine/AddArticleActivity" // Web Module const val ROUTER_WEB_WEB_ACTIVITY = "/web/WebActivity" diff --git a/app/src/main/res/layout/fragment_viewpager.xml b/lib_base/src/main/res/layout/common_fragment_viewpager.xml similarity index 96% rename from app/src/main/res/layout/fragment_viewpager.xml rename to lib_base/src/main/res/layout/common_fragment_viewpager.xml index 0dd9a00..f4e8d11 100644 --- a/app/src/main/res/layout/fragment_viewpager.xml +++ b/lib_base/src/main/res/layout/common_fragment_viewpager.xml @@ -16,7 +16,7 @@ android:id="@+id/constraintLayout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.main.project.ProjectFragment"> + tools:context="com.btpj.module_project.ui.project.ProjectFragment"> + 玩Android 列表为空 网络请求错误，请稍后重试 网络连接失败，请稍后重试 diff --git a/module_home/.gitignore b/module_home/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_home/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_home/build.gradle b/module_home/build.gradle new file mode 100644 index 0000000..13334c7 --- /dev/null +++ b/module_home/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_home" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "home_" +} \ No newline at end of file diff --git a/module_home/proguard-rules.pro b/module_home/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_home/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_home/src/androidTest/java/com/btpj/module_home/ExampleInstrumentedTest.kt b/module_home/src/androidTest/java/com/btpj/module_home/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..4243d2f --- /dev/null +++ b/module_home/src/androidTest/java/com/btpj/module_home/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_home + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_home", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_home/src/main/AndroidManifest.xml b/module_home/src/main/AndroidManifest.xml new file mode 100644 index 0000000..cdb2f6a --- /dev/null +++ b/module_home/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + \ No newline at end of file diff --git a/module_home/src/main/alone/AndroidManifest.xml b/module_home/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..ee9fc18 --- /dev/null +++ b/module_home/src/main/alone/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt b/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt similarity index 98% rename from app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt rename to module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt index 5ab35a5..8b4d418 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/DataRepository.kt +++ b/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt @@ -1,9 +1,9 @@ -package com.btpj.wanandroid.data +package com.btpj.module_home.data import com.btpj.lib_base.data.bean.* import com.btpj.lib_base.http.BaseRepository import com.btpj.lib_base.http.RetrofitManager -import com.btpj.wanandroid.data.http.Api +import com.btpj.module_home.data.http.Api import retrofit2.http.Path import retrofit2.http.Query diff --git a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt b/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt similarity index 99% rename from app/src/main/java/com/btpj/wanandroid/data/http/Api.kt rename to module_home/src/main/java/com/btpj/module_home/data/http/Api.kt index 3208241..b7479f2 100644 --- a/app/src/main/java/com/btpj/wanandroid/data/http/Api.kt +++ b/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.data.http +package com.btpj.module_home.data.http import com.btpj.lib_base.data.bean.* import retrofit2.http.* diff --git a/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt b/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt new file mode 100644 index 0000000..c072705 --- /dev/null +++ b/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt @@ -0,0 +1,44 @@ +package com.btpj.module_home.data.local + +import android.text.TextUtils +import com.btpj.lib_base.ext.toJson +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.tencent.mmkv.MMKV + +/** + * 项目中用到的一些缓存 + * + * @author LTP 2022/4/8 + */ +object CacheManager { + + private const val KEY_SEARCH_HISTORY = "search_history" + private const val KEY_FIRST_USE = "first_use" + + private val mmkv by lazy { MMKV.defaultMMKV() } + + /** 获取搜索历史缓存数据 */ + fun getSearchHistoryData(): ArrayDeque? { + val searchCacheStr = mmkv.decodeString(KEY_SEARCH_HISTORY) + if (!TextUtils.isEmpty(searchCacheStr)) { + return Gson().fromJson(searchCacheStr, object : TypeToken>() {}.type) + } + return ArrayDeque() + } + + /** 存储搜索历史数据 */ + fun saveSearchHistoryData(searchHistoryDeque: ArrayDeque) { + mmkv.encode(KEY_SEARCH_HISTORY, searchHistoryDeque.toJson()) + } + + /** 存储是否首次使用APP */ + fun saveFirstUse(isFirstUse: Boolean): Boolean { + return mmkv.encode(KEY_FIRST_USE, isFirstUse) + } + + /** 是否首次使用APP */ + fun isFirstUse(): Boolean { + return mmkv.decodeBool(KEY_FIRST_USE, true) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/author/AuthorActivity.kt rename to module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt index 5883a7a..396d38e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt @@ -1,29 +1,32 @@ -package com.btpj.wanandroid.ui.author +package com.btpj.module_home.ui.author import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.facade.annotation.Route import com.btpj.lib_base.data.bean.PageResponse -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseActivity +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.adapter.ArticleAdapter +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.ActivityAuthorBinding -import com.btpj.wanandroid.ui.main.home.ArticleAdapter +import com.btpj.module_home.R +import com.btpj.module_home.databinding.HomeActivityAuthorBinding /** * 其他作者的文章列表 * * @author LTP 2022/4/18 */ +@Route(path = Constants.ROUTER_HOME_AUTHOR_ACTIVITY) class AuthorActivity : - BaseActivity(R.layout.activity_author) { + BaseVMBActivity(R.layout.home_activity_author) { /** 作者Id */ private var mAuthorId = 0 @@ -57,7 +60,7 @@ class AuthorActivity : layoutManager = LinearLayoutManager(context) adapter = mAdapter.apply { loadMoreModule.setOnLoadMoreListener { loadMoreData() } - addChildClickViewIds(R.id.iv_collect) + addChildClickViewIds(com.btpj.lib_base.R.id.iv_collect) setOnItemChildClickListener { _, _, position -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorViewModel.kt similarity index 96% rename from app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt rename to module_home/src/main/java/com/btpj/module_home/ui/author/AuthorViewModel.kt index 33a9547..24be4ca 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/author/AuthorViewModel.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.author +package com.btpj.module_home.ui.author import androidx.databinding.ObservableField import androidx.lifecycle.MutableLiveData @@ -6,9 +6,9 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.module_home.data.DataRepository /** * @author LTP 2022/3/9 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt similarity index 87% rename from app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt rename to module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt index 07e9304..d411bb9 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeFragment.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt @@ -1,22 +1,25 @@ -package com.btpj.wanandroid.ui.main.home +package com.btpj.module_home.ui.home import android.annotation.SuppressLint import androidx.databinding.DataBindingUtil import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.FragmentHomeBinding -import com.btpj.wanandroid.databinding.HeaderBannerBinding -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.HomeViewModel.Companion.PAGE_SIZE -import com.btpj.wanandroid.ui.search.SearchActivity +import com.btpj.module_home.R +import com.btpj.module_home.databinding.HomeFragmentHomeBinding +import com.btpj.module_home.databinding.HomeHeaderBannerBinding +import com.btpj.module_home.ui.author.AuthorActivity +import com.btpj.module_home.ui.home.HomeViewModel.Companion.PAGE_SIZE +import com.btpj.module_home.ui.search.SearchActivity import com.youth.banner.indicator.CircleIndicator /** @@ -24,7 +27,9 @@ import com.youth.banner.indicator.CircleIndicator * * @author LTP 2022/3/10 */ -class HomeFragment : BaseFragment(R.layout.fragment_home) { +@Route(path = Constants.ROUTER_HOME_HOME_FRAGMENT) +class HomeFragment : + BaseVMBFragment(R.layout.home_fragment_home) { /** 列表总数 */ private var mTotalCount: Int = 0 @@ -40,15 +45,11 @@ class HomeFragment : BaseFragment(R.layout.f private val mAdapter by lazy { ArticleAdapter() } - companion object { - fun newInstance() = HomeFragment() - } - @SuppressLint("InflateParams") override fun initView() { - val headerBannerBinding = DataBindingUtil.inflate( + val headerBannerBinding = DataBindingUtil.inflate( layoutInflater, - R.layout.header_banner, + R.layout.home_header_banner, null, false ).apply { @@ -70,17 +71,20 @@ class HomeFragment : BaseFragment(R.layout.f adapter = mAdapter.apply { loadMoreModule.setOnLoadMoreListener { loadMoreData() } addHeaderView(headerBannerBinding.root) - addChildClickViewIds(R.id.tv_author, R.id.iv_collect) + addChildClickViewIds( + com.btpj.lib_base.R.id.tv_author, + com.btpj.lib_base.R.id.iv_collect + ) setOnItemChildClickListener { _, view, position -> when (view.id) { // 查看作者文章列表 - R.id.tv_author -> + com.btpj.lib_base.R.id.tv_author -> AuthorActivity.launch( requireContext(), mAdapter.getItem(position).userId ) // 收藏与取消收藏 - R.id.iv_collect -> + com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { // 取消收藏成功后,手动更改避免刷新整个列表 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeViewModel.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeViewModel.kt similarity index 97% rename from app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeViewModel.kt rename to module_home/src/main/java/com/btpj/module_home/ui/home/HomeViewModel.kt index 6a73e89..ca99012 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/HomeViewModel.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeViewModel.kt @@ -1,13 +1,13 @@ -package com.btpj.wanandroid.ui.main.home +package com.btpj.module_home.ui.home import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.Banner +import com.btpj.module_home.data.DataRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt similarity index 97% rename from app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt rename to module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt index 4903b6c..fe4f590 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/home/MyBannerAdapter.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.main.home +package com.btpj.module_home.ui.home import android.view.ViewGroup import android.widget.ImageView @@ -9,7 +9,6 @@ import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.load import com.youth.banner.adapter.BannerAdapter - /** * 图片轮播Banner的Adapter * diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/HotSearchAdapter.kt similarity index 60% rename from app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/HotSearchAdapter.kt index a51106b..fa3efe2 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/HotSearchAdapter.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/HotSearchAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.search +package com.btpj.module_home.ui.search -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.HotSearch -import com.btpj.wanandroid.databinding.ListItemTvBinding +import com.btpj.lib_base.databinding.CommonListItemTvBinding +import com.btpj.lib_base.R import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class HotSearchAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_tv), + BaseQuickAdapter>(layoutResId = R.layout.common_list_item_tv), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: HotSearch) { + override fun convert(holder: BaseDataBindingHolder, item: HotSearch) { holder.dataBinding?.apply { text = item.name executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchActivity.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/SearchActivity.kt index daa7575..a878aef 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchActivity.kt @@ -1,15 +1,15 @@ -package com.btpj.wanandroid.ui.search +package com.btpj.module_home.ui.search import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.utils.ToastUtil -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.data.local.CacheManager -import com.btpj.wanandroid.databinding.ActivitySearchBinding -import com.btpj.wanandroid.ui.search.result.SearchResultActivity +import com.btpj.module_home.R +import com.btpj.module_home.data.local.CacheManager +import com.btpj.module_home.databinding.HomeActivitySearchBinding +import com.btpj.module_home.ui.search.result.SearchResultActivity import com.google.android.flexbox.FlexboxLayoutManager /** @@ -18,7 +18,7 @@ import com.google.android.flexbox.FlexboxLayoutManager * @author LTP 2022/4/19 */ class SearchActivity : - BaseActivity(R.layout.activity_search) { + BaseVMBActivity(R.layout.home_activity_search) { /** 搜索历史 */ private val mHistoryAdapter by lazy { SearchHistoryAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchHistoryAdapter.kt similarity index 61% rename from app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/SearchHistoryAdapter.kt index 04572d5..3b91d5f 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchHistoryAdapter.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchHistoryAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.search +package com.btpj.module_home.ui.search import android.view.View -import com.btpj.wanandroid.R -import com.btpj.wanandroid.databinding.ListItemSearchBinding +import com.btpj.module_home.R +import com.btpj.module_home.databinding.HomeListItemSearchBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class SearchHistoryAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_search), + BaseQuickAdapter>(layoutResId = R.layout.home_list_item_search), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: String) { + override fun convert(holder: BaseDataBindingHolder, item: String) { holder.dataBinding?.apply { this.item = item executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchViewModel.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/SearchViewModel.kt index a32acab..cb5d8b5 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/SearchViewModel.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/SearchViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.search +package com.btpj.module_home.ui.search import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.HotSearch -import com.btpj.wanandroid.data.local.CacheManager +import com.btpj.module_home.data.DataRepository +import com.btpj.module_home.data.local.CacheManager /** * @author LTP 2022/4/19 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultActivity.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt index 925f592..f1edb1c 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.search.result +package com.btpj.module_home.ui.search.result import android.annotation.SuppressLint import android.content.Context @@ -6,16 +6,16 @@ import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseActivity +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.module_home.R +import com.btpj.module_home.ui.author.AuthorActivity +import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.databinding.ActivitySearchResultBinding -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.ArticleAdapter +import com.btpj.module_home.databinding.HomeActivitySearchResultBinding /** * 搜索结果列表 @@ -23,7 +23,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/4/19 */ class SearchResultActivity : - BaseActivity(R.layout.activity_search_result) { + BaseVMBActivity(R.layout.home_activity_search_result) { private lateinit var mSearchKeyStr: String @@ -57,17 +57,20 @@ class SearchResultActivity : layoutManager = LinearLayoutManager(context) adapter = mAdapter.apply { loadMoreModule.setOnLoadMoreListener { loadMoreData() } - addChildClickViewIds(R.id.tv_author, R.id.iv_collect) + addChildClickViewIds( + com.btpj.lib_base.R.id.tv_author, + com.btpj.lib_base.R.id.iv_collect + ) setOnItemChildClickListener { _, view, position -> when (view.id) { // 查看作者文章列表 - R.id.tv_author -> + com.btpj.lib_base.R.id.tv_author -> AuthorActivity.launch( this@SearchResultActivity, mAdapter.getItem(position).userId ) // 收藏与取消收藏 - R.id.iv_collect -> + com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { // 取消收藏成功后,手动更改避免刷新整个列表 diff --git a/app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultViewModel.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultViewModel.kt similarity index 93% rename from app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultViewModel.kt rename to module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultViewModel.kt index 78dfb32..2ed2309 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/search/result/SearchResultViewModel.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.search.result +package com.btpj.module_home.ui.search.result import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article +import com.btpj.module_home.data.DataRepository /** * @author LTP 2022/4/19 diff --git a/app/src/main/res/layout/activity_author.xml b/module_home/src/main/res/layout/home_activity_author.xml similarity index 96% rename from app/src/main/res/layout/activity_author.xml rename to module_home/src/main/res/layout/home_activity_author.xml index daf9459..66d7329 100644 --- a/app/src/main/res/layout/activity_author.xml +++ b/module_home/src/main/res/layout/home_activity_author.xml @@ -7,13 +7,13 @@ + type="com.btpj.module_home.ui.author.AuthorViewModel" /> + tools:context="com.btpj.module_home.ui.author.AuthorActivity"> + type="com.btpj.module_home.ui.search.SearchViewModel" /> @@ -15,7 +15,7 @@ + tools:context="com.btpj.module_home.ui.search.SearchActivity"> + tools:context="com.btpj.module_home.ui.search.result.SearchResultActivity"> + tools:context="com.btpj.module_home.ui.home.HomeFragment"> e5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_home/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_home/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_home/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_home/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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 + + + \ No newline at end of file diff --git a/module_home/src/main/res/values/themes.xml b/module_home/src/main/res/values/themes.xml new file mode 100644 index 0000000..262edc1 --- /dev/null +++ b/module_home/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_home/src/test/java/com/btpj/module_home/ExampleUnitTest.kt b/module_home/src/test/java/com/btpj/module_home/ExampleUnitTest.kt new file mode 100644 index 0000000..c26700f --- /dev/null +++ b/module_home/src/test/java/com/btpj/module_home/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_home + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_main/.gitignore b/module_main/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_main/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_main/build.gradle b/module_main/build.gradle new file mode 100644 index 0000000..2e65210 --- /dev/null +++ b/module_main/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_main" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "main_" +} \ No newline at end of file diff --git a/module_main/proguard-rules.pro b/module_main/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_main/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_main/src/androidTest/java/com/btpj/module_main/ExampleInstrumentedTest.kt b/module_main/src/androidTest/java/com/btpj/module_main/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..0e33cd3 --- /dev/null +++ b/module_main/src/androidTest/java/com/btpj/module_main/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_main + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_main", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_main/src/main/AndroidManifest.xml b/module_main/src/main/AndroidManifest.xml new file mode 100644 index 0000000..481b2d5 --- /dev/null +++ b/module_main/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_main/src/main/alone/AndroidManifest.xml b/module_main/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..b6f60d9 --- /dev/null +++ b/module_main/src/main/alone/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt b/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt new file mode 100644 index 0000000..5585eca --- /dev/null +++ b/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt @@ -0,0 +1,135 @@ +package com.btpj.module_main.data + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.module_main.data.http.Api +import retrofit2.http.Path +import retrofit2.http.Query + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun getBanner(): ApiResponse> { + return apiCall { service.getBanner() } + } + + override suspend fun getArticleTopList(): ApiResponse> { + return apiCall { service.getArticleTopList() } + } + + override suspend fun getArticlePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getArticlePageList(pageNo, pageSize) } + } + + override suspend fun collectArticle(id: Int): ApiResponse { + return apiCall { service.collectArticle(id) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } + + override suspend fun getProjectTitleList(): ApiResponse> { + return apiCall { service.getProjectTitleList() } + } + + override suspend fun getNewProjectPageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getNewProjectPageList(pageNo, pageSize) } + } + + override suspend fun getProjectPageList( + @Path(value = "pageNo") pageNo: Int, + @Query(value = "page_size") pageSize: Int, + @Query(value = "cid") categoryId: Int + ): ApiResponse> { + return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } + } + + override suspend fun getSquarePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getSquarePageList(pageNo, pageSize) } + } + + override suspend fun getAskPageList( + pageNo: Int + ): ApiResponse> { + return apiCall { service.getAskPageList(pageNo) } + } + + override suspend fun getTreeList(): ApiResponse> { + return apiCall { service.getTreeList() } + } + + override suspend fun getNavigationList(): ApiResponse> { + return apiCall { service.getNavigationList() } + } + + override suspend fun getAuthorTitleList(): ApiResponse> { + return apiCall { service.getAuthorTitleList() } + } + + override suspend fun getAuthorArticlePageList( + authorId: Int, + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } + } + + override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { + return apiCall { service.getCollectArticlePageList(pageNo) } + } + + override suspend fun getCollectUrlList(): ApiResponse> { + return apiCall { service.getCollectUrlList() } + } + + override suspend fun addArticle(title: String, link: String): ApiResponse { + return apiCall { service.addArticle(title, link) } + } + + override suspend fun deleteShareArticle(id: Int): ApiResponse { + return apiCall { service.deleteShareArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } + + override suspend fun getOtherAuthorArticlePageList( + id: Int, + page: Int + ): ApiResponse { + return apiCall { service.getOtherAuthorArticlePageList(id, page) } + } + + override suspend fun getHotSearchList(): ApiResponse> { + return apiCall { service.getHotSearchList() } + } + + override suspend fun getSearchDataByKey( + pageNo: Int, + searchKey: String + ): ApiResponse> { + return apiCall { service.getSearchDataByKey(pageNo, searchKey) } + } +} \ No newline at end of file diff --git a/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt b/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt new file mode 100644 index 0000000..72641a1 --- /dev/null +++ b/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt @@ -0,0 +1,134 @@ +package com.btpj.module_main.data.http + +import com.btpj.lib_base.data.bean.* +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 获取首页banner数据 */ + @GET("banner/json") + suspend fun getBanner(): ApiResponse> + + /** 获取置顶文章集合数据 */ + @GET("article/top/json") + suspend fun getArticleTopList(): ApiResponse> + + /** 获取首页文章数据 */ + @GET("article/list/{pageNo}/json") + suspend fun getArticlePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 收藏站内文章 */ + @POST("lg/collect/{id}/json") + suspend fun collectArticle(@Path("id") id: Int): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse + + /** 获取项目分类数据 */ + @GET("project/tree/json") + suspend fun getProjectTitleList(): ApiResponse> + + /** 获取最新项目列表分页数据 */ + @GET("article/listproject/{pageNo}/json") + suspend fun getNewProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取项目列表分页数据 */ + @GET("project/list/{pageNo}/json") + suspend fun getProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int, + @Query("cid") categoryId: Int + ): ApiResponse> + + /** 获取广场列表分页数据 */ + @GET("user_article/list/{pageNo}/json") + suspend fun getSquarePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取每日一问列表分页数据 */ + @GET("wenda/list/{pageNo}/json") + suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取体系数据 */ + @GET("tree/json") + suspend fun getTreeList(): ApiResponse> + + /** 获取导航数据 */ + @GET("navi/json") + suspend fun getNavigationList(): ApiResponse> + + /** 获取公众号作者列表 */ + @GET("wxarticle/chapters/json") + suspend fun getAuthorTitleList(): ApiResponse> + + /** 获取公众号作者文章分页列表 */ + @GET("wxarticle/list/{authorId}/{pageNo}/json") + suspend fun getAuthorArticlePageList( + @Path("authorId") authorId: Int, + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取收藏文章分页列表 */ + @GET("lg/collect/list/{pageNo}/json") + suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取收藏网址列表 */ + @GET("lg/collect/usertools/json") + suspend fun getCollectUrlList(): ApiResponse> + + /** 添加要分享的文章 */ + @POST("lg/user_article/add/json") + @FormUrlEncoded + suspend fun addArticle( + @Field("title") title: String, + @Field("link") link: String + ): ApiResponse + + /** 删除自己分享的文章 */ + @POST("lg/user_article/delete/{id}/json") + suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + + /** 获取其他作者分享的文章分页列表 */ + @GET("user/{id}/share_articles/{page}/json") + suspend fun getOtherAuthorArticlePageList( + @Path("id") id: Int, + @Path("page") page: Int + ): ApiResponse + + /** 获取热门搜索数据 */ + @GET("hotkey/json") + suspend fun getHotSearchList(): ApiResponse> + + /** 根据关键词搜索数据 */ + @POST("article/query/{pageNo}/json") + suspend fun getSearchDataByKey( + @Path("pageNo") pageNo: Int, + @Query("k") searchKey: String + ): ApiResponse> +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/data/local/CacheManager.kt b/module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt similarity index 100% rename from app/src/main/java/com/btpj/wanandroid/data/local/CacheManager.kt rename to module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt b/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt similarity index 84% rename from app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt rename to module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt index 0976227..3d7dde3 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/MainActivity.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt @@ -1,20 +1,16 @@ -package com.btpj.wanandroid.ui.main +package com.btpj.module_main.ui.main import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.clearLongClickToast import com.btpj.lib_base.utils.ToastUtil -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity -import com.btpj.wanandroid.databinding.ActivityMainBinding -import com.btpj.wanandroid.ui.main.home.HomeFragment -import com.btpj.wanandroid.ui.main.project.ProjectFragment -import com.btpj.wanandroid.ui.main.square.SquareFragment -import com.btpj.wanandroid.ui.main.wechat.WechatFragment +import com.btpj.module_main.R +import com.btpj.module_main.databinding.MainActivityMainBinding /** * 主页 @@ -22,7 +18,7 @@ import com.btpj.wanandroid.ui.main.wechat.WechatFragment * @author LTP 2022/3/9 */ class MainActivity : - BaseActivity(R.layout.activity_main) { + BaseVMBActivity(R.layout.main_activity_main) { companion object { /** 记录修改配置（如页面旋转）前navBar的位置的常量 */ @@ -34,12 +30,25 @@ class MainActivity : } } - private val mHomeFragment by lazy { HomeFragment.newInstance() } - private val mProjectFragment by lazy { ProjectFragment.newInstance() } - private val mSquareFragment by lazy { SquareFragment.newInstance() } - private val mWechatFragment by lazy { WechatFragment.newInstance() } + private val mHomeFragment by lazy { + ARouter.getInstance().build(Constants.ROUTER_HOME_HOME_FRAGMENT) + .navigation() as Fragment + } + private val mProjectFragment by lazy { + ARouter.getInstance().build(Constants.ROUTER_PROJECT_PROJECT_FRAGMENT) + .navigation() as Fragment + } + private val mSquareFragment by lazy { + ARouter.getInstance().build(Constants.ROUTER_SQUARE_SQUARE_FRAGMENT) + .navigation() as Fragment + } + private val mWechatFragment by lazy { + ARouter.getInstance().build(Constants.ROUTER_WECHAT_WECHAT_FRAGMENT) + .navigation() as Fragment + } private val mMineFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_MINE_MINE_FRAGMENT).navigation() as Fragment + ARouter.getInstance().build(Constants.ROUTER_MINE_MINE_FRAGMENT) + .navigation() as Fragment } /** 当前显示的Fragment(默认开始为首页) */ diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/MainViewModel.kt b/module_main/src/main/java/com/btpj/module_main/ui/main/MainViewModel.kt similarity index 80% rename from app/src/main/java/com/btpj/wanandroid/ui/main/MainViewModel.kt rename to module_main/src/main/java/com/btpj/module_main/ui/main/MainViewModel.kt index a9c354e..6eed2bf 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/MainViewModel.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/main/MainViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.main +package com.btpj.module_main.ui.main import com.btpj.lib_base.base.BaseViewModel diff --git a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt similarity index 86% rename from app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt rename to module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt index 916fc7b..ed064ae 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashActivity.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt @@ -1,13 +1,13 @@ -package com.btpj.wanandroid.ui.splash +package com.btpj.module_main.ui.splash import android.annotation.SuppressLint import android.os.Bundle import android.view.View -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseActivity +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.module_main.R +import com.btpj.module_main.databinding.MainActivitySplashBinding +import com.btpj.module_main.ui.main.MainActivity import com.btpj.wanandroid.data.local.CacheManager -import com.btpj.wanandroid.databinding.ActivitySplashBinding -import com.btpj.wanandroid.ui.main.MainActivity import com.youth.banner.indicator.CircleIndicator import com.youth.banner.listener.OnPageChangeListener @@ -18,7 +18,7 @@ import com.youth.banner.listener.OnPageChangeListener */ @SuppressLint("CustomSplashScreen") class SplashActivity : - BaseActivity(R.layout.activity_splash) { + BaseVMBActivity(R.layout.main_activity_splash) { private val mBannerList = listOf( diff --git a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashBannerAdapter.kt b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashBannerAdapter.kt similarity index 96% rename from app/src/main/java/com/btpj/wanandroid/ui/splash/SplashBannerAdapter.kt rename to module_main/src/main/java/com/btpj/module_main/ui/splash/SplashBannerAdapter.kt index e40bcff..8902161 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashBannerAdapter.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashBannerAdapter.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.splash +package com.btpj.module_main.ui.splash import android.view.ViewGroup import android.widget.ImageView diff --git a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashViewModel.kt b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/splash/SplashViewModel.kt rename to module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt index a6125ee..ee05b79 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/splash/SplashViewModel.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.splash +package com.btpj.module_main.ui.splash import androidx.databinding.ObservableBoolean import com.btpj.lib_base.base.BaseViewModel diff --git a/app/src/main/res/layout/activity_main.xml b/module_main/src/main/res/layout/main_activity_main.xml similarity index 88% rename from app/src/main/res/layout/activity_main.xml rename to module_main/src/main/res/layout/main_activity_main.xml index 59be9da..991e1dd 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/module_main/src/main/res/layout/main_activity_main.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".ui.main.MainActivity"> + tools:context="com.btpj.module_main.ui.main.MainActivity"> + app:menu="@menu/main_menu_bottom_nav" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/module_main/src/main/res/layout/main_activity_splash.xml similarity index 92% rename from app/src/main/res/layout/activity_splash.xml rename to module_main/src/main/res/layout/main_activity_splash.xml index 3ac09e2..4b6a3b3 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/module_main/src/main/res/layout/main_activity_splash.xml @@ -7,7 +7,7 @@ + type="com.btpj.module_main.ui.splash.SplashViewModel" /> @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/ic_splash" - tools:context=".ui.splash.SplashActivity"> + tools:context="com.btpj.module_main.ui.splash.SplashActivity"> e5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_main/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_main/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_main/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_main/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 zcmV-K3%m4ENk&FI3jhFDMM6+kP&il$0000G0001w0055w06|PpNY()W00EFA*|uso z=UmW3;Ri7@GcyiBW{ey$jes55b5S`|ZVZ{(x$xch{z?D+^{yErVgleVwa9qvGt40r z42;MG=7<0QySlzE=Ig6%01!FBK^$Fsxe@Hfe6aCy?Wh2r0~}@_lQAF90oTUi0FhEr z#(*;kTC(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+< zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd$R2YN>lB(Lq`OInY48%4%yTv2 zYe1{G`3)(PDEio5Y@-I5tUf`c%%OCJMtSW56g3iEg%3`$7XSJJHyA z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS zM7pfJydu`i%gfS<{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2? zzE`}<{;Zt7<$C|9R8A~DJ~@%x>TfP zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert) zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH zfXDx;l@~et{*{U*#c#Dvzu)|znDO7$#CRx)Z&yp-}SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY& zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{ zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6} zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6- z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38Ne3N9bm|62tPccBJi)5{B z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1 zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR# z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb< zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq=t;_)Le&jyt(&9jzR73noru`a# zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?| zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~ zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8- z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDEAYTesU8H$)g(Plra{VH(v3u^CO1~(+ zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk|`mq%I6u)My=gPIDuUb&lzf4`MEA9^g8u z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{Yo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j + + + \ No newline at end of file diff --git a/module_main/src/main/res/values/themes.xml b/module_main/src/main/res/values/themes.xml new file mode 100644 index 0000000..54571f0 --- /dev/null +++ b/module_main/src/main/res/values/themes.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/module_main/src/test/java/com/btpj/module_main/ExampleUnitTest.kt b/module_main/src/test/java/com/btpj/module_main/ExampleUnitTest.kt new file mode 100644 index 0000000..8ff56f9 --- /dev/null +++ b/module_main/src/test/java/com/btpj/module_main/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_main + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_mine/src/main/alone/AndroidManifest.xml b/module_mine/src/main/alone/AndroidManifest.xml index c9e56b1..52af760 100644 --- a/module_mine/src/main/alone/AndroidManifest.xml +++ b/module_mine/src/main/alone/AndroidManifest.xml @@ -29,27 +29,33 @@ + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> \ No newline at end of file diff --git a/module_project/.gitignore b/module_project/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_project/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_project/build.gradle b/module_project/build.gradle new file mode 100644 index 0000000..8d0b720 --- /dev/null +++ b/module_project/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_project" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "project_" +} \ No newline at end of file diff --git a/module_project/proguard-rules.pro b/module_project/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_project/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_project/src/androidTest/java/com/btpj/module_project/ExampleInstrumentedTest.kt b/module_project/src/androidTest/java/com/btpj/module_project/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..0feeed5 --- /dev/null +++ b/module_project/src/androidTest/java/com/btpj/module_project/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_project + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_project", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_project/src/main/AndroidManifest.xml b/module_project/src/main/AndroidManifest.xml new file mode 100644 index 0000000..aa2c7f8 --- /dev/null +++ b/module_project/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/module_project/src/main/alone/AndroidManifest.xml b/module_project/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..cad7a8e --- /dev/null +++ b/module_project/src/main/alone/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt b/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt new file mode 100644 index 0000000..43d8481 --- /dev/null +++ b/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt @@ -0,0 +1,135 @@ +package com.btpj.module_project.data + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.module_project.data.http.Api +import retrofit2.http.Path +import retrofit2.http.Query + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun getBanner(): ApiResponse> { + return apiCall { service.getBanner() } + } + + override suspend fun getArticleTopList(): ApiResponse> { + return apiCall { service.getArticleTopList() } + } + + override suspend fun getArticlePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getArticlePageList(pageNo, pageSize) } + } + + override suspend fun collectArticle(id: Int): ApiResponse { + return apiCall { service.collectArticle(id) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } + + override suspend fun getProjectTitleList(): ApiResponse> { + return apiCall { service.getProjectTitleList() } + } + + override suspend fun getNewProjectPageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getNewProjectPageList(pageNo, pageSize) } + } + + override suspend fun getProjectPageList( + @Path(value = "pageNo") pageNo: Int, + @Query(value = "page_size") pageSize: Int, + @Query(value = "cid") categoryId: Int + ): ApiResponse> { + return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } + } + + override suspend fun getSquarePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getSquarePageList(pageNo, pageSize) } + } + + override suspend fun getAskPageList( + pageNo: Int + ): ApiResponse> { + return apiCall { service.getAskPageList(pageNo) } + } + + override suspend fun getTreeList(): ApiResponse> { + return apiCall { service.getTreeList() } + } + + override suspend fun getNavigationList(): ApiResponse> { + return apiCall { service.getNavigationList() } + } + + override suspend fun getAuthorTitleList(): ApiResponse> { + return apiCall { service.getAuthorTitleList() } + } + + override suspend fun getAuthorArticlePageList( + authorId: Int, + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } + } + + override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { + return apiCall { service.getCollectArticlePageList(pageNo) } + } + + override suspend fun getCollectUrlList(): ApiResponse> { + return apiCall { service.getCollectUrlList() } + } + + override suspend fun addArticle(title: String, link: String): ApiResponse { + return apiCall { service.addArticle(title, link) } + } + + override suspend fun deleteShareArticle(id: Int): ApiResponse { + return apiCall { service.deleteShareArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } + + override suspend fun getOtherAuthorArticlePageList( + id: Int, + page: Int + ): ApiResponse { + return apiCall { service.getOtherAuthorArticlePageList(id, page) } + } + + override suspend fun getHotSearchList(): ApiResponse> { + return apiCall { service.getHotSearchList() } + } + + override suspend fun getSearchDataByKey( + pageNo: Int, + searchKey: String + ): ApiResponse> { + return apiCall { service.getSearchDataByKey(pageNo, searchKey) } + } +} \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt b/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt new file mode 100644 index 0000000..b130116 --- /dev/null +++ b/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt @@ -0,0 +1,134 @@ +package com.btpj.module_project.data.http + +import com.btpj.lib_base.data.bean.* +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 获取首页banner数据 */ + @GET("banner/json") + suspend fun getBanner(): ApiResponse> + + /** 获取置顶文章集合数据 */ + @GET("article/top/json") + suspend fun getArticleTopList(): ApiResponse> + + /** 获取首页文章数据 */ + @GET("article/list/{pageNo}/json") + suspend fun getArticlePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 收藏站内文章 */ + @POST("lg/collect/{id}/json") + suspend fun collectArticle(@Path("id") id: Int): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse + + /** 获取项目分类数据 */ + @GET("project/tree/json") + suspend fun getProjectTitleList(): ApiResponse> + + /** 获取最新项目列表分页数据 */ + @GET("article/listproject/{pageNo}/json") + suspend fun getNewProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取项目列表分页数据 */ + @GET("project/list/{pageNo}/json") + suspend fun getProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int, + @Query("cid") categoryId: Int + ): ApiResponse> + + /** 获取广场列表分页数据 */ + @GET("user_article/list/{pageNo}/json") + suspend fun getSquarePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取每日一问列表分页数据 */ + @GET("wenda/list/{pageNo}/json") + suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取体系数据 */ + @GET("tree/json") + suspend fun getTreeList(): ApiResponse> + + /** 获取导航数据 */ + @GET("navi/json") + suspend fun getNavigationList(): ApiResponse> + + /** 获取公众号作者列表 */ + @GET("wxarticle/chapters/json") + suspend fun getAuthorTitleList(): ApiResponse> + + /** 获取公众号作者文章分页列表 */ + @GET("wxarticle/list/{authorId}/{pageNo}/json") + suspend fun getAuthorArticlePageList( + @Path("authorId") authorId: Int, + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取收藏文章分页列表 */ + @GET("lg/collect/list/{pageNo}/json") + suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取收藏网址列表 */ + @GET("lg/collect/usertools/json") + suspend fun getCollectUrlList(): ApiResponse> + + /** 添加要分享的文章 */ + @POST("lg/user_article/add/json") + @FormUrlEncoded + suspend fun addArticle( + @Field("title") title: String, + @Field("link") link: String + ): ApiResponse + + /** 删除自己分享的文章 */ + @POST("lg/user_article/delete/{id}/json") + suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + + /** 获取其他作者分享的文章分页列表 */ + @GET("user/{id}/share_articles/{page}/json") + suspend fun getOtherAuthorArticlePageList( + @Path("id") id: Int, + @Path("page") page: Int + ): ApiResponse + + /** 获取热门搜索数据 */ + @GET("hotkey/json") + suspend fun getHotSearchList(): ApiResponse> + + /** 根据关键词搜索数据 */ + @POST("article/query/{pageNo}/json") + suspend fun getSearchDataByKey( + @Path("pageNo") pageNo: Int, + @Query("k") searchKey: String + ): ApiResponse> +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt rename to module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt index 2cdfba3..4a2583a 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ImageArticleAdapter.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt @@ -1,10 +1,10 @@ -package com.btpj.wanandroid.ui.main.project +package com.btpj.module_project.ui.project import com.alibaba.android.arouter.launcher.ARouter -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.local.Constants -import com.btpj.wanandroid.databinding.ListItemArticleImageBinding +import com.btpj.module_project.R +import com.btpj.module_project.databinding.ProjectListItemArticleImageBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -15,7 +15,7 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class ImageArticleAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_article_image), + BaseQuickAdapter>(layoutResId = R.layout.project_list_item_article_image), LoadMoreModule { init { @@ -23,7 +23,7 @@ class ImageArticleAdapter : } override fun convert( - holder: BaseDataBindingHolder, + holder: BaseDataBindingHolder, item: Article ) { holder.dataBinding?.apply { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt similarity index 91% rename from app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt rename to module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt index f02f4b9..b736759 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildFragment.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.main.project +package com.btpj.module_project.ui.project import android.annotation.SuppressLint import android.os.Bundle @@ -6,14 +6,12 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.R -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.HomeViewModel +import com.btpj.lib_base.R /** * 项目Tab下的子Fragment @@ -21,7 +19,7 @@ import com.btpj.wanandroid.ui.main.home.HomeViewModel * @author LTP 2022/3/10 */ class ProjectChildFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 @@ -63,10 +61,10 @@ class ProjectChildFragment : setOnItemChildClickListener { _, view, position -> when (view.id) { // 查看作者文章列表 - R.id.tv_author -> AuthorActivity.launch( - requireContext(), - mAdapter.getItem(position).userId - ) +// R.id.tv_author -> AuthorActivity.launch( +// requireContext(), +// mAdapter.getItem(position).userId +// ) R.id.iv_collect -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { @@ -172,7 +170,7 @@ class ProjectChildFragment : mCurrentCount = data.size loadMoreModule.apply { isEnableLoadMore = true - if (list.size < HomeViewModel.PAGE_SIZE || mCurrentCount == mTotalCount) { + if (list.size < ProjectChildViewModel.PAGE_SIZE || mCurrentCount == mTotalCount) { // 如果加载到的数据不够一页或都已加载完,显示没有更多数据布局, // 当然后台接口不同分页方式判断方法不同,这个是比较通用的（通常都有TotalCount） loadMoreEnd() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildViewModel.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildViewModel.kt similarity index 94% rename from app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildViewModel.kt rename to module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildViewModel.kt index e7965b4..29c7cee 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectChildViewModel.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.main.project +package com.btpj.module_project.ui.project import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article +import com.btpj.module_project.data.DataRepository class ProjectChildViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt similarity index 86% rename from app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt rename to module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt index b292d1b..0add5e7 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectFragment.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt @@ -1,13 +1,15 @@ -package com.btpj.wanandroid.ui.main.project +package com.btpj.module_project.ui.project import android.annotation.SuppressLint import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.btpj.lib_base.ext.toHtml -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseFragment +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.ProjectTitle -import com.btpj.wanandroid.databinding.FragmentViewpagerBinding +import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding +import com.btpj.lib_base.ext.toHtml +import com.btpj.lib_base.R +import com.btpj.lib_base.data.local.Constants import com.google.android.material.tabs.TabLayoutMediator /** @@ -15,8 +17,9 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ +@Route(path = Constants.ROUTER_PROJECT_PROJECT_FRAGMENT) class ProjectFragment : - BaseFragment(R.layout.fragment_viewpager) { + BaseVMBFragment(R.layout.common_fragment_viewpager) { /** TabLayout的标题集合 */ private val mProjectTitleList = ArrayList() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectViewModel.kt similarity index 88% rename from app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt rename to module_project/src/main/java/com/btpj/module_project/ui/project/ProjectViewModel.kt index 8371e39..6f77e04 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/project/ProjectViewModel.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectViewModel.kt @@ -1,11 +1,11 @@ -package com.btpj.wanandroid.ui.main.project +package com.btpj.module_project.ui.project import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.ProjectTitle +import com.btpj.module_project.data.DataRepository class ProjectViewModel : BaseViewModel() { diff --git a/app/src/main/res/layout/list_item_article_image.xml b/module_project/src/main/res/layout/project_list_item_article_image.xml similarity index 100% rename from app/src/main/res/layout/list_item_article_image.xml rename to module_project/src/main/res/layout/project_list_item_article_image.xml diff --git a/module_project/src/main/res/mipmap-hdpi/ic_launcher.webp b/module_project/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_project/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_project/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_project/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_project/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 zcmV-K3%m4ENk&FI3jhFDMM6+kP&il$0000G0001w0055w06|PpNY()W00EFA*|uso z=UmW3;Ri7@GcyiBW{ey$jes55b5S`|ZVZ{(x$xch{z?D+^{yErVgleVwa9qvGt40r z42;MG=7<0QySlzE=Ig6%01!FBK^$Fsxe@Hfe6aCy?Wh2r0~}@_lQAF90oTUi0FhEr z#(*;kTC(r!tQk6;gxj4h%FdHAt(^M3YvYj(!tOeN)+Hvj6+< zzyJRG?^lZfWuR#t!tUKP&(?%3v&Zd$R2YN>lB(Lq`OInY48%4%yTv2 zYe1{G`3)(PDEio5Y@-I5tUf`c%%OCJMtSW56g3iEg%3`$7XSJJHyA z<|7&N)5Xrlgv~%BO24eFd;Hd;uiK%D`EdK|quUeRZDqbh9l)%j%J#0lfrZumvA<_w zu&=AVvdChf6}eqh(bUz`(`Ue*p01{fBAcTgKyDYLs_I+YyJEk+rM@avU~>fB$n)HS zM7pfJydu`i%gfS<{PF94kZDv$t>06sAkheDzu40NJ$5CMW%n^Lls?8^p^QGWURbKu3ZduZQZ((s2? zzE`}<{;Zt7<$C|9R8A~DJ~@%x>TfP zF>TX8)@v|t)q4GjRt<}5s6hLHwRel7>V@&r-O|Av(yh;Q1A{E>Ir>p+%dHD|=l+lT zpr(Dg&>#Nu=!)6bCLr-ZS%|;h)Ij$+e@r8_{qO19QvDe=&1tmpY*0lcA^Cc-#{9fQ z<~$*<&P$Q<_jy#<$40PMofM7aQ}C=jphI`4kLg}Z7CIN#26D{-4v-_CA-LiE@(%{y!BzsU%gG`Q?sjLUf%qFSl0y)2#ae*+EI>s|i`d^V$Dn)qmzqRq6VJRY|{4ujsIU%#bnqU6MR&-1I_43=|5(6Jr;Jvert) zE?S|Tmn}Tv<-??sxV5@9t}3D=>YZ0JrQe$CO~|EY=Lj9RM&4svQHPQL6%pV5fPFiH zfXDx;l@~et{*{U*#c#Dvzu)|znDO7$#CRx)Z&yp-}SrD{&|(MQtfUz~n35@RLfUy=aqrhCX0M}J_r5QsK~NmRCR|Nm&L z41UdsLjWxSUlL41r^0K&nCCK>fdR-!MYjFg(z9_mF^C|#ZQw?`)f6uVzF^`bRnVY& zo}@M06J&_+>w9@jpaO4snmU;0t-(zYW1qVBHtuD!d?%?AtN7Plp><-1Y8Rqb20ZaP zTCgn*-Sri4Q8Xn>=gNaWQ57%!D35UkA@ksOlPB*Dvw}t02ENAqw|kFhn%ZyyW%+t{ zNdM!uqEM^;2}f+tECHbwLmH*!nZVrb$-az%t50Y2pg(HqhvY-^-lb}>^6l{$jOI6} zo_kBzj%8aX|6H5M0Y<)7pzz_wLkIpRm!;PzY)9+24wk2&TT{w--phDGDCOz{cN_ca zpnm7`$oDy=HX%0i-`769*0M6(e5j-?(?24%)<)&46y0e&6@HCDZAm9W6Ib#Y#BF6- z=30crHGg+RRTe%VBC>T00OV6F+gQDAK38Ne3N9bm|62tPccBJi)5{B z4zc^Db72XiBd}v$CF|yU{Z=M|DZ%-(XarYNclODlb1Kz1_EKLy(NSLCN`eUl(rBCL zT*jx@wNvze0|TSqgE(QArOZU)_?qH(sj#TwzElLs9q)(0u!_P|R%Cy_0JFQxgGV>1 zz4?_uq<8_gM0`c*Hh|;UMz~vrg1gQXp{ufg`hM_qU;U>+zmvc5blCLSq@PrEBSGR# z&8=2Z4uXN`F3p73ueD1l{s{k$WipAvSh5W7ABe?4)t;r@V?y`bNB5FvBuE|0VRTb< zM1Hn^?DSsJY+sX@T5xW=#>T9VEV|?<(=6|ge$X6Sb05!LFdjDcoq*gM(Zq=t;_)Le&jyt(&9jzR73noru`a# zN*<`KwGa^gZU3-)MSLF0aFag#f0<>E(bYTeHmtdbns#|I)-$)mJ`q9ctQ8g0=ET?| zdO}eZ*b_p>ygRTtR^5Ggdam=Zb5wmd{}np+Jn1d_=M`~P=M67jj})fH4ztb5yQqQW z^C|C&^LHAK-u+ooIK)yM)QM?t;|<{P;;{`p=BclzAN#JzL4jCwXkQB1Dy{=^KR`=~ zTrr)y7eiYBzSNs_DvO=4A6#EgGS-zY%Vi)N*Yb`U;6o}KR}dq{r9pT5wqZ@3NOE8- z9-(}D|Nc5732CSYQbL)!gPQ#RbD8BhK3dl{sUuPvei0tkvnJBxDEAYTesU8H$)g(Plra{VH(v3u^CO1~(+ zU0O7#)jaS4{NcwA+LuSm&VBcX2#Im3xg)W}ySNw%->orn1taZ&+d)}8gJTqA!u|5P z{yv?zol_3|(1(%M(EVU=cp?L`{Pi|ixk{U)*guFML3P!OSlz;zGA#T+E@8@cgQ_mv1o7RSU=Zo_82F?&&2r;WE z@wk}JHYEZ9nYUc(Vv~iTCa3u8e4q(yq<29VoNbKk|`mq%I6u)My=gPIDuUb&lzf4`MEA9^g8u z)vp8|$$HE9m_BTV?lOosIGa4jud=jIbw)O2eCMfyw2*S8?hjWw^nqws$O*M$3I1)x zR0PWFb3$ySOcGTe1dz%N0l;RPc`x%05FtT^f^j{Yo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j + + + \ No newline at end of file diff --git a/module_project/src/main/res/values/themes.xml b/module_project/src/main/res/values/themes.xml new file mode 100644 index 0000000..8140ed5 --- /dev/null +++ b/module_project/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_project/src/test/java/com/btpj/module_project/ExampleUnitTest.kt b/module_project/src/test/java/com/btpj/module_project/ExampleUnitTest.kt new file mode 100644 index 0000000..a50788c --- /dev/null +++ b/module_project/src/test/java/com/btpj/module_project/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_project + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_square/.gitignore b/module_square/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_square/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_square/build.gradle b/module_square/build.gradle new file mode 100644 index 0000000..7749750 --- /dev/null +++ b/module_square/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_square" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "square_" +} \ No newline at end of file diff --git a/module_square/proguard-rules.pro b/module_square/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_square/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_square/src/androidTest/java/com/btpj/module_square/ExampleInstrumentedTest.kt b/module_square/src/androidTest/java/com/btpj/module_square/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..d61c6b4 --- /dev/null +++ b/module_square/src/androidTest/java/com/btpj/module_square/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_square + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_square", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_square/src/main/AndroidManifest.xml b/module_square/src/main/AndroidManifest.xml new file mode 100644 index 0000000..b226d49 --- /dev/null +++ b/module_square/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + diff --git a/module_square/src/main/alone/AndroidManifest.xml b/module_square/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..ca7c69d --- /dev/null +++ b/module_square/src/main/alone/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt b/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt new file mode 100644 index 0000000..24027d3 --- /dev/null +++ b/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt @@ -0,0 +1,135 @@ +package com.btpj.module_square.data + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.module_square.data.http.Api +import retrofit2.http.Path +import retrofit2.http.Query + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun getBanner(): ApiResponse> { + return apiCall { service.getBanner() } + } + + override suspend fun getArticleTopList(): ApiResponse> { + return apiCall { service.getArticleTopList() } + } + + override suspend fun getArticlePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getArticlePageList(pageNo, pageSize) } + } + + override suspend fun collectArticle(id: Int): ApiResponse { + return apiCall { service.collectArticle(id) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } + + override suspend fun getProjectTitleList(): ApiResponse> { + return apiCall { service.getProjectTitleList() } + } + + override suspend fun getNewProjectPageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getNewProjectPageList(pageNo, pageSize) } + } + + override suspend fun getProjectPageList( + @Path(value = "pageNo") pageNo: Int, + @Query(value = "page_size") pageSize: Int, + @Query(value = "cid") categoryId: Int + ): ApiResponse> { + return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } + } + + override suspend fun getSquarePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getSquarePageList(pageNo, pageSize) } + } + + override suspend fun getAskPageList( + pageNo: Int + ): ApiResponse> { + return apiCall { service.getAskPageList(pageNo) } + } + + override suspend fun getTreeList(): ApiResponse> { + return apiCall { service.getTreeList() } + } + + override suspend fun getNavigationList(): ApiResponse> { + return apiCall { service.getNavigationList() } + } + + override suspend fun getAuthorTitleList(): ApiResponse> { + return apiCall { service.getAuthorTitleList() } + } + + override suspend fun getAuthorArticlePageList( + authorId: Int, + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } + } + + override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { + return apiCall { service.getCollectArticlePageList(pageNo) } + } + + override suspend fun getCollectUrlList(): ApiResponse> { + return apiCall { service.getCollectUrlList() } + } + + override suspend fun addArticle(title: String, link: String): ApiResponse { + return apiCall { service.addArticle(title, link) } + } + + override suspend fun deleteShareArticle(id: Int): ApiResponse { + return apiCall { service.deleteShareArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } + + override suspend fun getOtherAuthorArticlePageList( + id: Int, + page: Int + ): ApiResponse { + return apiCall { service.getOtherAuthorArticlePageList(id, page) } + } + + override suspend fun getHotSearchList(): ApiResponse> { + return apiCall { service.getHotSearchList() } + } + + override suspend fun getSearchDataByKey( + pageNo: Int, + searchKey: String + ): ApiResponse> { + return apiCall { service.getSearchDataByKey(pageNo, searchKey) } + } +} \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt b/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt new file mode 100644 index 0000000..55177df --- /dev/null +++ b/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt @@ -0,0 +1,134 @@ +package com.btpj.module_square.data.http + +import com.btpj.lib_base.data.bean.* +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 获取首页banner数据 */ + @GET("banner/json") + suspend fun getBanner(): ApiResponse> + + /** 获取置顶文章集合数据 */ + @GET("article/top/json") + suspend fun getArticleTopList(): ApiResponse> + + /** 获取首页文章数据 */ + @GET("article/list/{pageNo}/json") + suspend fun getArticlePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 收藏站内文章 */ + @POST("lg/collect/{id}/json") + suspend fun collectArticle(@Path("id") id: Int): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse + + /** 获取项目分类数据 */ + @GET("project/tree/json") + suspend fun getProjectTitleList(): ApiResponse> + + /** 获取最新项目列表分页数据 */ + @GET("article/listproject/{pageNo}/json") + suspend fun getNewProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取项目列表分页数据 */ + @GET("project/list/{pageNo}/json") + suspend fun getProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int, + @Query("cid") categoryId: Int + ): ApiResponse> + + /** 获取广场列表分页数据 */ + @GET("user_article/list/{pageNo}/json") + suspend fun getSquarePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取每日一问列表分页数据 */ + @GET("wenda/list/{pageNo}/json") + suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取体系数据 */ + @GET("tree/json") + suspend fun getTreeList(): ApiResponse> + + /** 获取导航数据 */ + @GET("navi/json") + suspend fun getNavigationList(): ApiResponse> + + /** 获取公众号作者列表 */ + @GET("wxarticle/chapters/json") + suspend fun getAuthorTitleList(): ApiResponse> + + /** 获取公众号作者文章分页列表 */ + @GET("wxarticle/list/{authorId}/{pageNo}/json") + suspend fun getAuthorArticlePageList( + @Path("authorId") authorId: Int, + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取收藏文章分页列表 */ + @GET("lg/collect/list/{pageNo}/json") + suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取收藏网址列表 */ + @GET("lg/collect/usertools/json") + suspend fun getCollectUrlList(): ApiResponse> + + /** 添加要分享的文章 */ + @POST("lg/user_article/add/json") + @FormUrlEncoded + suspend fun addArticle( + @Field("title") title: String, + @Field("link") link: String + ): ApiResponse + + /** 删除自己分享的文章 */ + @POST("lg/user_article/delete/{id}/json") + suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + + /** 获取其他作者分享的文章分页列表 */ + @GET("user/{id}/share_articles/{page}/json") + suspend fun getOtherAuthorArticlePageList( + @Path("id") id: Int, + @Path("page") page: Int + ): ApiResponse + + /** 获取热门搜索数据 */ + @GET("hotkey/json") + suspend fun getHotSearchList(): ApiResponse> + + /** 根据关键词搜索数据 */ + @POST("article/query/{pageNo}/json") + suspend fun getSearchDataByKey( + @Path("pageNo") pageNo: Int, + @Query("k") searchKey: String + ): ApiResponse> +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt similarity index 73% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt index 69683ed..ca989b7 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt @@ -1,18 +1,21 @@ -package com.btpj.wanandroid.ui.main.square +package com.btpj.module_square.ui.square import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 +import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.base.BaseVMBFragment +import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding import com.btpj.lib_base.utils.ScreenUtil -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseFragment -import com.btpj.wanandroid.databinding.FragmentViewpagerBinding +import com.btpj.lib_base.R +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.ext.launchCheckLogin -import com.btpj.wanandroid.ui.main.square.ask.AskFragment -import com.btpj.wanandroid.ui.main.square.navigation.NavigationFragment -import com.btpj.wanandroid.ui.main.square.square.SquareChildFragment -import com.btpj.wanandroid.ui.main.square.system.SystemFragment +import com.btpj.module_square.ui.square.ask.AskFragment +import com.btpj.module_square.ui.square.navigation.NavigationFragment +import com.btpj.module_square.ui.square.square.SquareChildFragment +import com.btpj.module_square.ui.square.system.SystemFragment import com.google.android.material.tabs.TabLayoutMediator /** @@ -20,8 +23,9 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ +@Route(path = Constants.ROUTER_SQUARE_SQUARE_FRAGMENT) class SquareFragment : - BaseFragment(R.layout.fragment_viewpager) { + BaseVMBFragment(R.layout.common_fragment_viewpager) { /** 标题 */ private val mTitleList = arrayListOf("广场", "每日一问", "体系", "导航") @@ -34,8 +38,11 @@ class SquareFragment : override fun onPageSelected(position: Int) { super.onPageSelected(position) if (position == 0) { - mBinding.titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_add) { -// requireContext().launchCheckLogin { AddArticleActivity.launch(it) } + mBinding.titleLayout.setRightView(R.drawable.ic_add) { + requireContext().launchCheckLogin { + ARouter.getInstance().build(Constants.ROUTER_MINE_ADD_ARTICLE_ACTIVITY) + .navigation() + } } } else { mBinding.titleLayout.setRightView("") diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareViewModel.kt similarity index 74% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareViewModel.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/SquareViewModel.kt index c5bc3ba..e79cd90 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/SquareViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareViewModel.kt @@ -1,4 +1,4 @@ -package com.btpj.wanandroid.ui.main.square +package com.btpj.module_square.ui.square import com.btpj.lib_base.base.BaseViewModel diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt index 7aa8396..087429b 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt @@ -1,18 +1,19 @@ -package com.btpj.wanandroid.ui.main.square.ask +package com.btpj.module_square.ui.square.ask import android.annotation.SuppressLint import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R +import com.btpj.lib_base.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.ArticleAdapter +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.ext.initColors /** * 广场Tab里的每日一问 @@ -20,7 +21,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class AskFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 @@ -50,10 +51,11 @@ class AskFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - AuthorActivity.launch( - requireContext(), - mAdapter.getItem(position).userId - ) + ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) + .withInt( + Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, + mAdapter.getItem(position).userId + ).navigation() // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt similarity index 77% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskViewModel.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt index 320527f..877f980 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/ask/AskViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt @@ -1,11 +1,10 @@ -package com.btpj.wanandroid.ui.main.square.ask +package com.btpj.module_square.ui.square.ask import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article class AskViewModel : BaseViewModel() { @@ -19,7 +18,7 @@ class AskViewModel : BaseViewModel() { fun fetchAskPageList(pageNo: Int = 1) { launch({ handleRequest( - DataRepository.getAskPageList(pageNo), + com.btpj.module_square.data.DataRepository.getAskPageList(pageNo), { articlePageListLiveData.value = it.data }) }) } @@ -30,7 +29,7 @@ class AskViewModel : BaseViewModel() { */ fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(DataRepository.collectArticle(id), { + handleRequest(com.btpj.module_square.data.DataRepository.collectArticle(id), { successCallBack.invoke() }) }) @@ -42,7 +41,7 @@ class AskViewModel : BaseViewModel() { */ fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(DataRepository.unCollectArticle(id), { + handleRequest(com.btpj.module_square.data.DataRepository.unCollectArticle(id), { successCallBack.invoke() }) }) diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationAdapter.kt index 4b1fed4..fc173e2 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationAdapter.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.main.square.navigation +package com.btpj.module_square.ui.square.navigation -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Navigation -import com.btpj.wanandroid.databinding.ListItemSystemBinding +import com.btpj.module_square.R +import com.btpj.module_square.databinding.SquareListItemSystemBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -14,14 +14,17 @@ import com.google.android.flexbox.FlexboxLayoutManager * @author LTP 2022/3/23 */ class NavigationAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_system), + BaseQuickAdapter>(layoutResId = R.layout.square_list_item_system), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: Navigation) { + override fun convert( + holder: BaseDataBindingHolder, + item: Navigation + ) { holder.dataBinding?.apply { text = item.name executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationChildAdapter.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationChildAdapter.kt similarity index 60% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationChildAdapter.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationChildAdapter.kt index 643860a..3b450a7 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationChildAdapter.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationChildAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.main.square.navigation +package com.btpj.module_square.ui.square.navigation -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.Article -import com.btpj.wanandroid.databinding.ListItemTvBinding +import com.btpj.lib_base.databinding.CommonListItemTvBinding +import com.btpj.lib_base.R import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class NavigationChildAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_tv), + BaseQuickAdapter>(layoutResId = R.layout.common_list_item_tv), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: Article) { + override fun convert(holder: BaseDataBindingHolder, item: Article) { holder.dataBinding?.apply { text = item.title executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationFragment.kt similarity index 88% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationFragment.kt index 8ed194a..1d2ea85 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationFragment.kt @@ -1,11 +1,11 @@ -package com.btpj.wanandroid.ui.main.square.navigation +package com.btpj.module_square.ui.square.navigation import androidx.recyclerview.widget.LinearLayoutManager import com.btpj.lib_base.ext.getEmptyView -import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.base.BaseFragment import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.R +import com.btpj.lib_base.base.BaseVMBFragment +import com.btpj.lib_base.ext.initColors /** @@ -14,7 +14,7 @@ import com.btpj.lib_base.R * @author LTP 2022/4/7 */ class NavigationFragment : - BaseFragment(R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { private val mAdapter by lazy { NavigationAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt similarity index 78% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt index 533ce64..de9072e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/navigation/NavigationViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt @@ -1,10 +1,9 @@ -package com.btpj.wanandroid.ui.main.square.navigation +package com.btpj.module_square.ui.square.navigation import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Navigation class NavigationViewModel : BaseViewModel() { @@ -18,7 +17,7 @@ class NavigationViewModel : BaseViewModel() { fun fetchNavigationList() { launch({ handleRequest( - DataRepository.getNavigationList(), + com.btpj.module_square.data.DataRepository.getNavigationList(), { navigationListLiveData.value = it.data }) }) } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt similarity index 89% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt index f82e021..b0e517c 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt @@ -1,18 +1,19 @@ -package com.btpj.wanandroid.ui.main.square.square +package com.btpj.module_square.ui.square.square import android.annotation.SuppressLint import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R +import com.btpj.lib_base.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.ArticleAdapter +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.ext.initColors /** * 广场Tab里的子广场 @@ -20,7 +21,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class SquareChildFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { /** 页数 */ private var mPageNo: Int = 0 @@ -44,10 +45,11 @@ class SquareChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - AuthorActivity.launch( - requireContext(), - mAdapter.getItem(position).userId - ) + ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) + .withInt( + Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, + mAdapter.getItem(position).userId + ).navigation() // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt similarity index 78% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildViewModel.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt index 291ebe5..5c13a79 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/square/SquareChildViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt @@ -1,11 +1,10 @@ -package com.btpj.wanandroid.ui.main.square.square +package com.btpj.module_square.ui.square.square import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article class SquareChildViewModel : BaseViewModel() { @@ -24,7 +23,7 @@ class SquareChildViewModel : BaseViewModel() { fun fetchSquarePageList(pageNo: Int = 0) { launch({ handleRequest( - DataRepository.getSquarePageList(pageNo, PAGE_SIZE), + com.btpj.module_square.data.DataRepository.getSquarePageList(pageNo, PAGE_SIZE), { articlePageListLiveData.value = it.data }) }) } @@ -35,7 +34,7 @@ class SquareChildViewModel : BaseViewModel() { */ fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(DataRepository.collectArticle(id), { + handleRequest(com.btpj.module_square.data.DataRepository.collectArticle(id), { successCallBack.invoke() }) }) @@ -47,7 +46,7 @@ class SquareChildViewModel : BaseViewModel() { */ fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(DataRepository.unCollectArticle(id), { + handleRequest(com.btpj.module_square.data.DataRepository.unCollectArticle(id), { successCallBack.invoke() }) }) diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemAdapter.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemAdapter.kt index a69feeb..7474042 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemAdapter.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.main.square.system +package com.btpj.module_square.ui.square.system -import com.btpj.wanandroid.R import com.btpj.lib_base.data.bean.MySystem -import com.btpj.wanandroid.databinding.ListItemSystemBinding +import com.btpj.module_square.R +import com.btpj.module_square.databinding.SquareListItemSystemBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -14,14 +14,17 @@ import com.google.android.flexbox.FlexboxLayoutManager * @author LTP 2022/3/23 */ class SystemAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_system), + BaseQuickAdapter>(layoutResId = R.layout.square_list_item_system), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: MySystem) { + override fun convert( + holder: BaseDataBindingHolder, + item: MySystem + ) { holder.dataBinding?.apply { text = item.name executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemChildAdapter.kt similarity index 60% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemChildAdapter.kt index c103cbc..ddf0fc7 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemChildAdapter.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemChildAdapter.kt @@ -1,8 +1,8 @@ -package com.btpj.wanandroid.ui.main.square.system +package com.btpj.module_square.ui.square.system -import com.btpj.wanandroid.R +import com.btpj.lib_base.R import com.btpj.lib_base.data.bean.Classify -import com.btpj.wanandroid.databinding.ListItemTvBinding +import com.btpj.lib_base.databinding.CommonListItemTvBinding import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -13,14 +13,14 @@ import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder * @author LTP 2022/3/23 */ class SystemChildAdapter : - BaseQuickAdapter>(layoutResId = R.layout.list_item_tv), + BaseQuickAdapter>(layoutResId = R.layout.common_list_item_tv), LoadMoreModule { init { setAnimationWithDefault(AnimationType.ScaleIn) } - override fun convert(holder: BaseDataBindingHolder, item: Classify) { + override fun convert(holder: BaseDataBindingHolder, item: Classify) { holder.dataBinding?.apply { text = item.name executePendingBindings() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemFragment.kt similarity index 86% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemFragment.kt index 2337895..48b3d1e 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemFragment.kt @@ -1,10 +1,11 @@ -package com.btpj.wanandroid.ui.main.square.system +package com.btpj.module_square.ui.square.system import androidx.recyclerview.widget.LinearLayoutManager -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.lib_base.ext.initColors -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.R +import com.btpj.lib_base.ext.getEmptyView /** * 广场Tab下的体系 @@ -12,7 +13,7 @@ import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding * @author LTP 2022/4/7 */ class SystemFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { private val mAdapter by lazy { SystemAdapter() } diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt similarity index 71% rename from app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt rename to module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt index 943d9db..57b0251 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/square/system/SystemViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt @@ -1,10 +1,9 @@ -package com.btpj.wanandroid.ui.main.square.system +package com.btpj.module_square.ui.square.system import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.MySystem class SystemViewModel : BaseViewModel() { @@ -19,7 +18,7 @@ class SystemViewModel : BaseViewModel() { /** 请求体系列表 */ fun fetchSystemList(pageNo: Int = 0) { launch({ - handleRequest(DataRepository.getTreeList(), { systemListLiveData.value = it.data }) + handleRequest(com.btpj.module_square.data.DataRepository.getTreeList(), { systemListLiveData.value = it.data }) }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_square.xml b/module_square/src/main/res/layout/square_fragment_square.xml similarity index 92% rename from app/src/main/res/layout/fragment_square.xml rename to module_square/src/main/res/layout/square_fragment_square.xml index ea7392b..2e00490 100644 --- a/app/src/main/res/layout/fragment_square.xml +++ b/module_square/src/main/res/layout/square_fragment_square.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".ui.main.square.SquareFragment"> + tools:context="com.btpj.module_square.ui.square.SquareFragment"> e5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_square/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_square/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_square/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_square/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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 + + + \ No newline at end of file diff --git a/module_square/src/main/res/values/themes.xml b/module_square/src/main/res/values/themes.xml new file mode 100644 index 0000000..0f94e8d --- /dev/null +++ b/module_square/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_square/src/test/java/com/btpj/module_square/ExampleUnitTest.kt b/module_square/src/test/java/com/btpj/module_square/ExampleUnitTest.kt new file mode 100644 index 0000000..5843c86 --- /dev/null +++ b/module_square/src/test/java/com/btpj/module_square/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_square + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/module_web/build.gradle b/module_web/build.gradle index ad1fb35..51cac22 100644 --- a/module_web/build.gradle +++ b/module_web/build.gradle @@ -9,8 +9,4 @@ android { //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 resourcePrefix "web_" -} - -dependencies { - implementation rootProject.ext.dependencies.agentWeb } \ No newline at end of file diff --git a/module_web/src/main/res/layout/web_activity_web.xml b/module_web/src/main/res/layout/web_activity_web.xml index 76aac6b..300a55e 100644 --- a/module_web/src/main/res/layout/web_activity_web.xml +++ b/module_web/src/main/res/layout/web_activity_web.xml @@ -20,7 +20,7 @@ android:background="@color/purple_500" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/web_toolbarPopTheme" /> + app:popupTheme="@style/Web.ToolbarPopTheme" /> - - - \ No newline at end of file diff --git a/module_wechat/.gitignore b/module_wechat/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/module_wechat/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/module_wechat/build.gradle b/module_wechat/build.gradle new file mode 100644 index 0000000..79eb41c --- /dev/null +++ b/module_wechat/build.gradle @@ -0,0 +1,12 @@ +apply from: "../module.build.gradle" + +android { + defaultConfig { + if (rootProject.ext.isBuildModule) { + applicationId "com.btpj.module_wechat" + } + } + + //统一资源前缀，规范资源引用，会让编译器自动提示你不规范的命名 + resourcePrefix "wechat_" +} \ No newline at end of file diff --git a/module_wechat/proguard-rules.pro b/module_wechat/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/module_wechat/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/module_wechat/src/androidTest/java/com/btpj/module_wechat/ExampleInstrumentedTest.kt b/module_wechat/src/androidTest/java/com/btpj/module_wechat/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..92c6615 --- /dev/null +++ b/module_wechat/src/androidTest/java/com/btpj/module_wechat/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.btpj.module_wechat + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.btpj.module_wechat", appContext.packageName) + } +} \ No newline at end of file diff --git a/module_wechat/src/main/AndroidManifest.xml b/module_wechat/src/main/AndroidManifest.xml new file mode 100644 index 0000000..84b605c --- /dev/null +++ b/module_wechat/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/module_wechat/src/main/alone/AndroidManifest.xml b/module_wechat/src/main/alone/AndroidManifest.xml new file mode 100644 index 0000000..b77843d --- /dev/null +++ b/module_wechat/src/main/alone/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt b/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt new file mode 100644 index 0000000..9bffddd --- /dev/null +++ b/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt @@ -0,0 +1,135 @@ +package com.btpj.module_wechat.data + +import com.btpj.lib_base.data.bean.* +import com.btpj.lib_base.http.BaseRepository +import com.btpj.lib_base.http.RetrofitManager +import com.btpj.module_wechat.data.http.Api +import retrofit2.http.Path +import retrofit2.http.Query + +/** + * 数据仓库 + * + * @author LTP 2022/3/23 + */ +object DataRepository : BaseRepository(), Api { + + private val service by lazy { RetrofitManager.getService(Api::class.java) } + + override suspend fun getBanner(): ApiResponse> { + return apiCall { service.getBanner() } + } + + override suspend fun getArticleTopList(): ApiResponse> { + return apiCall { service.getArticleTopList() } + } + + override suspend fun getArticlePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getArticlePageList(pageNo, pageSize) } + } + + override suspend fun collectArticle(id: Int): ApiResponse { + return apiCall { service.collectArticle(id) } + } + + override suspend fun unCollectArticle(id: Int): ApiResponse { + return apiCall { service.unCollectArticle(id) } + } + + override suspend fun getProjectTitleList(): ApiResponse> { + return apiCall { service.getProjectTitleList() } + } + + override suspend fun getNewProjectPageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getNewProjectPageList(pageNo, pageSize) } + } + + override suspend fun getProjectPageList( + @Path(value = "pageNo") pageNo: Int, + @Query(value = "page_size") pageSize: Int, + @Query(value = "cid") categoryId: Int + ): ApiResponse> { + return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } + } + + override suspend fun getSquarePageList( + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getSquarePageList(pageNo, pageSize) } + } + + override suspend fun getAskPageList( + pageNo: Int + ): ApiResponse> { + return apiCall { service.getAskPageList(pageNo) } + } + + override suspend fun getTreeList(): ApiResponse> { + return apiCall { service.getTreeList() } + } + + override suspend fun getNavigationList(): ApiResponse> { + return apiCall { service.getNavigationList() } + } + + override suspend fun getAuthorTitleList(): ApiResponse> { + return apiCall { service.getAuthorTitleList() } + } + + override suspend fun getAuthorArticlePageList( + authorId: Int, + pageNo: Int, + pageSize: Int + ): ApiResponse> { + return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } + } + + override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { + return apiCall { service.getCollectArticlePageList(pageNo) } + } + + override suspend fun getCollectUrlList(): ApiResponse> { + return apiCall { service.getCollectUrlList() } + } + + override suspend fun addArticle(title: String, link: String): ApiResponse { + return apiCall { service.addArticle(title, link) } + } + + override suspend fun deleteShareArticle(id: Int): ApiResponse { + return apiCall { service.deleteShareArticle(id) } + } + + override suspend fun collectUrl(name: String, link: String): ApiResponse { + return apiCall { service.collectUrl(name, link) } + } + + override suspend fun unCollectUrl(id: Int): ApiResponse { + return apiCall { service.unCollectUrl(id) } + } + + override suspend fun getOtherAuthorArticlePageList( + id: Int, + page: Int + ): ApiResponse { + return apiCall { service.getOtherAuthorArticlePageList(id, page) } + } + + override suspend fun getHotSearchList(): ApiResponse> { + return apiCall { service.getHotSearchList() } + } + + override suspend fun getSearchDataByKey( + pageNo: Int, + searchKey: String + ): ApiResponse> { + return apiCall { service.getSearchDataByKey(pageNo, searchKey) } + } +} \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt b/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt new file mode 100644 index 0000000..b7f756b --- /dev/null +++ b/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt @@ -0,0 +1,134 @@ +package com.btpj.module_wechat.data.http + +import com.btpj.lib_base.data.bean.* +import retrofit2.http.* + +/** + * Http接口，Retrofit的请求Service + * + * @author LTP 2022/3/21 + */ +interface Api { + + /** 获取首页banner数据 */ + @GET("banner/json") + suspend fun getBanner(): ApiResponse> + + /** 获取置顶文章集合数据 */ + @GET("article/top/json") + suspend fun getArticleTopList(): ApiResponse> + + /** 获取首页文章数据 */ + @GET("article/list/{pageNo}/json") + suspend fun getArticlePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 收藏站内文章 */ + @POST("lg/collect/{id}/json") + suspend fun collectArticle(@Path("id") id: Int): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/uncollect_originId/{id}/json") + suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse + + /** 获取项目分类数据 */ + @GET("project/tree/json") + suspend fun getProjectTitleList(): ApiResponse> + + /** 获取最新项目列表分页数据 */ + @GET("article/listproject/{pageNo}/json") + suspend fun getNewProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取项目列表分页数据 */ + @GET("project/list/{pageNo}/json") + suspend fun getProjectPageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int, + @Query("cid") categoryId: Int + ): ApiResponse> + + /** 获取广场列表分页数据 */ + @GET("user_article/list/{pageNo}/json") + suspend fun getSquarePageList( + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取每日一问列表分页数据 */ + @GET("wenda/list/{pageNo}/json") + suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取体系数据 */ + @GET("tree/json") + suspend fun getTreeList(): ApiResponse> + + /** 获取导航数据 */ + @GET("navi/json") + suspend fun getNavigationList(): ApiResponse> + + /** 获取公众号作者列表 */ + @GET("wxarticle/chapters/json") + suspend fun getAuthorTitleList(): ApiResponse> + + /** 获取公众号作者文章分页列表 */ + @GET("wxarticle/list/{authorId}/{pageNo}/json") + suspend fun getAuthorArticlePageList( + @Path("authorId") authorId: Int, + @Path("pageNo") pageNo: Int, + @Query("page_size") pageSize: Int + ): ApiResponse> + + /** 获取收藏文章分页列表 */ + @GET("lg/collect/list/{pageNo}/json") + suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> + + /** 获取收藏网址列表 */ + @GET("lg/collect/usertools/json") + suspend fun getCollectUrlList(): ApiResponse> + + /** 添加要分享的文章 */ + @POST("lg/user_article/add/json") + @FormUrlEncoded + suspend fun addArticle( + @Field("title") title: String, + @Field("link") link: String + ): ApiResponse + + /** 删除自己分享的文章 */ + @POST("lg/user_article/delete/{id}/json") + suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse + + /** 收藏网址 */ + @POST("lg/collect/addtool/json") + suspend fun collectUrl( + @Query("name") name: String, + @Query("link") link: String + ): ApiResponse + + /** 取消收藏站内文章 */ + @POST("lg/collect/deletetool/json") + suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse + + /** 获取其他作者分享的文章分页列表 */ + @GET("user/{id}/share_articles/{page}/json") + suspend fun getOtherAuthorArticlePageList( + @Path("id") id: Int, + @Path("page") page: Int + ): ApiResponse + + /** 获取热门搜索数据 */ + @GET("hotkey/json") + suspend fun getHotSearchList(): ApiResponse> + + /** 根据关键词搜索数据 */ + @POST("article/query/{pageNo}/json") + suspend fun getSearchDataByKey( + @Path("pageNo") pageNo: Int, + @Query("k") searchKey: String + ): ApiResponse> +} \ No newline at end of file diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt similarity index 90% rename from app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt rename to module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt index 00e042f..f509d78 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildFragment.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt @@ -1,19 +1,20 @@ -package com.btpj.wanandroid.ui.main.wechat +package com.btpj.module_wechat.ui.wechat import android.annotation.SuppressLint import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse -import com.btpj.lib_base.ext.getEmptyView -import com.btpj.wanandroid.R +import com.btpj.lib_base.R import com.btpj.lib_base.base.App -import com.btpj.wanandroid.base.BaseFragment +import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.ext.initColors +import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding -import com.btpj.wanandroid.ui.author.AuthorActivity -import com.btpj.wanandroid.ui.main.home.ArticleAdapter +import com.btpj.lib_base.ext.getEmptyView +import com.btpj.lib_base.ext.initColors /** * 公众号Tab下的子Fragment @@ -21,7 +22,7 @@ import com.btpj.wanandroid.ui.main.home.ArticleAdapter * @author LTP 2022/3/10 */ class WechatChildFragment : - BaseFragment(com.btpj.lib_base.R.layout.include_swiperefresh_recyclerview) { + BaseVMBFragment(R.layout.include_swiperefresh_recyclerview) { /** 列表总数 */ private var mTotalCount: Int = 0 @@ -61,10 +62,11 @@ class WechatChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - AuthorActivity.launch( - requireContext(), - mAdapter.getItem(position).userId - ) + ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) + .withInt( + Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, + mAdapter.getItem(position).userId + ).navigation() // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildViewModel.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildViewModel.kt similarity index 94% rename from app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildViewModel.kt rename to module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildViewModel.kt index 40a30f4..4d26286 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatChildViewModel.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildViewModel.kt @@ -1,12 +1,12 @@ -package com.btpj.wanandroid.ui.main.wechat +package com.btpj.module_wechat.ui.wechat import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Article +import com.btpj.module_wechat.data.DataRepository class WechatChildViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt similarity index 84% rename from app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt rename to module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt index 516f819..bf1ba80 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatFragment.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt @@ -1,12 +1,14 @@ -package com.btpj.wanandroid.ui.main.wechat +package com.btpj.module_wechat.ui.wechat import android.annotation.SuppressLint import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import com.btpj.wanandroid.R -import com.btpj.wanandroid.base.BaseFragment +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBFragment +import com.btpj.lib_base.R import com.btpj.lib_base.data.bean.Classify -import com.btpj.wanandroid.databinding.FragmentViewpagerBinding +import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding import com.google.android.material.tabs.TabLayoutMediator /** @@ -14,8 +16,9 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ +@Route(path = Constants.ROUTER_WECHAT_WECHAT_FRAGMENT) class WechatFragment : - BaseFragment(R.layout.fragment_viewpager) { + BaseVMBFragment(R.layout.common_fragment_viewpager) { /** TabLayout的标题集合 */ private val mAuthorTitleList = ArrayList() diff --git a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatViewModel.kt similarity index 88% rename from app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt rename to module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatViewModel.kt index 055fa91..5eebe6b 100644 --- a/app/src/main/java/com/btpj/wanandroid/ui/main/wechat/WechatViewModel.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatViewModel.kt @@ -1,11 +1,11 @@ -package com.btpj.wanandroid.ui.main.wechat +package com.btpj.module_wechat.ui.wechat import androidx.lifecycle.MutableLiveData import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch -import com.btpj.wanandroid.data.DataRepository import com.btpj.lib_base.data.bean.Classify +import com.btpj.module_wechat.data.DataRepository class WechatViewModel : BaseViewModel() { diff --git a/app/src/main/res/layout/fragment_wechat.xml b/module_wechat/src/main/res/layout/wechat_fragment_wechat.xml similarity index 92% rename from app/src/main/res/layout/fragment_wechat.xml rename to module_wechat/src/main/res/layout/wechat_fragment_wechat.xml index 302160f..0851fe6 100644 --- a/app/src/main/res/layout/fragment_wechat.xml +++ b/module_wechat/src/main/res/layout/wechat_fragment_wechat.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".ui.main.wechat.WechatFragment"> + tools:context="com.btpj.module_wechat.ui.wechat.WechatFragment"> e5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/module_wechat/src/main/res/mipmap-mdpi/ic_launcher.webp b/module_wechat/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!To6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/module_wechat/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/module_wechat/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 GIT binary patch literal 2884 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 + + + \ No newline at end of file diff --git a/module_wechat/src/main/res/values/themes.xml b/module_wechat/src/main/res/values/themes.xml new file mode 100644 index 0000000..631ad2a --- /dev/null +++ b/module_wechat/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/module_wechat/src/test/java/com/btpj/module_wechat/ExampleUnitTest.kt b/module_wechat/src/test/java/com/btpj/module_wechat/ExampleUnitTest.kt new file mode 100644 index 0000000..c83daca --- /dev/null +++ b/module_wechat/src/test/java/com/btpj/module_wechat/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.btpj.module_wechat + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index b86a226..4fdfcc5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,3 +19,8 @@ include ':app' include ':lib_base' include ':module_web' include ':module_mine' +include ':module_main' +include ':module_home' +include ':module_project' +include ':module_square' +include ':module_wechat' From 8db6cdbeaaf5322089a605a8292920c8b8f20733 Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Mon, 9 May 2022 17:47:37 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E5=88=A0=E5=87=8F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=AD=E6=9C=AA=E4=BD=BF=E7=94=A8=E5=88=B0=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../btpj/module_home/data/DataRepository.kt | 76 ---------- .../com/btpj/module_home/data/http/Api.kt | 81 ----------- .../btpj/module_main/data/DataRepository.kt | 135 ------------------ .../com/btpj/module_main/data/http/Api.kt | 134 ----------------- .../module_main/data/local/CacheManager.kt | 21 +-- .../module_main/ui/splash/SplashActivity.kt | 2 +- .../module_main/ui/splash/SplashViewModel.kt | 2 +- .../btpj/module_mine/data/DataRepository.kt | 4 - .../com/btpj/module_mine/data/http/Api.kt | 7 - .../module_project/data/DataRepository.kt | 89 ------------ .../com/btpj/module_project/data/http/Api.kt | 95 ------------ .../btpj/module_square/data/DataRepository.kt | 90 ------------ .../com/btpj/module_square/data/http/Api.kt | 94 ------------ .../ui/square/ask/AskViewModel.kt | 7 +- .../square/navigation/NavigationViewModel.kt | 3 +- .../ui/square/square/SquareChildViewModel.kt | 7 +- .../ui/square/system/SystemViewModel.kt | 3 +- .../btpj/module_wechat/data/DataRepository.kt | 99 ------------- .../com/btpj/module_wechat/data/http/Api.kt | 102 ------------- 19 files changed, 15 insertions(+), 1036 deletions(-) delete mode 100644 module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt delete mode 100644 module_main/src/main/java/com/btpj/module_main/data/http/Api.kt diff --git a/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt b/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt index 8b4d418..28b4312 100644 --- a/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt +++ b/module_home/src/main/java/com/btpj/module_home/data/DataRepository.kt @@ -39,82 +39,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.unCollectArticle(id) } } - override suspend fun getProjectTitleList(): ApiResponse> { - return apiCall { service.getProjectTitleList() } - } - - override suspend fun getNewProjectPageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getNewProjectPageList(pageNo, pageSize) } - } - - override suspend fun getProjectPageList( - @Path(value = "pageNo") pageNo: Int, - @Query(value = "page_size") pageSize: Int, - @Query(value = "cid") categoryId: Int - ): ApiResponse> { - return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } - } - - override suspend fun getSquarePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getSquarePageList(pageNo, pageSize) } - } - - override suspend fun getAskPageList( - pageNo: Int - ): ApiResponse> { - return apiCall { service.getAskPageList(pageNo) } - } - - override suspend fun getTreeList(): ApiResponse> { - return apiCall { service.getTreeList() } - } - - override suspend fun getNavigationList(): ApiResponse> { - return apiCall { service.getNavigationList() } - } - - override suspend fun getAuthorTitleList(): ApiResponse> { - return apiCall { service.getAuthorTitleList() } - } - - override suspend fun getAuthorArticlePageList( - authorId: Int, - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } - } - - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { - return apiCall { service.getCollectArticlePageList(pageNo) } - } - - override suspend fun getCollectUrlList(): ApiResponse> { - return apiCall { service.getCollectUrlList() } - } - - override suspend fun addArticle(title: String, link: String): ApiResponse { - return apiCall { service.addArticle(title, link) } - } - - override suspend fun deleteShareArticle(id: Int): ApiResponse { - return apiCall { service.deleteShareArticle(id) } - } - - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - - override suspend fun unCollectUrl(id: Int): ApiResponse { - return apiCall { service.unCollectUrl(id) } - } - override suspend fun getOtherAuthorArticlePageList( id: Int, page: Int diff --git a/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt b/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt index b7479f2..a81b91c 100644 --- a/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt +++ b/module_home/src/main/java/com/btpj/module_home/data/http/Api.kt @@ -33,87 +33,6 @@ interface Api { @POST("lg/uncollect_originId/{id}/json") suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse - /** 获取项目分类数据 */ - @GET("project/tree/json") - suspend fun getProjectTitleList(): ApiResponse> - - /** 获取最新项目列表分页数据 */ - @GET("article/listproject/{pageNo}/json") - suspend fun getNewProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取项目列表分页数据 */ - @GET("project/list/{pageNo}/json") - suspend fun getProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int, - @Query("cid") categoryId: Int - ): ApiResponse> - - /** 获取广场列表分页数据 */ - @GET("user_article/list/{pageNo}/json") - suspend fun getSquarePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取每日一问列表分页数据 */ - @GET("wenda/list/{pageNo}/json") - suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取体系数据 */ - @GET("tree/json") - suspend fun getTreeList(): ApiResponse> - - /** 获取导航数据 */ - @GET("navi/json") - suspend fun getNavigationList(): ApiResponse> - - /** 获取公众号作者列表 */ - @GET("wxarticle/chapters/json") - suspend fun getAuthorTitleList(): ApiResponse> - - /** 获取公众号作者文章分页列表 */ - @GET("wxarticle/list/{authorId}/{pageNo}/json") - suspend fun getAuthorArticlePageList( - @Path("authorId") authorId: Int, - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取收藏文章分页列表 */ - @GET("lg/collect/list/{pageNo}/json") - suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取收藏网址列表 */ - @GET("lg/collect/usertools/json") - suspend fun getCollectUrlList(): ApiResponse> - - /** 添加要分享的文章 */ - @POST("lg/user_article/add/json") - @FormUrlEncoded - suspend fun addArticle( - @Field("title") title: String, - @Field("link") link: String - ): ApiResponse - - /** 删除自己分享的文章 */ - @POST("lg/user_article/delete/{id}/json") - suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/collect/deletetool/json") - suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse - /** 获取其他作者分享的文章分页列表 */ @GET("user/{id}/share_articles/{page}/json") suspend fun getOtherAuthorArticlePageList( diff --git a/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt b/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt deleted file mode 100644 index 5585eca..0000000 --- a/module_main/src/main/java/com/btpj/module_main/data/DataRepository.kt +++ /dev/null @@ -1,135 +0,0 @@ -package com.btpj.module_main.data - -import com.btpj.lib_base.data.bean.* -import com.btpj.lib_base.http.BaseRepository -import com.btpj.lib_base.http.RetrofitManager -import com.btpj.module_main.data.http.Api -import retrofit2.http.Path -import retrofit2.http.Query - -/** - * 数据仓库 - * - * @author LTP 2022/3/23 - */ -object DataRepository : BaseRepository(), Api { - - private val service by lazy { RetrofitManager.getService(Api::class.java) } - - override suspend fun getBanner(): ApiResponse> { - return apiCall { service.getBanner() } - } - - override suspend fun getArticleTopList(): ApiResponse> { - return apiCall { service.getArticleTopList() } - } - - override suspend fun getArticlePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getArticlePageList(pageNo, pageSize) } - } - - override suspend fun collectArticle(id: Int): ApiResponse { - return apiCall { service.collectArticle(id) } - } - - override suspend fun unCollectArticle(id: Int): ApiResponse { - return apiCall { service.unCollectArticle(id) } - } - - override suspend fun getProjectTitleList(): ApiResponse> { - return apiCall { service.getProjectTitleList() } - } - - override suspend fun getNewProjectPageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getNewProjectPageList(pageNo, pageSize) } - } - - override suspend fun getProjectPageList( - @Path(value = "pageNo") pageNo: Int, - @Query(value = "page_size") pageSize: Int, - @Query(value = "cid") categoryId: Int - ): ApiResponse> { - return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } - } - - override suspend fun getSquarePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getSquarePageList(pageNo, pageSize) } - } - - override suspend fun getAskPageList( - pageNo: Int - ): ApiResponse> { - return apiCall { service.getAskPageList(pageNo) } - } - - override suspend fun getTreeList(): ApiResponse> { - return apiCall { service.getTreeList() } - } - - override suspend fun getNavigationList(): ApiResponse> { - return apiCall { service.getNavigationList() } - } - - override suspend fun getAuthorTitleList(): ApiResponse> { - return apiCall { service.getAuthorTitleList() } - } - - override suspend fun getAuthorArticlePageList( - authorId: Int, - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } - } - - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { - return apiCall { service.getCollectArticlePageList(pageNo) } - } - - override suspend fun getCollectUrlList(): ApiResponse> { - return apiCall { service.getCollectUrlList() } - } - - override suspend fun addArticle(title: String, link: String): ApiResponse { - return apiCall { service.addArticle(title, link) } - } - - override suspend fun deleteShareArticle(id: Int): ApiResponse { - return apiCall { service.deleteShareArticle(id) } - } - - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - - override suspend fun unCollectUrl(id: Int): ApiResponse { - return apiCall { service.unCollectUrl(id) } - } - - override suspend fun getOtherAuthorArticlePageList( - id: Int, - page: Int - ): ApiResponse { - return apiCall { service.getOtherAuthorArticlePageList(id, page) } - } - - override suspend fun getHotSearchList(): ApiResponse> { - return apiCall { service.getHotSearchList() } - } - - override suspend fun getSearchDataByKey( - pageNo: Int, - searchKey: String - ): ApiResponse> { - return apiCall { service.getSearchDataByKey(pageNo, searchKey) } - } -} \ No newline at end of file diff --git a/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt b/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt deleted file mode 100644 index 72641a1..0000000 --- a/module_main/src/main/java/com/btpj/module_main/data/http/Api.kt +++ /dev/null @@ -1,134 +0,0 @@ -package com.btpj.module_main.data.http - -import com.btpj.lib_base.data.bean.* -import retrofit2.http.* - -/** - * Http接口，Retrofit的请求Service - * - * @author LTP 2022/3/21 - */ -interface Api { - - /** 获取首页banner数据 */ - @GET("banner/json") - suspend fun getBanner(): ApiResponse> - - /** 获取置顶文章集合数据 */ - @GET("article/top/json") - suspend fun getArticleTopList(): ApiResponse> - - /** 获取首页文章数据 */ - @GET("article/list/{pageNo}/json") - suspend fun getArticlePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 收藏站内文章 */ - @POST("lg/collect/{id}/json") - suspend fun collectArticle(@Path("id") id: Int): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/uncollect_originId/{id}/json") - suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse - - /** 获取项目分类数据 */ - @GET("project/tree/json") - suspend fun getProjectTitleList(): ApiResponse> - - /** 获取最新项目列表分页数据 */ - @GET("article/listproject/{pageNo}/json") - suspend fun getNewProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取项目列表分页数据 */ - @GET("project/list/{pageNo}/json") - suspend fun getProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int, - @Query("cid") categoryId: Int - ): ApiResponse> - - /** 获取广场列表分页数据 */ - @GET("user_article/list/{pageNo}/json") - suspend fun getSquarePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取每日一问列表分页数据 */ - @GET("wenda/list/{pageNo}/json") - suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取体系数据 */ - @GET("tree/json") - suspend fun getTreeList(): ApiResponse> - - /** 获取导航数据 */ - @GET("navi/json") - suspend fun getNavigationList(): ApiResponse> - - /** 获取公众号作者列表 */ - @GET("wxarticle/chapters/json") - suspend fun getAuthorTitleList(): ApiResponse> - - /** 获取公众号作者文章分页列表 */ - @GET("wxarticle/list/{authorId}/{pageNo}/json") - suspend fun getAuthorArticlePageList( - @Path("authorId") authorId: Int, - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取收藏文章分页列表 */ - @GET("lg/collect/list/{pageNo}/json") - suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取收藏网址列表 */ - @GET("lg/collect/usertools/json") - suspend fun getCollectUrlList(): ApiResponse> - - /** 添加要分享的文章 */ - @POST("lg/user_article/add/json") - @FormUrlEncoded - suspend fun addArticle( - @Field("title") title: String, - @Field("link") link: String - ): ApiResponse - - /** 删除自己分享的文章 */ - @POST("lg/user_article/delete/{id}/json") - suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/collect/deletetool/json") - suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse - - /** 获取其他作者分享的文章分页列表 */ - @GET("user/{id}/share_articles/{page}/json") - suspend fun getOtherAuthorArticlePageList( - @Path("id") id: Int, - @Path("page") page: Int - ): ApiResponse - - /** 获取热门搜索数据 */ - @GET("hotkey/json") - suspend fun getHotSearchList(): ApiResponse> - - /** 根据关键词搜索数据 */ - @POST("article/query/{pageNo}/json") - suspend fun getSearchDataByKey( - @Path("pageNo") pageNo: Int, - @Query("k") searchKey: String - ): ApiResponse> -} \ No newline at end of file diff --git a/module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt b/module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt index d1f00c3..05dcc8a 100644 --- a/module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt +++ b/module_main/src/main/java/com/btpj/module_main/data/local/CacheManager.kt @@ -1,9 +1,5 @@ -package com.btpj.wanandroid.data.local +package com.btpj.module_main.data.local -import android.text.TextUtils -import com.btpj.lib_base.ext.toJson -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import com.tencent.mmkv.MMKV /** @@ -13,25 +9,10 @@ import com.tencent.mmkv.MMKV */ object CacheManager { - private const val KEY_SEARCH_HISTORY = "search_history" private const val KEY_FIRST_USE = "first_use" private val mmkv by lazy { MMKV.defaultMMKV() } - /** 获取搜索历史缓存数据 */ - fun getSearchHistoryData(): ArrayDeque? { - val searchCacheStr = mmkv.decodeString(KEY_SEARCH_HISTORY) - if (!TextUtils.isEmpty(searchCacheStr)) { - return Gson().fromJson(searchCacheStr, object : TypeToken>() {}.type) - } - return ArrayDeque() - } - - /** 存储搜索历史数据 */ - fun saveSearchHistoryData(searchHistoryDeque: ArrayDeque) { - mmkv.encode(KEY_SEARCH_HISTORY, searchHistoryDeque.toJson()) - } - /** 存储是否首次使用APP */ fun saveFirstUse(isFirstUse: Boolean): Boolean { return mmkv.encode(KEY_FIRST_USE, isFirstUse) diff --git a/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt index ed064ae..463e33b 100644 --- a/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashActivity.kt @@ -7,7 +7,7 @@ import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.module_main.R import com.btpj.module_main.databinding.MainActivitySplashBinding import com.btpj.module_main.ui.main.MainActivity -import com.btpj.wanandroid.data.local.CacheManager +import com.btpj.module_main.data.local.CacheManager import com.youth.banner.indicator.CircleIndicator import com.youth.banner.listener.OnPageChangeListener diff --git a/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt index ee05b79..60b0b24 100644 --- a/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/splash/SplashViewModel.kt @@ -2,7 +2,7 @@ package com.btpj.module_main.ui.splash import androidx.databinding.ObservableBoolean import com.btpj.lib_base.base.BaseViewModel -import com.btpj.wanandroid.data.local.CacheManager +import com.btpj.module_main.data.local.CacheManager /** * @author LTP 2022/4/21 diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt index 7a9f4bd..782bb99 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/data/DataRepository.kt @@ -57,10 +57,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.deleteShareArticle(id) } } - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - override suspend fun unCollectUrl(id: Int): ApiResponse { return apiCall { service.unCollectUrl(id) } } diff --git a/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt index 73d853c..9a15236 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/data/http/Api.kt @@ -62,13 +62,6 @@ interface Api { @POST("lg/user_article/delete/{id}/json") suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - /** 取消收藏站内文章 */ @POST("lg/collect/deletetool/json") suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse diff --git a/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt b/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt index 43d8481..564bfbd 100644 --- a/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt +++ b/module_project/src/main/java/com/btpj/module_project/data/DataRepository.kt @@ -16,20 +16,6 @@ object DataRepository : BaseRepository(), Api { private val service by lazy { RetrofitManager.getService(Api::class.java) } - override suspend fun getBanner(): ApiResponse> { - return apiCall { service.getBanner() } - } - - override suspend fun getArticleTopList(): ApiResponse> { - return apiCall { service.getArticleTopList() } - } - - override suspend fun getArticlePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getArticlePageList(pageNo, pageSize) } - } override suspend fun collectArticle(id: Int): ApiResponse { return apiCall { service.collectArticle(id) } @@ -57,79 +43,4 @@ object DataRepository : BaseRepository(), Api { ): ApiResponse> { return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } } - - override suspend fun getSquarePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getSquarePageList(pageNo, pageSize) } - } - - override suspend fun getAskPageList( - pageNo: Int - ): ApiResponse> { - return apiCall { service.getAskPageList(pageNo) } - } - - override suspend fun getTreeList(): ApiResponse> { - return apiCall { service.getTreeList() } - } - - override suspend fun getNavigationList(): ApiResponse> { - return apiCall { service.getNavigationList() } - } - - override suspend fun getAuthorTitleList(): ApiResponse> { - return apiCall { service.getAuthorTitleList() } - } - - override suspend fun getAuthorArticlePageList( - authorId: Int, - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } - } - - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { - return apiCall { service.getCollectArticlePageList(pageNo) } - } - - override suspend fun getCollectUrlList(): ApiResponse> { - return apiCall { service.getCollectUrlList() } - } - - override suspend fun addArticle(title: String, link: String): ApiResponse { - return apiCall { service.addArticle(title, link) } - } - - override suspend fun deleteShareArticle(id: Int): ApiResponse { - return apiCall { service.deleteShareArticle(id) } - } - - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - - override suspend fun unCollectUrl(id: Int): ApiResponse { - return apiCall { service.unCollectUrl(id) } - } - - override suspend fun getOtherAuthorArticlePageList( - id: Int, - page: Int - ): ApiResponse { - return apiCall { service.getOtherAuthorArticlePageList(id, page) } - } - - override suspend fun getHotSearchList(): ApiResponse> { - return apiCall { service.getHotSearchList() } - } - - override suspend fun getSearchDataByKey( - pageNo: Int, - searchKey: String - ): ApiResponse> { - return apiCall { service.getSearchDataByKey(pageNo, searchKey) } - } } \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt b/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt index b130116..0f1056e 100644 --- a/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt +++ b/module_project/src/main/java/com/btpj/module_project/data/http/Api.kt @@ -10,21 +10,6 @@ import retrofit2.http.* */ interface Api { - /** 获取首页banner数据 */ - @GET("banner/json") - suspend fun getBanner(): ApiResponse> - - /** 获取置顶文章集合数据 */ - @GET("article/top/json") - suspend fun getArticleTopList(): ApiResponse> - - /** 获取首页文章数据 */ - @GET("article/list/{pageNo}/json") - suspend fun getArticlePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - /** 收藏站内文章 */ @POST("lg/collect/{id}/json") suspend fun collectArticle(@Path("id") id: Int): ApiResponse @@ -51,84 +36,4 @@ interface Api { @Query("page_size") pageSize: Int, @Query("cid") categoryId: Int ): ApiResponse> - - /** 获取广场列表分页数据 */ - @GET("user_article/list/{pageNo}/json") - suspend fun getSquarePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取每日一问列表分页数据 */ - @GET("wenda/list/{pageNo}/json") - suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取体系数据 */ - @GET("tree/json") - suspend fun getTreeList(): ApiResponse> - - /** 获取导航数据 */ - @GET("navi/json") - suspend fun getNavigationList(): ApiResponse> - - /** 获取公众号作者列表 */ - @GET("wxarticle/chapters/json") - suspend fun getAuthorTitleList(): ApiResponse> - - /** 获取公众号作者文章分页列表 */ - @GET("wxarticle/list/{authorId}/{pageNo}/json") - suspend fun getAuthorArticlePageList( - @Path("authorId") authorId: Int, - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取收藏文章分页列表 */ - @GET("lg/collect/list/{pageNo}/json") - suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取收藏网址列表 */ - @GET("lg/collect/usertools/json") - suspend fun getCollectUrlList(): ApiResponse> - - /** 添加要分享的文章 */ - @POST("lg/user_article/add/json") - @FormUrlEncoded - suspend fun addArticle( - @Field("title") title: String, - @Field("link") link: String - ): ApiResponse - - /** 删除自己分享的文章 */ - @POST("lg/user_article/delete/{id}/json") - suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/collect/deletetool/json") - suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse - - /** 获取其他作者分享的文章分页列表 */ - @GET("user/{id}/share_articles/{page}/json") - suspend fun getOtherAuthorArticlePageList( - @Path("id") id: Int, - @Path("page") page: Int - ): ApiResponse - - /** 获取热门搜索数据 */ - @GET("hotkey/json") - suspend fun getHotSearchList(): ApiResponse> - - /** 根据关键词搜索数据 */ - @POST("article/query/{pageNo}/json") - suspend fun getSearchDataByKey( - @Path("pageNo") pageNo: Int, - @Query("k") searchKey: String - ): ApiResponse> } \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt b/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt index 24027d3..9ef0249 100644 --- a/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt +++ b/module_square/src/main/java/com/btpj/module_square/data/DataRepository.kt @@ -4,8 +4,6 @@ import com.btpj.lib_base.data.bean.* import com.btpj.lib_base.http.BaseRepository import com.btpj.lib_base.http.RetrofitManager import com.btpj.module_square.data.http.Api -import retrofit2.http.Path -import retrofit2.http.Query /** * 数据仓库 @@ -16,21 +14,6 @@ object DataRepository : BaseRepository(), Api { private val service by lazy { RetrofitManager.getService(Api::class.java) } - override suspend fun getBanner(): ApiResponse> { - return apiCall { service.getBanner() } - } - - override suspend fun getArticleTopList(): ApiResponse> { - return apiCall { service.getArticleTopList() } - } - - override suspend fun getArticlePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getArticlePageList(pageNo, pageSize) } - } - override suspend fun collectArticle(id: Int): ApiResponse { return apiCall { service.collectArticle(id) } } @@ -39,25 +22,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.unCollectArticle(id) } } - override suspend fun getProjectTitleList(): ApiResponse> { - return apiCall { service.getProjectTitleList() } - } - - override suspend fun getNewProjectPageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getNewProjectPageList(pageNo, pageSize) } - } - - override suspend fun getProjectPageList( - @Path(value = "pageNo") pageNo: Int, - @Query(value = "page_size") pageSize: Int, - @Query(value = "cid") categoryId: Int - ): ApiResponse> { - return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } - } - override suspend fun getSquarePageList( pageNo: Int, pageSize: Int @@ -78,58 +42,4 @@ object DataRepository : BaseRepository(), Api { override suspend fun getNavigationList(): ApiResponse> { return apiCall { service.getNavigationList() } } - - override suspend fun getAuthorTitleList(): ApiResponse> { - return apiCall { service.getAuthorTitleList() } - } - - override suspend fun getAuthorArticlePageList( - authorId: Int, - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } - } - - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { - return apiCall { service.getCollectArticlePageList(pageNo) } - } - - override suspend fun getCollectUrlList(): ApiResponse> { - return apiCall { service.getCollectUrlList() } - } - - override suspend fun addArticle(title: String, link: String): ApiResponse { - return apiCall { service.addArticle(title, link) } - } - - override suspend fun deleteShareArticle(id: Int): ApiResponse { - return apiCall { service.deleteShareArticle(id) } - } - - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - - override suspend fun unCollectUrl(id: Int): ApiResponse { - return apiCall { service.unCollectUrl(id) } - } - - override suspend fun getOtherAuthorArticlePageList( - id: Int, - page: Int - ): ApiResponse { - return apiCall { service.getOtherAuthorArticlePageList(id, page) } - } - - override suspend fun getHotSearchList(): ApiResponse> { - return apiCall { service.getHotSearchList() } - } - - override suspend fun getSearchDataByKey( - pageNo: Int, - searchKey: String - ): ApiResponse> { - return apiCall { service.getSearchDataByKey(pageNo, searchKey) } - } } \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt b/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt index 55177df..53afad3 100644 --- a/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt +++ b/module_square/src/main/java/com/btpj/module_square/data/http/Api.kt @@ -10,21 +10,6 @@ import retrofit2.http.* */ interface Api { - /** 获取首页banner数据 */ - @GET("banner/json") - suspend fun getBanner(): ApiResponse> - - /** 获取置顶文章集合数据 */ - @GET("article/top/json") - suspend fun getArticleTopList(): ApiResponse> - - /** 获取首页文章数据 */ - @GET("article/list/{pageNo}/json") - suspend fun getArticlePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - /** 收藏站内文章 */ @POST("lg/collect/{id}/json") suspend fun collectArticle(@Path("id") id: Int): ApiResponse @@ -33,25 +18,6 @@ interface Api { @POST("lg/uncollect_originId/{id}/json") suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse - /** 获取项目分类数据 */ - @GET("project/tree/json") - suspend fun getProjectTitleList(): ApiResponse> - - /** 获取最新项目列表分页数据 */ - @GET("article/listproject/{pageNo}/json") - suspend fun getNewProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取项目列表分页数据 */ - @GET("project/list/{pageNo}/json") - suspend fun getProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int, - @Query("cid") categoryId: Int - ): ApiResponse> - /** 获取广场列表分页数据 */ @GET("user_article/list/{pageNo}/json") suspend fun getSquarePageList( @@ -71,64 +37,4 @@ interface Api { @GET("navi/json") suspend fun getNavigationList(): ApiResponse> - /** 获取公众号作者列表 */ - @GET("wxarticle/chapters/json") - suspend fun getAuthorTitleList(): ApiResponse> - - /** 获取公众号作者文章分页列表 */ - @GET("wxarticle/list/{authorId}/{pageNo}/json") - suspend fun getAuthorArticlePageList( - @Path("authorId") authorId: Int, - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取收藏文章分页列表 */ - @GET("lg/collect/list/{pageNo}/json") - suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取收藏网址列表 */ - @GET("lg/collect/usertools/json") - suspend fun getCollectUrlList(): ApiResponse> - - /** 添加要分享的文章 */ - @POST("lg/user_article/add/json") - @FormUrlEncoded - suspend fun addArticle( - @Field("title") title: String, - @Field("link") link: String - ): ApiResponse - - /** 删除自己分享的文章 */ - @POST("lg/user_article/delete/{id}/json") - suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/collect/deletetool/json") - suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse - - /** 获取其他作者分享的文章分页列表 */ - @GET("user/{id}/share_articles/{page}/json") - suspend fun getOtherAuthorArticlePageList( - @Path("id") id: Int, - @Path("page") page: Int - ): ApiResponse - - /** 获取热门搜索数据 */ - @GET("hotkey/json") - suspend fun getHotSearchList(): ApiResponse> - - /** 根据关键词搜索数据 */ - @POST("article/query/{pageNo}/json") - suspend fun getSearchDataByKey( - @Path("pageNo") pageNo: Int, - @Query("k") searchKey: String - ): ApiResponse> } \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt index 877f980..50e1876 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskViewModel.kt @@ -6,6 +6,7 @@ import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.lib_base.data.bean.Article +import com.btpj.module_square.data.DataRepository class AskViewModel : BaseViewModel() { @@ -18,7 +19,7 @@ class AskViewModel : BaseViewModel() { fun fetchAskPageList(pageNo: Int = 1) { launch({ handleRequest( - com.btpj.module_square.data.DataRepository.getAskPageList(pageNo), + DataRepository.getAskPageList(pageNo), { articlePageListLiveData.value = it.data }) }) } @@ -29,7 +30,7 @@ class AskViewModel : BaseViewModel() { */ fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(com.btpj.module_square.data.DataRepository.collectArticle(id), { + handleRequest(DataRepository.collectArticle(id), { successCallBack.invoke() }) }) @@ -41,7 +42,7 @@ class AskViewModel : BaseViewModel() { */ fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(com.btpj.module_square.data.DataRepository.unCollectArticle(id), { + handleRequest(DataRepository.unCollectArticle(id), { successCallBack.invoke() }) }) diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt index de9072e..73a4cd6 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/navigation/NavigationViewModel.kt @@ -5,6 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.lib_base.data.bean.Navigation +import com.btpj.module_square.data.DataRepository class NavigationViewModel : BaseViewModel() { @@ -17,7 +18,7 @@ class NavigationViewModel : BaseViewModel() { fun fetchNavigationList() { launch({ handleRequest( - com.btpj.module_square.data.DataRepository.getNavigationList(), + DataRepository.getNavigationList(), { navigationListLiveData.value = it.data }) }) } diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt index 5c13a79..592db0e 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildViewModel.kt @@ -6,6 +6,7 @@ import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.lib_base.data.bean.Article +import com.btpj.module_square.data.DataRepository class SquareChildViewModel : BaseViewModel() { @@ -23,7 +24,7 @@ class SquareChildViewModel : BaseViewModel() { fun fetchSquarePageList(pageNo: Int = 0) { launch({ handleRequest( - com.btpj.module_square.data.DataRepository.getSquarePageList(pageNo, PAGE_SIZE), + DataRepository.getSquarePageList(pageNo, PAGE_SIZE), { articlePageListLiveData.value = it.data }) }) } @@ -34,7 +35,7 @@ class SquareChildViewModel : BaseViewModel() { */ fun collectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(com.btpj.module_square.data.DataRepository.collectArticle(id), { + handleRequest(DataRepository.collectArticle(id), { successCallBack.invoke() }) }) @@ -46,7 +47,7 @@ class SquareChildViewModel : BaseViewModel() { */ fun unCollectArticle(id: Int, successCallBack: () -> Any? = {}) { launch({ - handleRequest(com.btpj.module_square.data.DataRepository.unCollectArticle(id), { + handleRequest(DataRepository.unCollectArticle(id), { successCallBack.invoke() }) }) diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt index 57b0251..3c0cf88 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/system/SystemViewModel.kt @@ -5,6 +5,7 @@ import com.btpj.lib_base.base.BaseViewModel import com.btpj.lib_base.ext.handleRequest import com.btpj.lib_base.ext.launch import com.btpj.lib_base.data.bean.MySystem +import com.btpj.module_square.data.DataRepository class SystemViewModel : BaseViewModel() { @@ -18,7 +19,7 @@ class SystemViewModel : BaseViewModel() { /** 请求体系列表 */ fun fetchSystemList(pageNo: Int = 0) { launch({ - handleRequest(com.btpj.module_square.data.DataRepository.getTreeList(), { systemListLiveData.value = it.data }) + handleRequest(DataRepository.getTreeList(), { systemListLiveData.value = it.data }) }) } } \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt b/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt index 9bffddd..d17b571 100644 --- a/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/data/DataRepository.kt @@ -4,8 +4,6 @@ import com.btpj.lib_base.data.bean.* import com.btpj.lib_base.http.BaseRepository import com.btpj.lib_base.http.RetrofitManager import com.btpj.module_wechat.data.http.Api -import retrofit2.http.Path -import retrofit2.http.Query /** * 数据仓库 @@ -16,21 +14,6 @@ object DataRepository : BaseRepository(), Api { private val service by lazy { RetrofitManager.getService(Api::class.java) } - override suspend fun getBanner(): ApiResponse> { - return apiCall { service.getBanner() } - } - - override suspend fun getArticleTopList(): ApiResponse> { - return apiCall { service.getArticleTopList() } - } - - override suspend fun getArticlePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getArticlePageList(pageNo, pageSize) } - } - override suspend fun collectArticle(id: Int): ApiResponse { return apiCall { service.collectArticle(id) } } @@ -39,46 +22,6 @@ object DataRepository : BaseRepository(), Api { return apiCall { service.unCollectArticle(id) } } - override suspend fun getProjectTitleList(): ApiResponse> { - return apiCall { service.getProjectTitleList() } - } - - override suspend fun getNewProjectPageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getNewProjectPageList(pageNo, pageSize) } - } - - override suspend fun getProjectPageList( - @Path(value = "pageNo") pageNo: Int, - @Query(value = "page_size") pageSize: Int, - @Query(value = "cid") categoryId: Int - ): ApiResponse> { - return apiCall { service.getProjectPageList(pageNo, pageSize, categoryId) } - } - - override suspend fun getSquarePageList( - pageNo: Int, - pageSize: Int - ): ApiResponse> { - return apiCall { service.getSquarePageList(pageNo, pageSize) } - } - - override suspend fun getAskPageList( - pageNo: Int - ): ApiResponse> { - return apiCall { service.getAskPageList(pageNo) } - } - - override suspend fun getTreeList(): ApiResponse> { - return apiCall { service.getTreeList() } - } - - override suspend fun getNavigationList(): ApiResponse> { - return apiCall { service.getNavigationList() } - } - override suspend fun getAuthorTitleList(): ApiResponse> { return apiCall { service.getAuthorTitleList() } } @@ -90,46 +33,4 @@ object DataRepository : BaseRepository(), Api { ): ApiResponse> { return apiCall { service.getAuthorArticlePageList(authorId, pageNo, pageSize) } } - - override suspend fun getCollectArticlePageList(pageNo: Int): ApiResponse> { - return apiCall { service.getCollectArticlePageList(pageNo) } - } - - override suspend fun getCollectUrlList(): ApiResponse> { - return apiCall { service.getCollectUrlList() } - } - - override suspend fun addArticle(title: String, link: String): ApiResponse { - return apiCall { service.addArticle(title, link) } - } - - override suspend fun deleteShareArticle(id: Int): ApiResponse { - return apiCall { service.deleteShareArticle(id) } - } - - override suspend fun collectUrl(name: String, link: String): ApiResponse { - return apiCall { service.collectUrl(name, link) } - } - - override suspend fun unCollectUrl(id: Int): ApiResponse { - return apiCall { service.unCollectUrl(id) } - } - - override suspend fun getOtherAuthorArticlePageList( - id: Int, - page: Int - ): ApiResponse { - return apiCall { service.getOtherAuthorArticlePageList(id, page) } - } - - override suspend fun getHotSearchList(): ApiResponse> { - return apiCall { service.getHotSearchList() } - } - - override suspend fun getSearchDataByKey( - pageNo: Int, - searchKey: String - ): ApiResponse> { - return apiCall { service.getSearchDataByKey(pageNo, searchKey) } - } } \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt b/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt index b7f756b..f33f4d5 100644 --- a/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/data/http/Api.kt @@ -10,21 +10,6 @@ import retrofit2.http.* */ interface Api { - /** 获取首页banner数据 */ - @GET("banner/json") - suspend fun getBanner(): ApiResponse> - - /** 获取置顶文章集合数据 */ - @GET("article/top/json") - suspend fun getArticleTopList(): ApiResponse> - - /** 获取首页文章数据 */ - @GET("article/list/{pageNo}/json") - suspend fun getArticlePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - /** 收藏站内文章 */ @POST("lg/collect/{id}/json") suspend fun collectArticle(@Path("id") id: Int): ApiResponse @@ -33,44 +18,6 @@ interface Api { @POST("lg/uncollect_originId/{id}/json") suspend fun unCollectArticle(@Path("id") id: Int): ApiResponse - /** 获取项目分类数据 */ - @GET("project/tree/json") - suspend fun getProjectTitleList(): ApiResponse> - - /** 获取最新项目列表分页数据 */ - @GET("article/listproject/{pageNo}/json") - suspend fun getNewProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取项目列表分页数据 */ - @GET("project/list/{pageNo}/json") - suspend fun getProjectPageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int, - @Query("cid") categoryId: Int - ): ApiResponse> - - /** 获取广场列表分页数据 */ - @GET("user_article/list/{pageNo}/json") - suspend fun getSquarePageList( - @Path("pageNo") pageNo: Int, - @Query("page_size") pageSize: Int - ): ApiResponse> - - /** 获取每日一问列表分页数据 */ - @GET("wenda/list/{pageNo}/json") - suspend fun getAskPageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取体系数据 */ - @GET("tree/json") - suspend fun getTreeList(): ApiResponse> - - /** 获取导航数据 */ - @GET("navi/json") - suspend fun getNavigationList(): ApiResponse> - /** 获取公众号作者列表 */ @GET("wxarticle/chapters/json") suspend fun getAuthorTitleList(): ApiResponse> @@ -82,53 +29,4 @@ interface Api { @Path("pageNo") pageNo: Int, @Query("page_size") pageSize: Int ): ApiResponse> - - /** 获取收藏文章分页列表 */ - @GET("lg/collect/list/{pageNo}/json") - suspend fun getCollectArticlePageList(@Path("pageNo") pageNo: Int): ApiResponse> - - /** 获取收藏网址列表 */ - @GET("lg/collect/usertools/json") - suspend fun getCollectUrlList(): ApiResponse> - - /** 添加要分享的文章 */ - @POST("lg/user_article/add/json") - @FormUrlEncoded - suspend fun addArticle( - @Field("title") title: String, - @Field("link") link: String - ): ApiResponse - - /** 删除自己分享的文章 */ - @POST("lg/user_article/delete/{id}/json") - suspend fun deleteShareArticle(@Path("id") id: Int): ApiResponse - - /** 收藏网址 */ - @POST("lg/collect/addtool/json") - suspend fun collectUrl( - @Query("name") name: String, - @Query("link") link: String - ): ApiResponse - - /** 取消收藏站内文章 */ - @POST("lg/collect/deletetool/json") - suspend fun unCollectUrl(@Query("id") id: Int): ApiResponse - - /** 获取其他作者分享的文章分页列表 */ - @GET("user/{id}/share_articles/{page}/json") - suspend fun getOtherAuthorArticlePageList( - @Path("id") id: Int, - @Path("page") page: Int - ): ApiResponse - - /** 获取热门搜索数据 */ - @GET("hotkey/json") - suspend fun getHotSearchList(): ApiResponse> - - /** 根据关键词搜索数据 */ - @POST("article/query/{pageNo}/json") - suspend fun getSearchDataByKey( - @Path("pageNo") pageNo: Int, - @Query("k") searchKey: String - ): ApiResponse> } \ No newline at end of file From 9e7d02963d6b991dd4b87156f154576094dadf6c Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Tue, 10 May 2022 10:12:22 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E5=8D=87=E7=BA=A7gradle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++++-- app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- lib_base/build.gradle | 1 + lib_base/src/main/AndroidManifest.xml | 3 +-- module_home/build.gradle | 2 ++ module_home/src/main/AndroidManifest.xml | 3 +-- module_home/src/main/alone/AndroidManifest.xml | 11 +++++++---- module_main/build.gradle | 2 ++ module_main/src/main/AndroidManifest.xml | 3 +-- module_main/src/main/alone/AndroidManifest.xml | 3 +-- module_mine/build.gradle | 2 ++ module_mine/src/main/AndroidManifest.xml | 3 +-- module_mine/src/main/alone/AndroidManifest.xml | 3 +-- module_project/build.gradle | 2 ++ module_project/src/main/AndroidManifest.xml | 2 +- module_project/src/main/alone/AndroidManifest.xml | 3 +-- module_square/build.gradle | 2 ++ module_square/src/main/AndroidManifest.xml | 2 +- module_square/src/main/alone/AndroidManifest.xml | 3 +-- module_web/build.gradle | 4 +++- module_web/src/main/AndroidManifest.xml | 3 +-- module_web/src/main/alone/AndroidManifest.xml | 5 ++--- module_wechat/build.gradle | 2 ++ module_wechat/src/main/AndroidManifest.xml | 2 +- module_wechat/src/main/alone/AndroidManifest.xml | 3 +-- 27 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9bbea23..ec91410 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,8 @@ plugins { } android { + namespace 'com.btpj.wanandroid' + compileSdk rootProject.ext.android.compileSdk defaultConfig { @@ -19,9 +21,9 @@ android { // 设置支持的SO库架构，以微信为基准只支持arm64-v8a即可，可以达到缩包的目的 abiFilters 'arm64-v8a'//, 'armeabi'//, 'armeabi-v7a', 'x86', 'x86_64' } + resConfigs 'zh-rCN' // 只保留汉语资源 - resConfigs('zh-rCN') testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -85,7 +87,7 @@ android { dependencies { implementation project(path: ':lib_base') - if(!rootProject.ext.isBuildModule){ + if (!rootProject.ext.isBuildModule) { implementation project(path: ':module_main') implementation project(path: ':module_home') implementation project(path: ':module_project') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 274c368..126a69e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - + diff --git a/module_home/build.gradle b/module_home/build.gradle index 13334c7..f311000 100644 --- a/module_home/build.gradle +++ b/module_home/build.gradle @@ -1,6 +1,8 @@ apply from: "../module.build.gradle" android { + namespace 'com.btpj.module_home' + defaultConfig { if (rootProject.ext.isBuildModule) { applicationId "com.btpj.module_home" diff --git a/module_home/src/main/AndroidManifest.xml b/module_home/src/main/AndroidManifest.xml index cdb2f6a..1615485 100644 --- a/module_home/src/main/AndroidManifest.xml +++ b/module_home/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + xmlns:tools="http://schemas.android.com/tools"> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity" /> \ No newline at end of file diff --git a/module_main/build.gradle b/module_main/build.gradle index 2e65210..44fad0f 100644 --- a/module_main/build.gradle +++ b/module_main/build.gradle @@ -1,6 +1,8 @@ apply from: "../module.build.gradle" android { + namespace 'com.btpj.module_main' + defaultConfig { if (rootProject.ext.isBuildModule) { applicationId "com.btpj.module_main" diff --git a/module_main/src/main/AndroidManifest.xml b/module_main/src/main/AndroidManifest.xml index 481b2d5..b1a0bec 100644 --- a/module_main/src/main/AndroidManifest.xml +++ b/module_main/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> - \ No newline at end of file + \ No newline at end of file diff --git a/module_project/src/main/alone/AndroidManifest.xml b/module_project/src/main/alone/AndroidManifest.xml index cad7a8e..5e4f566 100644 --- a/module_project/src/main/alone/AndroidManifest.xml +++ b/module_project/src/main/alone/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + diff --git a/module_square/src/main/alone/AndroidManifest.xml b/module_square/src/main/alone/AndroidManifest.xml index ca7c69d..148b656 100644 --- a/module_square/src/main/alone/AndroidManifest.xml +++ b/module_square/src/main/alone/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + + xmlns:tools="http://schemas.android.com/tools"> + android:theme="@style/Web.Theme.WanAndroid"> - \ No newline at end of file + \ No newline at end of file diff --git a/module_wechat/src/main/alone/AndroidManifest.xml b/module_wechat/src/main/alone/AndroidManifest.xml index b77843d..b36560b 100644 --- a/module_wechat/src/main/alone/AndroidManifest.xml +++ b/module_wechat/src/main/alone/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Tue, 10 May 2022 15:25:13 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/btpj/module_home/data/local/CacheManager.kt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt b/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt index c072705..c93eee7 100644 --- a/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt +++ b/module_home/src/main/java/com/btpj/module_home/data/local/CacheManager.kt @@ -14,7 +14,6 @@ import com.tencent.mmkv.MMKV object CacheManager { private const val KEY_SEARCH_HISTORY = "search_history" - private const val KEY_FIRST_USE = "first_use" private val mmkv by lazy { MMKV.defaultMMKV() } @@ -31,14 +30,4 @@ object CacheManager { fun saveSearchHistoryData(searchHistoryDeque: ArrayDeque) { mmkv.encode(KEY_SEARCH_HISTORY, searchHistoryDeque.toJson()) } - - /** 存储是否首次使用APP */ - fun saveFirstUse(isFirstUse: Boolean): Boolean { - return mmkv.encode(KEY_FIRST_USE, isFirstUse) - } - - /** 是否首次使用APP */ - fun isFirstUse(): Boolean { - return mmkv.decodeBool(KEY_FIRST_USE, true) - } } \ No newline at end of file From e52e39532f9316c6803ba828ed242c502abc730b Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Wed, 11 May 2022 09:25:06 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E5=B0=86lib=5Fbase=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAlib=5Fcommon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 3 +-- {lib_base => lib_common}/.gitignore | 0 {lib_base => lib_common}/build.gradle | 0 {lib_base => lib_common}/consumer-rules.pro | 0 {lib_base => lib_common}/proguard-rules.pro | 0 .../com/btpj/lib_base/ExampleInstrumentedTest.kt | 0 .../src/main/AndroidManifest.xml | 0 .../com/btpj/lib_base/adapter/ArticleAdapter.kt | 0 .../src/main/java/com/btpj/lib_base/base/App.kt | 0 .../java/com/btpj/lib_base/base/AppViewModel.kt | 0 .../java/com/btpj/lib_base/base/BaseVMBActivity.kt | 0 .../java/com/btpj/lib_base/base/BaseVMBFragment.kt | 0 .../java/com/btpj/lib_base/base/BaseViewModel.kt | 0 .../java/com/btpj/lib_base/data/bean/ApiResponse.kt | 0 .../java/com/btpj/lib_base/data/bean/Article.kt | 0 .../main/java/com/btpj/lib_base/data/bean/Banner.kt | 0 .../java/com/btpj/lib_base/data/bean/Classify.kt | 0 .../java/com/btpj/lib_base/data/bean/CoinInfo.kt | 0 .../com/btpj/lib_base/data/bean/CollectArticle.kt | 0 .../java/com/btpj/lib_base/data/bean/CollectData.kt | 0 .../java/com/btpj/lib_base/data/bean/CollectUrl.kt | 0 .../java/com/btpj/lib_base/data/bean/HotSearch.kt | 0 .../com/btpj/lib_base/data/bean/IntegralRecord.kt | 0 .../java/com/btpj/lib_base/data/bean/MySystem.kt | 0 .../java/com/btpj/lib_base/data/bean/Navigation.kt | 0 .../java/com/btpj/lib_base/data/bean/OtherAuthor.kt | 0 .../com/btpj/lib_base/data/bean/PageResponse.kt | 0 .../com/btpj/lib_base/data/bean/ProjectTitle.kt | 0 .../main/java/com/btpj/lib_base/data/bean/Share.kt | 0 .../main/java/com/btpj/lib_base/data/bean/Tag.kt | 0 .../main/java/com/btpj/lib_base/data/bean/User.kt | 0 .../java/com/btpj/lib_base/data/local/Constants.kt | 0 .../java/com/btpj/lib_base/data/local/IpManager.kt | 0 .../com/btpj/lib_base/data/local/UserManager.kt | 0 .../java/com/btpj/lib_base/ext/BaseViewModelExt.kt | 0 .../java/com/btpj/lib_base/ext/BindingViewExt.kt | 0 .../main/java/com/btpj/lib_base/ext/StringExt.kt | 0 .../src/main/java/com/btpj/lib_base/ext/ViewExt.kt | 0 .../java/com/btpj/lib_base/http/BaseRepository.kt | 0 .../java/com/btpj/lib_base/http/RetrofitManager.kt | 0 .../lib_base/http/interceptor/CacheInterceptor.kt | 0 .../lib_base/http/interceptor/LogInterceptor.kt | 0 .../main/java/com/btpj/lib_base/utils/AppUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/CacheUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/CommonUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/DateUtil.kt | 0 .../java/com/btpj/lib_base/utils/KeyboardUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/LogUtil.kt | 0 .../java/com/btpj/lib_base/utils/NetworkUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/ScreenUtil.kt | 0 .../java/com/btpj/lib_base/utils/StatusBarUtil.kt | 0 .../main/java/com/btpj/lib_base/utils/ToastUtil.kt | 0 .../java/com/btpj/lib_base/widgets/FlowLayout.kt | 0 .../java/com/btpj/lib_base/widgets/TitleLayout.kt | 0 .../res/drawable-xxhdpi/default_project_img.webp | Bin .../src/main/res/drawable-xxhdpi/ic_splash.webp | Bin .../src/main/res/drawable-xxhdpi/ic_splash2.webp | Bin .../src/main/res/drawable-xxhdpi/ic_splash3.webp | Bin .../src/main/res/drawable/bg_circle_red.xml | 0 .../src/main/res/drawable/frame_green.xml | 0 .../src/main/res/drawable/frame_red.xml | 0 .../src/main/res/drawable/ic_add.xml | 0 .../src/main/res/drawable/ic_arrow_right.xml | 0 .../src/main/res/drawable/ic_article.xml | 0 .../src/main/res/drawable/ic_back.xml | 0 .../src/main/res/drawable/ic_clear.xml | 0 .../src/main/res/drawable/ic_collect.xml | 0 .../src/main/res/drawable/ic_default_img.xml | 0 .../src/main/res/drawable/ic_integral_record.xml | 0 .../src/main/res/drawable/ic_integral_rule.xml | 0 .../src/main/res/drawable/ic_list_empty.xml | 0 .../src/main/res/drawable/ic_points.xml | 0 .../src/main/res/drawable/ic_search.xml | 0 .../src/main/res/drawable/ic_settings.xml | 0 .../src/main/res/drawable/ic_tab_home.xml | 0 .../src/main/res/drawable/ic_tab_mine.xml | 0 .../src/main/res/drawable/ic_tab_project.xml | 0 .../src/main/res/drawable/ic_tab_square.xml | 0 .../src/main/res/drawable/ic_tab_wechat.xml | 0 .../src/main/res/drawable/ic_un_collect.xml | 0 .../src/main/res/drawable/ic_user.xml | 0 .../src/main/res/drawable/ic_web.xml | 0 .../src/main/res/drawable/selector_bg_tv.xml | 0 .../main/res/layout/common_fragment_viewpager.xml | 0 .../main/res/layout/common_list_item_article.xml | 0 .../src/main/res/layout/common_list_item_tv.xml | 0 .../src/main/res/layout/dialog_loading.xml | 0 .../src/main/res/layout/include_line.xml | 0 .../layout/include_swiperefresh_recyclerview.xml | 0 .../src/main/res/layout/include_toolbar.xml | 0 .../src/main/res/layout/layout_empty.xml | 0 .../src/main/res/layout/layout_title.xml | 0 .../src/main/res/values-night/themes.xml | 0 .../src/main/res/values/attrs.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/main/res/values/themes.xml | 0 .../test/java/com/btpj/lib_base/ExampleUnitTest.kt | 0 module.build.gradle | 4 ++-- settings.gradle | 2 +- 102 files changed, 4 insertions(+), 5 deletions(-) rename {lib_base => lib_common}/.gitignore (100%) rename {lib_base => lib_common}/build.gradle (100%) rename {lib_base => lib_common}/consumer-rules.pro (100%) rename {lib_base => lib_common}/proguard-rules.pro (100%) rename {lib_base => lib_common}/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt (100%) rename {lib_base => lib_common}/src/main/AndroidManifest.xml (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/base/App.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/base/AppViewModel.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Article.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Banner.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Classify.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Share.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/Tag.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/bean/User.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/local/Constants.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/local/IpManager.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/data/local/UserManager.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/ext/StringExt.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/ext/ViewExt.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/http/BaseRepository.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/AppUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/DateUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/LogUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt (100%) rename {lib_base => lib_common}/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt (100%) rename {lib_base => lib_common}/src/main/res/drawable-xxhdpi/default_project_img.webp (100%) rename {lib_base => lib_common}/src/main/res/drawable-xxhdpi/ic_splash.webp (100%) rename {lib_base => lib_common}/src/main/res/drawable-xxhdpi/ic_splash2.webp (100%) rename {lib_base => lib_common}/src/main/res/drawable-xxhdpi/ic_splash3.webp (100%) rename {lib_base => lib_common}/src/main/res/drawable/bg_circle_red.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/frame_green.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/frame_red.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_add.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_arrow_right.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_article.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_back.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_clear.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_collect.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_default_img.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_integral_record.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_integral_rule.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_list_empty.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_points.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_search.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_settings.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_tab_home.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_tab_mine.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_tab_project.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_tab_square.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_tab_wechat.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_un_collect.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_user.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/ic_web.xml (100%) rename {lib_base => lib_common}/src/main/res/drawable/selector_bg_tv.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/common_fragment_viewpager.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/common_list_item_article.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/common_list_item_tv.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/dialog_loading.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/include_line.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/include_swiperefresh_recyclerview.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/include_toolbar.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/layout_empty.xml (100%) rename {lib_base => lib_common}/src/main/res/layout/layout_title.xml (100%) rename {lib_base => lib_common}/src/main/res/values-night/themes.xml (100%) rename {lib_base => lib_common}/src/main/res/values/attrs.xml (100%) rename {lib_base => lib_common}/src/main/res/values/colors.xml (100%) rename {lib_base => lib_common}/src/main/res/values/dimens.xml (100%) rename {lib_base => lib_common}/src/main/res/values/strings.xml (100%) rename {lib_base => lib_common}/src/main/res/values/styles.xml (100%) rename {lib_base => lib_common}/src/main/res/values/themes.xml (100%) rename {lib_base => lib_common}/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt (100%) diff --git a/app/build.gradle b/app/build.gradle index ec91410..74a9277 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,8 +85,7 @@ android { } dependencies { - implementation project(path: ':lib_base') - + implementation project(path: ':lib_common') if (!rootProject.ext.isBuildModule) { implementation project(path: ':module_main') implementation project(path: ':module_home') diff --git a/lib_base/.gitignore b/lib_common/.gitignore similarity index 100% rename from lib_base/.gitignore rename to lib_common/.gitignore diff --git a/lib_base/build.gradle b/lib_common/build.gradle similarity index 100% rename from lib_base/build.gradle rename to lib_common/build.gradle diff --git a/lib_base/consumer-rules.pro b/lib_common/consumer-rules.pro similarity index 100% rename from lib_base/consumer-rules.pro rename to lib_common/consumer-rules.pro diff --git a/lib_base/proguard-rules.pro b/lib_common/proguard-rules.pro similarity index 100% rename from lib_base/proguard-rules.pro rename to lib_common/proguard-rules.pro diff --git a/lib_base/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt b/lib_common/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt similarity index 100% rename from lib_base/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt rename to lib_common/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt diff --git a/lib_base/src/main/AndroidManifest.xml b/lib_common/src/main/AndroidManifest.xml similarity index 100% rename from lib_base/src/main/AndroidManifest.xml rename to lib_common/src/main/AndroidManifest.xml diff --git a/lib_base/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt b/lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt rename to lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/App.kt b/lib_common/src/main/java/com/btpj/lib_base/base/App.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/base/App.kt rename to lib_common/src/main/java/com/btpj/lib_base/base/App.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/AppViewModel.kt b/lib_common/src/main/java/com/btpj/lib_base/base/AppViewModel.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/base/AppViewModel.kt rename to lib_common/src/main/java/com/btpj/lib_base/base/AppViewModel.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt rename to lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt rename to lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt rename to lib_common/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Article.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Article.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Article.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Article.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Banner.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Banner.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Banner.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Banner.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Classify.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Classify.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Classify.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Classify.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/CoinInfo.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectArticle.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectData.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/CollectUrl.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/HotSearch.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/IntegralRecord.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/MySystem.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Navigation.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/OtherAuthor.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/ProjectTitle.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Share.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Share.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Share.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Share.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/Tag.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/Tag.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/Tag.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/Tag.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/User.kt b/lib_common/src/main/java/com/btpj/lib_base/data/bean/User.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/bean/User.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/bean/User.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt b/lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/local/Constants.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt b/lib_common/src/main/java/com/btpj/lib_base/data/local/IpManager.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/local/IpManager.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/UserManager.kt b/lib_common/src/main/java/com/btpj/lib_base/data/local/UserManager.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/data/local/UserManager.kt rename to lib_common/src/main/java/com/btpj/lib_base/data/local/UserManager.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt rename to lib_common/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt rename to lib_common/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/StringExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/StringExt.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/ext/StringExt.kt rename to lib_common/src/main/java/com/btpj/lib_base/ext/StringExt.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt rename to lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/BaseRepository.kt b/lib_common/src/main/java/com/btpj/lib_base/http/BaseRepository.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/http/BaseRepository.kt rename to lib_common/src/main/java/com/btpj/lib_base/http/BaseRepository.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt b/lib_common/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt rename to lib_common/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt b/lib_common/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt rename to lib_common/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt b/lib_common/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt rename to lib_common/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/AppUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/AppUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/AppUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/AppUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/DateUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/DateUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/DateUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/DateUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/LogUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/LogUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/LogUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/LogUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt b/lib_common/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt rename to lib_common/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt b/lib_common/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt rename to lib_common/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt diff --git a/lib_base/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt b/lib_common/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt similarity index 100% rename from lib_base/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt rename to lib_common/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt diff --git a/lib_base/src/main/res/drawable-xxhdpi/default_project_img.webp b/lib_common/src/main/res/drawable-xxhdpi/default_project_img.webp similarity index 100% rename from lib_base/src/main/res/drawable-xxhdpi/default_project_img.webp rename to lib_common/src/main/res/drawable-xxhdpi/default_project_img.webp diff --git a/lib_base/src/main/res/drawable-xxhdpi/ic_splash.webp b/lib_common/src/main/res/drawable-xxhdpi/ic_splash.webp similarity index 100% rename from lib_base/src/main/res/drawable-xxhdpi/ic_splash.webp rename to lib_common/src/main/res/drawable-xxhdpi/ic_splash.webp diff --git a/lib_base/src/main/res/drawable-xxhdpi/ic_splash2.webp b/lib_common/src/main/res/drawable-xxhdpi/ic_splash2.webp similarity index 100% rename from lib_base/src/main/res/drawable-xxhdpi/ic_splash2.webp rename to lib_common/src/main/res/drawable-xxhdpi/ic_splash2.webp diff --git a/lib_base/src/main/res/drawable-xxhdpi/ic_splash3.webp b/lib_common/src/main/res/drawable-xxhdpi/ic_splash3.webp similarity index 100% rename from lib_base/src/main/res/drawable-xxhdpi/ic_splash3.webp rename to lib_common/src/main/res/drawable-xxhdpi/ic_splash3.webp diff --git a/lib_base/src/main/res/drawable/bg_circle_red.xml b/lib_common/src/main/res/drawable/bg_circle_red.xml similarity index 100% rename from lib_base/src/main/res/drawable/bg_circle_red.xml rename to lib_common/src/main/res/drawable/bg_circle_red.xml diff --git a/lib_base/src/main/res/drawable/frame_green.xml b/lib_common/src/main/res/drawable/frame_green.xml similarity index 100% rename from lib_base/src/main/res/drawable/frame_green.xml rename to lib_common/src/main/res/drawable/frame_green.xml diff --git a/lib_base/src/main/res/drawable/frame_red.xml b/lib_common/src/main/res/drawable/frame_red.xml similarity index 100% rename from lib_base/src/main/res/drawable/frame_red.xml rename to lib_common/src/main/res/drawable/frame_red.xml diff --git a/lib_base/src/main/res/drawable/ic_add.xml b/lib_common/src/main/res/drawable/ic_add.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_add.xml rename to lib_common/src/main/res/drawable/ic_add.xml diff --git a/lib_base/src/main/res/drawable/ic_arrow_right.xml b/lib_common/src/main/res/drawable/ic_arrow_right.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_arrow_right.xml rename to lib_common/src/main/res/drawable/ic_arrow_right.xml diff --git a/lib_base/src/main/res/drawable/ic_article.xml b/lib_common/src/main/res/drawable/ic_article.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_article.xml rename to lib_common/src/main/res/drawable/ic_article.xml diff --git a/lib_base/src/main/res/drawable/ic_back.xml b/lib_common/src/main/res/drawable/ic_back.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_back.xml rename to lib_common/src/main/res/drawable/ic_back.xml diff --git a/lib_base/src/main/res/drawable/ic_clear.xml b/lib_common/src/main/res/drawable/ic_clear.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_clear.xml rename to lib_common/src/main/res/drawable/ic_clear.xml diff --git a/lib_base/src/main/res/drawable/ic_collect.xml b/lib_common/src/main/res/drawable/ic_collect.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_collect.xml rename to lib_common/src/main/res/drawable/ic_collect.xml diff --git a/lib_base/src/main/res/drawable/ic_default_img.xml b/lib_common/src/main/res/drawable/ic_default_img.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_default_img.xml rename to lib_common/src/main/res/drawable/ic_default_img.xml diff --git a/lib_base/src/main/res/drawable/ic_integral_record.xml b/lib_common/src/main/res/drawable/ic_integral_record.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_integral_record.xml rename to lib_common/src/main/res/drawable/ic_integral_record.xml diff --git a/lib_base/src/main/res/drawable/ic_integral_rule.xml b/lib_common/src/main/res/drawable/ic_integral_rule.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_integral_rule.xml rename to lib_common/src/main/res/drawable/ic_integral_rule.xml diff --git a/lib_base/src/main/res/drawable/ic_list_empty.xml b/lib_common/src/main/res/drawable/ic_list_empty.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_list_empty.xml rename to lib_common/src/main/res/drawable/ic_list_empty.xml diff --git a/lib_base/src/main/res/drawable/ic_points.xml b/lib_common/src/main/res/drawable/ic_points.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_points.xml rename to lib_common/src/main/res/drawable/ic_points.xml diff --git a/lib_base/src/main/res/drawable/ic_search.xml b/lib_common/src/main/res/drawable/ic_search.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_search.xml rename to lib_common/src/main/res/drawable/ic_search.xml diff --git a/lib_base/src/main/res/drawable/ic_settings.xml b/lib_common/src/main/res/drawable/ic_settings.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_settings.xml rename to lib_common/src/main/res/drawable/ic_settings.xml diff --git a/lib_base/src/main/res/drawable/ic_tab_home.xml b/lib_common/src/main/res/drawable/ic_tab_home.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_tab_home.xml rename to lib_common/src/main/res/drawable/ic_tab_home.xml diff --git a/lib_base/src/main/res/drawable/ic_tab_mine.xml b/lib_common/src/main/res/drawable/ic_tab_mine.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_tab_mine.xml rename to lib_common/src/main/res/drawable/ic_tab_mine.xml diff --git a/lib_base/src/main/res/drawable/ic_tab_project.xml b/lib_common/src/main/res/drawable/ic_tab_project.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_tab_project.xml rename to lib_common/src/main/res/drawable/ic_tab_project.xml diff --git a/lib_base/src/main/res/drawable/ic_tab_square.xml b/lib_common/src/main/res/drawable/ic_tab_square.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_tab_square.xml rename to lib_common/src/main/res/drawable/ic_tab_square.xml diff --git a/lib_base/src/main/res/drawable/ic_tab_wechat.xml b/lib_common/src/main/res/drawable/ic_tab_wechat.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_tab_wechat.xml rename to lib_common/src/main/res/drawable/ic_tab_wechat.xml diff --git a/lib_base/src/main/res/drawable/ic_un_collect.xml b/lib_common/src/main/res/drawable/ic_un_collect.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_un_collect.xml rename to lib_common/src/main/res/drawable/ic_un_collect.xml diff --git a/lib_base/src/main/res/drawable/ic_user.xml b/lib_common/src/main/res/drawable/ic_user.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_user.xml rename to lib_common/src/main/res/drawable/ic_user.xml diff --git a/lib_base/src/main/res/drawable/ic_web.xml b/lib_common/src/main/res/drawable/ic_web.xml similarity index 100% rename from lib_base/src/main/res/drawable/ic_web.xml rename to lib_common/src/main/res/drawable/ic_web.xml diff --git a/lib_base/src/main/res/drawable/selector_bg_tv.xml b/lib_common/src/main/res/drawable/selector_bg_tv.xml similarity index 100% rename from lib_base/src/main/res/drawable/selector_bg_tv.xml rename to lib_common/src/main/res/drawable/selector_bg_tv.xml diff --git a/lib_base/src/main/res/layout/common_fragment_viewpager.xml b/lib_common/src/main/res/layout/common_fragment_viewpager.xml similarity index 100% rename from lib_base/src/main/res/layout/common_fragment_viewpager.xml rename to lib_common/src/main/res/layout/common_fragment_viewpager.xml diff --git a/lib_base/src/main/res/layout/common_list_item_article.xml b/lib_common/src/main/res/layout/common_list_item_article.xml similarity index 100% rename from lib_base/src/main/res/layout/common_list_item_article.xml rename to lib_common/src/main/res/layout/common_list_item_article.xml diff --git a/lib_base/src/main/res/layout/common_list_item_tv.xml b/lib_common/src/main/res/layout/common_list_item_tv.xml similarity index 100% rename from lib_base/src/main/res/layout/common_list_item_tv.xml rename to lib_common/src/main/res/layout/common_list_item_tv.xml diff --git a/lib_base/src/main/res/layout/dialog_loading.xml b/lib_common/src/main/res/layout/dialog_loading.xml similarity index 100% rename from lib_base/src/main/res/layout/dialog_loading.xml rename to lib_common/src/main/res/layout/dialog_loading.xml diff --git a/lib_base/src/main/res/layout/include_line.xml b/lib_common/src/main/res/layout/include_line.xml similarity index 100% rename from lib_base/src/main/res/layout/include_line.xml rename to lib_common/src/main/res/layout/include_line.xml diff --git a/lib_base/src/main/res/layout/include_swiperefresh_recyclerview.xml b/lib_common/src/main/res/layout/include_swiperefresh_recyclerview.xml similarity index 100% rename from lib_base/src/main/res/layout/include_swiperefresh_recyclerview.xml rename to lib_common/src/main/res/layout/include_swiperefresh_recyclerview.xml diff --git a/lib_base/src/main/res/layout/include_toolbar.xml b/lib_common/src/main/res/layout/include_toolbar.xml similarity index 100% rename from lib_base/src/main/res/layout/include_toolbar.xml rename to lib_common/src/main/res/layout/include_toolbar.xml diff --git a/lib_base/src/main/res/layout/layout_empty.xml b/lib_common/src/main/res/layout/layout_empty.xml similarity index 100% rename from lib_base/src/main/res/layout/layout_empty.xml rename to lib_common/src/main/res/layout/layout_empty.xml diff --git a/lib_base/src/main/res/layout/layout_title.xml b/lib_common/src/main/res/layout/layout_title.xml similarity index 100% rename from lib_base/src/main/res/layout/layout_title.xml rename to lib_common/src/main/res/layout/layout_title.xml diff --git a/lib_base/src/main/res/values-night/themes.xml b/lib_common/src/main/res/values-night/themes.xml similarity index 100% rename from lib_base/src/main/res/values-night/themes.xml rename to lib_common/src/main/res/values-night/themes.xml diff --git a/lib_base/src/main/res/values/attrs.xml b/lib_common/src/main/res/values/attrs.xml similarity index 100% rename from lib_base/src/main/res/values/attrs.xml rename to lib_common/src/main/res/values/attrs.xml diff --git a/lib_base/src/main/res/values/colors.xml b/lib_common/src/main/res/values/colors.xml similarity index 100% rename from lib_base/src/main/res/values/colors.xml rename to lib_common/src/main/res/values/colors.xml diff --git a/lib_base/src/main/res/values/dimens.xml b/lib_common/src/main/res/values/dimens.xml similarity index 100% rename from lib_base/src/main/res/values/dimens.xml rename to lib_common/src/main/res/values/dimens.xml diff --git a/lib_base/src/main/res/values/strings.xml b/lib_common/src/main/res/values/strings.xml similarity index 100% rename from lib_base/src/main/res/values/strings.xml rename to lib_common/src/main/res/values/strings.xml diff --git a/lib_base/src/main/res/values/styles.xml b/lib_common/src/main/res/values/styles.xml similarity index 100% rename from lib_base/src/main/res/values/styles.xml rename to lib_common/src/main/res/values/styles.xml diff --git a/lib_base/src/main/res/values/themes.xml b/lib_common/src/main/res/values/themes.xml similarity index 100% rename from lib_base/src/main/res/values/themes.xml rename to lib_common/src/main/res/values/themes.xml diff --git a/lib_base/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt b/lib_common/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt similarity index 100% rename from lib_base/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt rename to lib_common/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt diff --git a/module.build.gradle b/module.build.gradle index c0262e4..7f647ca 100644 --- a/module.build.gradle +++ b/module.build.gradle @@ -62,8 +62,8 @@ android { } dependencies { - implementation project(path: ':lib_base') + implementation project(path: ':lib_common') - // kapt无法像api那样穿透（从lib_base带过来），所以还需要引用一次 + // kapt无法像api那样穿透（从lib_common带过来），所以不能放在lib_common中，而是放在这里让每个组件都引入一份 kapt rootProject.ext.dependencies.arouter_compiler } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4fdfcc5..6cfbc56 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,7 @@ dependencyResolutionManagement { } rootProject.name = "WanAndroid" include ':app' -include ':lib_base' +include ':lib_common' include ':module_web' include ':module_mine' include ':module_main' From 2a701adf0321ef2bc4295f66c1585846fd3fc4cb Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Wed, 11 May 2022 11:23:01 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0export=E5=8C=85?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=E5=90=84Module=E7=9A=84?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../btpj/lib_base/adapter/ArticleAdapter.kt | 7 +-- .../com/btpj/lib_base/base/BaseVMBActivity.kt | 5 +- .../com/btpj/lib_base/base/BaseVMBFragment.kt | 5 +- .../com/btpj/lib_base/data/local/Constants.kt | 38 ------------ .../com/btpj/lib_base/export/ModuleHomeApi.kt | 34 +++++++++++ .../com/btpj/lib_base/export/ModuleMineApi.kt | 35 +++++++++++ .../btpj/lib_base/export/ModuleProjectApi.kt | 23 ++++++++ .../btpj/lib_base/export/ModuleSquareApi.kt | 23 ++++++++ .../com/btpj/lib_base/export/ModuleWebApi.kt | 58 +++++++++++++++++++ .../btpj/lib_base/export/ModuleWechatApi.kt | 23 ++++++++ .../java/com/btpj/lib_base/ext/ViewExt.kt | 5 +- .../module_home/ui/author/AuthorActivity.kt | 29 +++------- .../btpj/module_home/ui/home/HomeFragment.kt | 10 +--- .../module_home/ui/home/MyBannerAdapter.kt | 7 +-- .../ui/search/result/SearchResultActivity.kt | 7 +-- .../btpj/module_main/ui/main/MainActivity.kt | 28 ++------- .../collect/article/CollectArticleAdapter.kt | 7 +-- .../ui/collect/url/CollectUrlAdapter.kt | 7 +-- .../ui/integral/rank/IntegralRankActivity.kt | 15 ++--- .../module_mine/ui/login/LoginActivity.kt | 4 +- .../btpj/module_mine/ui/mine/MineFragment.kt | 20 +++---- .../module_mine/ui/setting/SettingActivity.kt | 13 ++--- .../ui/share/add/AddArticleActivity.kt | 16 +---- .../ui/share/list/MyArticleActivity.kt | 3 +- .../ui/share/list/MyArticleAdapter.kt | 7 +-- .../ui/project/ImageArticleAdapter.kt | 7 +-- .../ui/project/ProjectChildFragment.kt | 7 +-- .../ui/project/ProjectFragment.kt | 8 +-- .../module_square/ui/square/SquareFragment.kt | 13 ++--- .../ui/square/ask/AskFragment.kt | 9 +-- .../ui/square/square/SquareChildFragment.kt | 9 +-- .../com/btpj/module_web/ui/web/WebActivity.kt | 12 ++-- .../ui/wechat/WechatChildFragment.kt | 9 +-- .../module_wechat/ui/wechat/WechatFragment.kt | 8 +-- 34 files changed, 283 insertions(+), 228 deletions(-) delete mode 100644 lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleProjectApi.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleSquareApi.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleWebApi.kt create mode 100644 lib_common/src/main/java/com/btpj/lib_base/export/ModuleWechatApi.kt diff --git a/lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt b/lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt index 505188f..e95b5dc 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/adapter/ArticleAdapter.kt @@ -1,10 +1,9 @@ package com.btpj.lib_base.adapter -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.R import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.CommonListItemArticleBinding +import com.btpj.lib_base.export.ModuleWebApi import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.module.LoadMoreModule import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder @@ -28,9 +27,7 @@ class ArticleAdapter : executePendingBindings() clItem.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) - .navigation() + ModuleWebApi.navToWebActivity(item) } } } diff --git a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt index 2c63d7b..fbaf839 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt @@ -5,10 +5,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.BR import com.btpj.lib_base.R -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.utils.LogUtil import com.btpj.lib_base.utils.StatusBarUtil @@ -106,7 +105,7 @@ abstract class BaseVMBActivity(private if (it?.errorCode == -1001) { // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 - ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + ModuleMineApi.navigateToLoginActivity() } } } diff --git a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt index 456ae41..2f93a90 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt @@ -9,10 +9,9 @@ import androidx.databinding.ViewDataBinding import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.BR import com.btpj.lib_base.R -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.utils.LogUtil import com.btpj.lib_base.utils.ToastUtil @@ -117,7 +116,7 @@ abstract class BaseVMBFragment(private if (it?.errorCode == -1001) { // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 - ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + ModuleMineApi.navigateToLoginActivity() } } } diff --git a/lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt b/lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt deleted file mode 100644 index fc17c5b..0000000 --- a/lib_common/src/main/java/com/btpj/lib_base/data/local/Constants.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.btpj.lib_base.data.local - -/** - * @author LTP 2022/5/6 - */ -object Constants { - - //------- ARouter相关启动变量 start -------------- - // main Module - - // home module - const val ROUTER_HOME_HOME_FRAGMENT = "/home/HomeFragment" - const val ROUTER_HOME_AUTHOR_ACTIVITY = "/home/AuthorActivity" - const val ROUTER_HOME_EXTRA_AUTHOR_ID = "extra_author_id" - - // project Module - const val ROUTER_PROJECT_PROJECT_FRAGMENT = "/project/ProjectFragment" - - // square Module - const val ROUTER_SQUARE_SQUARE_FRAGMENT = "/square/SquareFragment" - - // wechat Module - const val ROUTER_WECHAT_WECHAT_FRAGMENT = "/wechat/WechatFragment" - - // mine Module - const val ROUTER_MINE_LOGIN_ACTIVITY = "/mine/LoginActivity" - const val ROUTER_MINE_MINE_FRAGMENT = "/mine/MineFragment" - const val ROUTER_MINE_ADD_ARTICLE_ACTIVITY = "/mine/AddArticleActivity" - - // Web Module - const val ROUTER_WEB_WEB_ACTIVITY = "/web/WebActivity" - const val ROUTER_WEB_EXTRA_BANNER = "extra_banner" - const val ROUTER_WEB_EXTRA_ARTICLE = "extra_article" - const val ROUTER_WEB_EXTRA_COLLECT_ARTICLE = "extra_collect_article" - const val ROUTER_WEB_EXTRA_COLLECT_URL = "extra_collect_url" - - //------- ARouter相关启动变量 end -------------- -} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt new file mode 100644 index 0000000..e1cf8b8 --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt @@ -0,0 +1,34 @@ +package com.btpj.lib_base.export + +import androidx.fragment.app.Fragment +import com.alibaba.android.arouter.launcher.ARouter + +/** + * module_home模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleHomeApi { + + const val ROUTER_HOME_HOME_FRAGMENT = "/home/HomeFragment" + const val ROUTER_HOME_AUTHOR_ACTIVITY = "/home/AuthorActivity" + const val ROUTER_HOME_EXTRA_AUTHOR_ID = "extra_author_id" + + /** + * 获取HomeFragment实例 + * @return HomeFragment实例 + */ + fun getHomeFragment(): Fragment { + return ARouter.getInstance().build(ROUTER_HOME_HOME_FRAGMENT).navigation() as Fragment + } + + /** + * 跳转到作者文章列表页面 + * @param authorId 作者Id + */ + fun navigateToAuthorActivity(authorId: Int) { + ARouter.getInstance().build(ROUTER_HOME_AUTHOR_ACTIVITY) + .withInt(ROUTER_HOME_EXTRA_AUTHOR_ID, authorId).navigation() + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt new file mode 100644 index 0000000..ff6c73f --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt @@ -0,0 +1,35 @@ +package com.btpj.lib_base.export + +import androidx.fragment.app.Fragment +import com.alibaba.android.arouter.launcher.ARouter + +/** + * module_mine模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleMineApi { + + const val ROUTER_MINE_MINE_FRAGMENT = "/mine/MineFragment" + const val ROUTER_MINE_LOGIN_ACTIVITY = "/mine/LoginActivity" + const val ROUTER_MINE_ADD_ARTICLE_ACTIVITY = "/mine/AddArticleActivity" + + /** + * 获取HomeFragment实例 + * @return HomeFragment实例 + */ + fun getMineFragment(): Fragment { + return ARouter.getInstance().build(ROUTER_MINE_MINE_FRAGMENT).navigation() as Fragment + } + + /** 跳转到登录页面 */ + fun navigateToLoginActivity() { + ARouter.getInstance().build(ROUTER_MINE_LOGIN_ACTIVITY).navigation() + } + + /** 跳转到添加文章页面 */ + fun navigateToAddArticleActivity() { + ARouter.getInstance().build(ROUTER_MINE_ADD_ARTICLE_ACTIVITY).navigation() + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleProjectApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleProjectApi.kt new file mode 100644 index 0000000..b536fd5 --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleProjectApi.kt @@ -0,0 +1,23 @@ +package com.btpj.lib_base.export + +import androidx.fragment.app.Fragment +import com.alibaba.android.arouter.launcher.ARouter + +/** + * module_project模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleProjectApi { + + const val ROUTER_PROJECT_PROJECT_FRAGMENT = "/project/ProjectFragment" + + /** + * 获取HomeFragment实例 + * @return HomeFragment实例 + */ + fun getProjectFragment(): Fragment { + return ARouter.getInstance().build(ROUTER_PROJECT_PROJECT_FRAGMENT).navigation() as Fragment + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleSquareApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleSquareApi.kt new file mode 100644 index 0000000..5d61bd7 --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleSquareApi.kt @@ -0,0 +1,23 @@ +package com.btpj.lib_base.export + +import androidx.fragment.app.Fragment +import com.alibaba.android.arouter.launcher.ARouter + +/** + * module_square模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleSquareApi { + + const val ROUTER_SQUARE_SQUARE_FRAGMENT = "/square/SquareFragment" + + /** + * 获取HomeFragment实例 + * @return HomeFragment实例 + */ + fun getSquareFragment(): Fragment { + return ARouter.getInstance().build(ROUTER_SQUARE_SQUARE_FRAGMENT).navigation() as Fragment + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWebApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWebApi.kt new file mode 100644 index 0000000..318ada2 --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWebApi.kt @@ -0,0 +1,58 @@ +package com.btpj.lib_base.export + +import com.alibaba.android.arouter.launcher.ARouter +import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.data.bean.Banner +import com.btpj.lib_base.data.bean.CollectArticle +import com.btpj.lib_base.data.bean.CollectUrl + +/** + * module_web模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleWebApi { + + const val ROUTER_WEB_WEB_ACTIVITY = "/web/WebActivity" + const val ROUTER_WEB_EXTRA_BANNER = "extra_banner" + const val ROUTER_WEB_EXTRA_ARTICLE = "extra_article" + const val ROUTER_WEB_EXTRA_COLLECT_ARTICLE = "extra_collect_article" + const val ROUTER_WEB_EXTRA_COLLECT_URL = "extra_collect_url" + + /** + * 跳转到web页面 + * @param banner Banner实体 + */ + fun navToWebActivity(banner: Banner) { + ARouter.getInstance().build(ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(ROUTER_WEB_EXTRA_BANNER, banner).navigation() + } + + /** + * 跳转到web页面 + * @param article Article实体 + */ + fun navToWebActivity(article: Article) { + ARouter.getInstance().build(ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(ROUTER_WEB_EXTRA_ARTICLE, article).navigation() + } + + /** + * 跳转到web页面 + * @param collectArticle CollectArticle实体 + */ + fun navToWebActivity(collectArticle: CollectArticle) { + ARouter.getInstance().build(ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(ROUTER_WEB_EXTRA_COLLECT_ARTICLE, collectArticle).navigation() + } + + /** + * 跳转到web页面 + * @param collectUrl CollectUrl实体 + */ + fun navToWebActivity(collectUrl: CollectUrl) { + ARouter.getInstance().build(ROUTER_WEB_WEB_ACTIVITY) + .withParcelable(ROUTER_WEB_EXTRA_COLLECT_URL, collectUrl).navigation() + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWechatApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWechatApi.kt new file mode 100644 index 0000000..9bbe276 --- /dev/null +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleWechatApi.kt @@ -0,0 +1,23 @@ +package com.btpj.lib_base.export + +import androidx.fragment.app.Fragment +import com.alibaba.android.arouter.launcher.ARouter + +/** + * module_wechat模块对外提供的接口管理类 + * 包括：页面跳转、获取实例等 + * + * @author LTP 2022/5/11 + */ +object ModuleWechatApi { + + const val ROUTER_WECHAT_WECHAT_FRAGMENT = "/wechat/WechatFragment" + + /** + * 获取HomeFragment实例 + * @return HomeFragment实例 + */ + fun getWechatFragment(): Fragment { + return ARouter.getInstance().build(ROUTER_WECHAT_WECHAT_FRAGMENT).navigation() as Fragment + } +} \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt index a0785fc..67a1b9a 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt @@ -17,10 +17,9 @@ import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.customview.customView import com.afollestad.materialdialogs.customview.getCustomView import com.afollestad.materialdialogs.lifecycle.lifecycleOwner -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.R -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.data.local.UserManager +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.utils.ScreenUtil import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.CircleCrop @@ -42,7 +41,7 @@ fun Context.launchCheckLogin(action: (context: Context) -> Unit) { if (UserManager.isLogin()) { action.invoke(this) } else { - ARouter.getInstance().build(Constants.ROUTER_MINE_LOGIN_ACTIVITY).navigation() + ModuleMineApi.navigateToLoginActivity() } } diff --git a/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt index 396d38e..e1c8c49 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/author/AuthorActivity.kt @@ -1,11 +1,11 @@ package com.btpj.module_home.ui.author import android.annotation.SuppressLint -import android.content.Context -import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager +import com.alibaba.android.arouter.facade.annotation.Autowired import com.alibaba.android.arouter.facade.annotation.Route +import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity @@ -13,7 +13,7 @@ import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.adapter.ArticleAdapter -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initColors import com.btpj.module_home.R @@ -24,34 +24,21 @@ import com.btpj.module_home.databinding.HomeActivityAuthorBinding * * @author LTP 2022/4/18 */ -@Route(path = Constants.ROUTER_HOME_AUTHOR_ACTIVITY) +@Route(path = ModuleHomeApi.ROUTER_HOME_AUTHOR_ACTIVITY) class AuthorActivity : BaseVMBActivity(R.layout.home_activity_author) { /** 作者Id */ - private var mAuthorId = 0 + @Autowired(name = ModuleHomeApi.ROUTER_HOME_EXTRA_AUTHOR_ID) + @JvmField + var mAuthorId = 0 /** 页数 */ private var mPageNo: Int = 0 private val mAdapter by lazy { ArticleAdapter() } - companion object { - private const val EXTRA_AUTHOR_ID: String = "authorId" - - /** - * 页面启动 - * @param context Context - * @param authorId 作者Id - */ - fun launch(context: Context, authorId: Int) { - context.startActivity(Intent(context, AuthorActivity::class.java).apply { - putExtra(EXTRA_AUTHOR_ID, authorId) - }) - } - } - override fun initView(savedInstanceState: Bundle?) { - mAuthorId = intent.getIntExtra(EXTRA_AUTHOR_ID, 0) + ARouter.getInstance().inject(this) mBinding.apply { toolbar.initClose { onBackPressed() } diff --git a/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt index d411bb9..a1cf344 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt @@ -12,12 +12,11 @@ import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.Banner import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.initColors import com.btpj.module_home.R import com.btpj.module_home.databinding.HomeFragmentHomeBinding import com.btpj.module_home.databinding.HomeHeaderBannerBinding -import com.btpj.module_home.ui.author.AuthorActivity import com.btpj.module_home.ui.home.HomeViewModel.Companion.PAGE_SIZE import com.btpj.module_home.ui.search.SearchActivity import com.youth.banner.indicator.CircleIndicator @@ -27,7 +26,7 @@ import com.youth.banner.indicator.CircleIndicator * * @author LTP 2022/3/10 */ -@Route(path = Constants.ROUTER_HOME_HOME_FRAGMENT) +@Route(path = ModuleHomeApi.ROUTER_HOME_HOME_FRAGMENT) class HomeFragment : BaseVMBFragment(R.layout.home_fragment_home) { @@ -79,10 +78,7 @@ class HomeFragment : when (view.id) { // 查看作者文章列表 com.btpj.lib_base.R.id.tv_author -> - AuthorActivity.launch( - requireContext(), - mAdapter.getItem(position).userId - ) + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt index fe4f590..57bd74b 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/MyBannerAdapter.kt @@ -3,9 +3,8 @@ package com.btpj.module_home.ui.home import android.view.ViewGroup import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.Banner -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.lib_base.ext.load import com.youth.banner.adapter.BannerAdapter @@ -32,9 +31,7 @@ class MyBannerAdapter(dataList: ArrayList) : holder.imageView.apply { load(data.imagePath) setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_BANNER, data) - .navigation() + ModuleWebApi.navToWebActivity(data) } } } diff --git a/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt index f1edb1c..174a3cf 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt @@ -12,8 +12,8 @@ import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.ext.getEmptyView import com.btpj.module_home.R -import com.btpj.module_home.ui.author.AuthorActivity import com.btpj.lib_base.adapter.ArticleAdapter +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.initColors import com.btpj.module_home.databinding.HomeActivitySearchResultBinding @@ -65,10 +65,7 @@ class SearchResultActivity : when (view.id) { // 查看作者文章列表 com.btpj.lib_base.R.id.tv_author -> - AuthorActivity.launch( - this@SearchResultActivity, - mAdapter.getItem(position).userId - ) + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt b/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt index 3d7dde3..cbe5f19 100644 --- a/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt +++ b/module_main/src/main/java/com/btpj/module_main/ui/main/MainActivity.kt @@ -4,9 +4,8 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.BaseVMBActivity -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.* import com.btpj.lib_base.ext.clearLongClickToast import com.btpj.lib_base.utils.ToastUtil import com.btpj.module_main.R @@ -30,26 +29,11 @@ class MainActivity : } } - private val mHomeFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_HOME_HOME_FRAGMENT) - .navigation() as Fragment - } - private val mProjectFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_PROJECT_PROJECT_FRAGMENT) - .navigation() as Fragment - } - private val mSquareFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_SQUARE_SQUARE_FRAGMENT) - .navigation() as Fragment - } - private val mWechatFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_WECHAT_WECHAT_FRAGMENT) - .navigation() as Fragment - } - private val mMineFragment by lazy { - ARouter.getInstance().build(Constants.ROUTER_MINE_MINE_FRAGMENT) - .navigation() as Fragment - } + private val mHomeFragment by lazy { ModuleHomeApi.getHomeFragment() } + private val mProjectFragment by lazy { ModuleProjectApi.getProjectFragment() } + private val mSquareFragment by lazy { ModuleSquareApi.getSquareFragment() } + private val mWechatFragment by lazy { ModuleWechatApi.getWechatFragment() } + private val mMineFragment by lazy { ModuleMineApi.getMineFragment() } /** 当前显示的Fragment(默认开始为首页) */ private var mCurrentFragment: Fragment = mHomeFragment diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt index 5773015..6206172 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/article/CollectArticleAdapter.kt @@ -1,8 +1,7 @@ package com.btpj.module_mine.ui.collect.article -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.CollectArticle -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineListItemCollectArticleBinding import com.chad.library.adapter.base.BaseQuickAdapter @@ -33,9 +32,7 @@ class CollectArticleAdapter : executePendingBindings() clItem.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_COLLECT_ARTICLE, item) - .navigation() + ModuleWebApi.navToWebActivity(item) } } } diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt index 784131e..d33a17f 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/collect/url/CollectUrlAdapter.kt @@ -1,8 +1,7 @@ package com.btpj.module_mine.ui.collect.url -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.CollectUrl -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineListItemCollectUrlBinding import com.chad.library.adapter.base.BaseQuickAdapter @@ -29,9 +28,7 @@ class CollectUrlAdapter : executePendingBindings() clItem.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_COLLECT_URL, item) - .navigation() + ModuleWebApi.navToWebActivity(item) } } } diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt index 2165452..27826bd 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/integral/rank/IntegralRankActivity.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.Intent import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.ext.getEmptyView @@ -12,8 +11,8 @@ import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.ext.initTitle import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.data.bean.Banner -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.data.bean.CoinInfo +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.module_mine.ui.integral.record.IntegralRecordActivity import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineActivityIntegralRankBinding @@ -53,14 +52,12 @@ class IntegralRankActivity : when (it.itemId) { R.id.item_integralRule -> // 积分规则 - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable( - Constants.ROUTER_WEB_EXTRA_BANNER, Banner( - title = "积分规则", - url = "https://www.wanandroid.com/blog/show/2653" - ) + ModuleWebApi.navToWebActivity( + Banner( + title = "积分规则", + url = "https://www.wanandroid.com/blog/show/2653" ) - .navigation() + ) R.id.item_integralRecord -> // 积分记录 diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt index ac198b8..9f695df 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt @@ -7,7 +7,7 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.lifecycle.lifecycleScope import com.alibaba.android.arouter.facade.annotation.Route import com.btpj.lib_base.base.BaseVMBActivity -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.ext.showLoading import com.btpj.module_mine.ui.ip.ChangeIpActivity @@ -22,7 +22,7 @@ import kotlinx.coroutines.launch * * @author LTP 2022/4/8 */ -@Route(path = Constants.ROUTER_MINE_LOGIN_ACTIVITY) +@Route(path = ModuleMineApi.ROUTER_MINE_LOGIN_ACTIVITY) class LoginActivity : BaseVMBActivity(R.layout.mine_activity_login) { diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt index e6c1c50..b5abf40 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt @@ -2,12 +2,12 @@ package com.btpj.module_mine.ui.mine import android.annotation.SuppressLint import com.alibaba.android.arouter.facade.annotation.Route -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Banner -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.data.local.UserManager +import com.btpj.lib_base.export.ModuleMineApi +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.ext.launchCheckLogin import com.btpj.module_mine.R @@ -23,14 +23,10 @@ import com.btpj.module_mine.ui.share.list.MyArticleActivity * * @author LTP 2022/3/10 */ -@Route(path = Constants.ROUTER_MINE_MINE_FRAGMENT) +@Route(path = ModuleMineApi.ROUTER_MINE_MINE_FRAGMENT) class MineFragment : BaseVMBFragment(R.layout.mine_fragment_mine) { - companion object { - fun newInstance() = MineFragment() - } - override fun initView() { mBinding.apply { swipeRefreshLayout.apply { @@ -61,12 +57,12 @@ class MineFragment : // 开源网站 tvWeb.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable( - Constants.ROUTER_WEB_EXTRA_BANNER, - Banner(title = "玩Android网站", url = "https://www.wanandroid.com/") + ModuleWebApi.navToWebActivity( + Banner( + title = "玩Android网站", + url = "https://www.wanandroid.com/" ) - .navigation() + ) } // 设置 diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt index 1120f3a..03940ec 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/setting/SettingActivity.kt @@ -3,15 +3,14 @@ package com.btpj.module_mine.ui.setting import android.content.Context import android.content.Intent import android.os.Bundle -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.http.RetrofitManager import com.btpj.lib_base.utils.AppUtil import com.btpj.lib_base.utils.CacheUtil import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Banner -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.data.local.UserManager +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.lib_base.ext.showDialog import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineActivitySettingBinding @@ -58,12 +57,12 @@ class SettingActivity : // 项目源码 tvSourceCode.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable( - Constants.ROUTER_WEB_EXTRA_BANNER, - Banner(title = "项目源码", url = "https://gitee.com/BTPJ_git/WanAndroid") + ModuleWebApi.navToWebActivity( + Banner( + title = "项目源码", + url = "https://gitee.com/BTPJ_git/WanAndroid" ) - .navigation() + ) } // 退出登录 diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt index 5c26428..da53db0 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/add/AddArticleActivity.kt @@ -1,16 +1,16 @@ package com.btpj.module_mine.ui.share.add -import android.content.Context -import android.content.Intent import android.os.Bundle import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.bottomsheets.BottomSheet import com.afollestad.materialdialogs.customview.customView import com.afollestad.materialdialogs.lifecycle.lifecycleOwner +import com.alibaba.android.arouter.facade.annotation.Route import com.btpj.lib_base.ext.hideLoading import com.btpj.lib_base.utils.ToastUtil import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.showLoading import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineActivityAddArticleBinding @@ -20,20 +20,10 @@ import com.btpj.module_mine.databinding.MineActivityAddArticleBinding * * @author LTP 2022/4/12 */ +@Route(path = ModuleMineApi.ROUTER_MINE_ADD_ARTICLE_ACTIVITY) class AddArticleActivity : BaseVMBActivity(R.layout.mine_activity_add_article) { - companion object { - - /** - * 页面启动 - * @param context Context - */ - fun launch(context: Context) { - context.startActivity(Intent(context, AddArticleActivity::class.java)) - } - } - override fun initView(savedInstanceState: Bundle?) { mBinding.apply { titleLayout.setRightView(com.btpj.lib_base.R.drawable.ic_integral_rule) { diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt index 0c119f6..df693fd 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt @@ -11,6 +11,7 @@ import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Article +import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.showDialog import com.btpj.module_mine.ui.share.add.AddArticleActivity import com.btpj.module_mine.R @@ -43,7 +44,7 @@ class MyArticleActivity : override fun initView(savedInstanceState: Bundle?) { mBinding.apply { titleLayout.setTitleText("我分享的文章") - .setRightView(com.btpj.lib_base.R.drawable.ic_add) { AddArticleActivity.launch(this@MyArticleActivity) } + .setRightView(com.btpj.lib_base.R.drawable.ic_add) { ModuleMineApi.navigateToAddArticleActivity() } includeList.apply { recyclerView.apply { diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt index 429bcbf..fbf84a7 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleAdapter.kt @@ -1,9 +1,8 @@ package com.btpj.module_mine.ui.share.list import android.annotation.SuppressLint -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineListItemShareArticleBinding import com.chad.library.adapter.base.BaseQuickAdapter @@ -34,9 +33,7 @@ class MyArticleAdapter : executePendingBindings() clItem.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) - .navigation() + ModuleWebApi.navToWebActivity(item) } } } diff --git a/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt index 4a2583a..f89fbfc 100644 --- a/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ImageArticleAdapter.kt @@ -1,8 +1,7 @@ package com.btpj.module_project.ui.project -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.data.bean.Article -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.module_project.R import com.btpj.module_project.databinding.ProjectListItemArticleImageBinding import com.chad.library.adapter.base.BaseQuickAdapter @@ -31,9 +30,7 @@ class ImageArticleAdapter : executePendingBindings() clItem.setOnClickListener { - ARouter.getInstance().build(Constants.ROUTER_WEB_WEB_ACTIVITY) - .withParcelable(Constants.ROUTER_WEB_EXTRA_ARTICLE, item) - .navigation() + ModuleWebApi.navToWebActivity(item) } } } diff --git a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt index b736759..f0efcc4 100644 --- a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt @@ -12,6 +12,7 @@ import com.btpj.lib_base.data.bean.CollectData import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding import com.btpj.lib_base.ext.initColors import com.btpj.lib_base.R +import com.btpj.lib_base.export.ModuleHomeApi /** * 项目Tab下的子Fragment @@ -61,10 +62,8 @@ class ProjectChildFragment : setOnItemChildClickListener { _, view, position -> when (view.id) { // 查看作者文章列表 -// R.id.tv_author -> AuthorActivity.launch( -// requireContext(), -// mAdapter.getItem(position).userId -// ) + R.id.tv_author -> + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) R.id.iv_collect -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { diff --git a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt index 0add5e7..242719a 100644 --- a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectFragment.kt @@ -9,7 +9,7 @@ import com.btpj.lib_base.data.bean.ProjectTitle import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding import com.btpj.lib_base.ext.toHtml import com.btpj.lib_base.R -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleProjectApi import com.google.android.material.tabs.TabLayoutMediator /** @@ -17,7 +17,7 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ -@Route(path = Constants.ROUTER_PROJECT_PROJECT_FRAGMENT) +@Route(path = ModuleProjectApi.ROUTER_PROJECT_PROJECT_FRAGMENT) class ProjectFragment : BaseVMBFragment(R.layout.common_fragment_viewpager) { @@ -29,10 +29,6 @@ class ProjectFragment : private lateinit var mFragmentStateAdapter: FragmentStateAdapter - companion object { - fun newInstance() = ProjectFragment() - } - override fun initView() { mFragmentStateAdapter = object : FragmentStateAdapter(parentFragmentManager, lifecycle) { override fun getItemCount(): Int { diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt index ca989b7..62d5a45 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt @@ -5,12 +5,12 @@ import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 import com.alibaba.android.arouter.facade.annotation.Route -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding import com.btpj.lib_base.utils.ScreenUtil import com.btpj.lib_base.R -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleMineApi +import com.btpj.lib_base.export.ModuleSquareApi import com.btpj.lib_base.ext.launchCheckLogin import com.btpj.module_square.ui.square.ask.AskFragment import com.btpj.module_square.ui.square.navigation.NavigationFragment @@ -23,7 +23,7 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ -@Route(path = Constants.ROUTER_SQUARE_SQUARE_FRAGMENT) +@Route(path = ModuleSquareApi.ROUTER_SQUARE_SQUARE_FRAGMENT) class SquareFragment : BaseVMBFragment(R.layout.common_fragment_viewpager) { @@ -40,8 +40,7 @@ class SquareFragment : if (position == 0) { mBinding.titleLayout.setRightView(R.drawable.ic_add) { requireContext().launchCheckLogin { - ARouter.getInstance().build(Constants.ROUTER_MINE_ADD_ARTICLE_ACTIVITY) - .navigation() + ModuleMineApi.navigateToAddArticleActivity() } } } else { @@ -57,10 +56,6 @@ class SquareFragment : mFragmentList.add(NavigationFragment.newInstance()) } - companion object { - fun newInstance() = SquareFragment() - } - override fun initView() { mFragmentStateAdapter = object : FragmentStateAdapter(parentFragmentManager, lifecycle) { override fun getItemCount(): Int { diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt index 087429b..d4204e4 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt @@ -2,7 +2,6 @@ package com.btpj.module_square.ui.square.ask import android.annotation.SuppressLint import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.R @@ -10,8 +9,8 @@ import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors @@ -51,11 +50,7 @@ class AskFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) - .withInt( - Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, - mAdapter.getItem(position).userId - ).navigation() + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt index b0e517c..c4d244b 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt @@ -2,7 +2,6 @@ package com.btpj.module_square.ui.square.square import android.annotation.SuppressLint import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.R @@ -10,8 +9,8 @@ import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors @@ -45,11 +44,7 @@ class SquareChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) - .withInt( - Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, - mAdapter.getItem(position).userId - ).navigation() + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt index 81f23a3..fb68087 100644 --- a/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt +++ b/module_web/src/main/java/com/btpj/module_web/ui/web/WebActivity.kt @@ -14,7 +14,7 @@ import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.* -import com.btpj.lib_base.data.local.Constants +import com.btpj.lib_base.export.ModuleWebApi import com.btpj.lib_base.ext.initClose import com.btpj.lib_base.ext.initTitle import com.btpj.module_web.R @@ -27,25 +27,25 @@ import com.just.agentweb.WebChromeClient * * @author LTP 2022/4/2 */ -@Route(path = Constants.ROUTER_WEB_WEB_ACTIVITY) +@Route(path = ModuleWebApi.ROUTER_WEB_WEB_ACTIVITY) class WebActivity : BaseVMBActivity(R.layout.web_activity_web) { private lateinit var mAgentWeb: AgentWeb - @Autowired(name = Constants.ROUTER_WEB_EXTRA_ARTICLE) + @Autowired(name = ModuleWebApi.ROUTER_WEB_EXTRA_ARTICLE) @JvmField var mArticle: Article? = null - @Autowired(name = Constants.ROUTER_WEB_EXTRA_COLLECT_ARTICLE) + @Autowired(name = ModuleWebApi.ROUTER_WEB_EXTRA_COLLECT_ARTICLE) @JvmField var mCollectArticle: CollectArticle? = null - @Autowired(name = Constants.ROUTER_WEB_EXTRA_COLLECT_URL) + @Autowired(name = ModuleWebApi.ROUTER_WEB_EXTRA_COLLECT_URL) @JvmField var mCollectUrl: CollectUrl? = null - @Autowired(name = Constants.ROUTER_WEB_EXTRA_BANNER) + @Autowired(name = ModuleWebApi.ROUTER_WEB_EXTRA_BANNER) @JvmField var mBanner: Banner? = null diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt index f509d78..6107f82 100644 --- a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt @@ -3,7 +3,6 @@ package com.btpj.module_wechat.ui.wechat import android.annotation.SuppressLint import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.launcher.ARouter import com.btpj.lib_base.adapter.ArticleAdapter import com.btpj.lib_base.data.bean.PageResponse import com.btpj.lib_base.R @@ -11,8 +10,8 @@ import com.btpj.lib_base.base.App import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.data.bean.CollectData -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.IncludeSwiperefreshRecyclerviewBinding +import com.btpj.lib_base.export.ModuleHomeApi import com.btpj.lib_base.ext.getEmptyView import com.btpj.lib_base.ext.initColors @@ -62,11 +61,7 @@ class WechatChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ARouter.getInstance().build(Constants.ROUTER_HOME_AUTHOR_ACTIVITY) - .withInt( - Constants.ROUTER_HOME_EXTRA_AUTHOR_ID, - mAdapter.getItem(position).userId - ).navigation() + ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt index bf1ba80..f4a97fe 100644 --- a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatFragment.kt @@ -7,8 +7,8 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.btpj.lib_base.base.BaseVMBFragment import com.btpj.lib_base.R import com.btpj.lib_base.data.bean.Classify -import com.btpj.lib_base.data.local.Constants import com.btpj.lib_base.databinding.CommonFragmentViewpagerBinding +import com.btpj.lib_base.export.ModuleWechatApi import com.google.android.material.tabs.TabLayoutMediator /** @@ -16,7 +16,7 @@ import com.google.android.material.tabs.TabLayoutMediator * * @author LTP 2022/3/10 */ -@Route(path = Constants.ROUTER_WECHAT_WECHAT_FRAGMENT) +@Route(path = ModuleWechatApi.ROUTER_WECHAT_WECHAT_FRAGMENT) class WechatFragment : BaseVMBFragment(R.layout.common_fragment_viewpager) { @@ -27,10 +27,6 @@ class WechatFragment : private lateinit var mFragmentStateAdapter: FragmentStateAdapter - companion object { - fun newInstance() = WechatFragment() - } - override fun initView() { mFragmentStateAdapter = object : FragmentStateAdapter(parentFragmentManager, lifecycle) { override fun getItemCount(): Int { From ca092cf1415505c7ca13a5f65a3a92ad6c6b0baf Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Wed, 11 May 2022 13:27:04 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8F=AF=E8=BF=90=E8=A1=8C=E5=8C=85=E8=A3=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../com/btpj/lib_base/base/BaseVMBActivity.kt | 2 +- .../com/btpj/lib_base/base/BaseVMBFragment.kt | 2 +- .../com/btpj/lib_base/export/ModuleHomeApi.kt | 2 +- .../com/btpj/lib_base/export/ModuleMineApi.kt | 4 +-- .../java/com/btpj/lib_base/ext/ViewExt.kt | 2 +- .../src/main/res/layout/common_container.xml | 13 ++++++++++ .../src/main/alone/AndroidManifest.xml | 21 ++++++++-------- .../module_home/ui/alone/AloneActivity.kt | 25 +++++++++++++++++++ .../module_home/ui/alone/AloneViewModel.kt | 10 ++++++++ .../btpj/module_home/ui/home/HomeFragment.kt | 2 +- .../ui/search/result/SearchResultActivity.kt | 2 +- .../src/main/alone/AndroidManifest.xml | 1 + .../src/main/alone/AndroidManifest.xml | 8 +++++- .../module_mine/ui/alone/AloneActivity.kt | 24 ++++++++++++++++++ .../module_mine/ui/alone/AloneViewModel.kt | 10 ++++++++ .../module_mine/ui/login/LoginActivity.kt | 11 -------- .../btpj/module_mine/ui/mine/MineFragment.kt | 3 +-- .../ui/share/list/MyArticleActivity.kt | 3 +-- .../src/main/alone/AndroidManifest.xml | 15 ++++++++++- .../module_project/ui/alone/AloneActivity.kt | 25 +++++++++++++++++++ .../module_project/ui/alone/AloneViewModel.kt | 10 ++++++++ .../ui/project/ProjectChildFragment.kt | 2 +- .../src/main/alone/AndroidManifest.xml | 14 ++++++++++- .../module_square/ui/alone/AloneActivity.kt | 25 +++++++++++++++++++ .../module_square/ui/alone/AloneViewModel.kt | 10 ++++++++ .../module_square/ui/square/SquareFragment.kt | 2 +- .../ui/square/ask/AskFragment.kt | 2 +- .../ui/square/square/SquareChildFragment.kt | 2 +- module_web/src/main/alone/AndroidManifest.xml | 1 + .../src/main/alone/AndroidManifest.xml | 15 ++++++++++- .../module_wechat/ui/alone/AloneActivity.kt | 25 +++++++++++++++++++ .../module_wechat/ui/alone/AloneViewModel.kt | 10 ++++++++ .../ui/wechat/WechatChildFragment.kt | 2 +- 34 files changed, 264 insertions(+), 43 deletions(-) create mode 100644 lib_common/src/main/res/layout/common_container.xml create mode 100644 module_home/src/main/java/com/btpj/module_home/ui/alone/AloneActivity.kt create mode 100644 module_home/src/main/java/com/btpj/module_home/ui/alone/AloneViewModel.kt create mode 100644 module_mine/src/main/java/com/btpj/module_mine/ui/alone/AloneActivity.kt create mode 100644 module_mine/src/main/java/com/btpj/module_mine/ui/alone/AloneViewModel.kt create mode 100644 module_project/src/main/java/com/btpj/module_project/ui/alone/AloneActivity.kt create mode 100644 module_project/src/main/java/com/btpj/module_project/ui/alone/AloneViewModel.kt create mode 100644 module_square/src/main/java/com/btpj/module_square/ui/alone/AloneActivity.kt create mode 100644 module_square/src/main/java/com/btpj/module_square/ui/alone/AloneViewModel.kt create mode 100644 module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneActivity.kt create mode 100644 module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneViewModel.kt diff --git a/config.gradle b/config.gradle index c84c488..5996aea 100644 --- a/config.gradle +++ b/config.gradle @@ -1,6 +1,6 @@ ext { // module是否独立运行 - isBuildModule = false + isBuildModule = true android = [ compileSdk : 31, diff --git a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt index fbaf839..f8028f9 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt @@ -105,7 +105,7 @@ abstract class BaseVMBActivity(private if (it?.errorCode == -1001) { // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 - ModuleMineApi.navigateToLoginActivity() + ModuleMineApi.navToLoginActivity() } } } diff --git a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt index 2f93a90..08964a1 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt @@ -116,7 +116,7 @@ abstract class BaseVMBFragment(private if (it?.errorCode == -1001) { // 需要登录，这里主要是针对收藏操作，不想每个地方都判断一下 // 当然你也可以封装一个收藏的组件，在里面统一判断跳转 - ModuleMineApi.navigateToLoginActivity() + ModuleMineApi.navToLoginActivity() } } } diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt index e1cf8b8..fc1ab9f 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleHomeApi.kt @@ -27,7 +27,7 @@ object ModuleHomeApi { * 跳转到作者文章列表页面 * @param authorId 作者Id */ - fun navigateToAuthorActivity(authorId: Int) { + fun navToAuthorActivity(authorId: Int) { ARouter.getInstance().build(ROUTER_HOME_AUTHOR_ACTIVITY) .withInt(ROUTER_HOME_EXTRA_AUTHOR_ID, authorId).navigation() } diff --git a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt index ff6c73f..169fe6f 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/export/ModuleMineApi.kt @@ -24,12 +24,12 @@ object ModuleMineApi { } /** 跳转到登录页面 */ - fun navigateToLoginActivity() { + fun navToLoginActivity() { ARouter.getInstance().build(ROUTER_MINE_LOGIN_ACTIVITY).navigation() } /** 跳转到添加文章页面 */ - fun navigateToAddArticleActivity() { + fun navToAddArticleActivity() { ARouter.getInstance().build(ROUTER_MINE_ADD_ARTICLE_ACTIVITY).navigation() } } \ No newline at end of file diff --git a/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt b/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt index 67a1b9a..fbd551c 100644 --- a/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt +++ b/lib_common/src/main/java/com/btpj/lib_base/ext/ViewExt.kt @@ -41,7 +41,7 @@ fun Context.launchCheckLogin(action: (context: Context) -> Unit) { if (UserManager.isLogin()) { action.invoke(this) } else { - ModuleMineApi.navigateToLoginActivity() + ModuleMineApi.navToLoginActivity() } } diff --git a/lib_common/src/main/res/layout/common_container.xml b/lib_common/src/main/res/layout/common_container.xml new file mode 100644 index 0000000..bba425b --- /dev/null +++ b/lib_common/src/main/res/layout/common_container.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/module_home/src/main/alone/AndroidManifest.xml b/module_home/src/main/alone/AndroidManifest.xml index 1528f47..3c351dc 100644 --- a/module_home/src/main/alone/AndroidManifest.xml +++ b/module_home/src/main/alone/AndroidManifest.xml @@ -3,22 +3,23 @@ xmlns:tools="http://schemas.android.com/tools"> - - - - - - - + + + - - - + + + (R.layout.common_container) { + + override fun initView(savedInstanceState: Bundle?) { + supportFragmentManager.beginTransaction() + .add(R.id.fl_container, ModuleHomeApi.getHomeFragment()) + .commit() + } +} \ No newline at end of file diff --git a/module_home/src/main/java/com/btpj/module_home/ui/alone/AloneViewModel.kt b/module_home/src/main/java/com/btpj/module_home/ui/alone/AloneViewModel.kt new file mode 100644 index 0000000..b8ba5bc --- /dev/null +++ b/module_home/src/main/java/com/btpj/module_home/ui/alone/AloneViewModel.kt @@ -0,0 +1,10 @@ +package com.btpj.module_home.ui.alone + +import com.btpj.lib_base.base.BaseViewModel + +/** + * @author LTP 2022/3/9 + */ +class AloneViewModel : BaseViewModel() { + override fun start() {} +} \ No newline at end of file diff --git a/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt index a1cf344..7927ab9 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/home/HomeFragment.kt @@ -78,7 +78,7 @@ class HomeFragment : when (view.id) { // 查看作者文章列表 com.btpj.lib_base.R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt index 174a3cf..1a1d2af 100644 --- a/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt +++ b/module_home/src/main/java/com/btpj/module_home/ui/search/result/SearchResultActivity.kt @@ -65,7 +65,7 @@ class SearchResultActivity : when (view.id) { // 查看作者文章列表 com.btpj.lib_base.R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 com.btpj.lib_base.R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_main/src/main/alone/AndroidManifest.xml b/module_main/src/main/alone/AndroidManifest.xml index f8f8657..5cbe629 100644 --- a/module_main/src/main/alone/AndroidManifest.xml +++ b/module_main/src/main/alone/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> @@ -20,6 +21,11 @@ + (R.layout.common_container) { + + override fun initView(savedInstanceState: Bundle?) { + supportFragmentManager.beginTransaction() + .add(R.id.fl_container, ModuleMineApi.getMineFragment()) + .commit() + } +} \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/alone/AloneViewModel.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/alone/AloneViewModel.kt new file mode 100644 index 0000000..44adfc2 --- /dev/null +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/alone/AloneViewModel.kt @@ -0,0 +1,10 @@ +package com.btpj.module_mine.ui.alone + +import com.btpj.lib_base.base.BaseViewModel + +/** + * @author LTP 2022/3/9 + */ +class AloneViewModel : BaseViewModel() { + override fun start() {} +} \ No newline at end of file diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt index 9f695df..7a1d780 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/login/LoginActivity.kt @@ -26,17 +26,6 @@ import kotlinx.coroutines.launch class LoginActivity : BaseVMBActivity(R.layout.mine_activity_login) { - companion object { - - /** - * 页面启动 - * @param context Context - */ - fun launch(context: Context) { - context.startActivity(Intent(context, LoginActivity::class.java)) - } - } - override fun initView(savedInstanceState: Bundle?) { // Activity Results需要先注册 val registerForActivityResult = diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt index b5abf40..a9fe606 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/mine/MineFragment.kt @@ -14,7 +14,6 @@ import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineFragmentMineBinding import com.btpj.module_mine.ui.collect.CollectActivity import com.btpj.module_mine.ui.integral.rank.IntegralRankActivity -import com.btpj.module_mine.ui.login.LoginActivity import com.btpj.module_mine.ui.setting.SettingActivity import com.btpj.module_mine.ui.share.list.MyArticleActivity @@ -36,7 +35,7 @@ class MineFragment : clUser.setOnClickListener { if (!UserManager.isLogin()) { - LoginActivity.launch(requireContext()) + ModuleMineApi.navToLoginActivity() } } diff --git a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt index df693fd..f7ebe7d 100644 --- a/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt +++ b/module_mine/src/main/java/com/btpj/module_mine/ui/share/list/MyArticleActivity.kt @@ -13,7 +13,6 @@ import com.btpj.lib_base.base.BaseVMBActivity import com.btpj.lib_base.data.bean.Article import com.btpj.lib_base.export.ModuleMineApi import com.btpj.lib_base.ext.showDialog -import com.btpj.module_mine.ui.share.add.AddArticleActivity import com.btpj.module_mine.R import com.btpj.module_mine.databinding.MineActivityIntegralRecordBinding @@ -44,7 +43,7 @@ class MyArticleActivity : override fun initView(savedInstanceState: Bundle?) { mBinding.apply { titleLayout.setTitleText("我分享的文章") - .setRightView(com.btpj.lib_base.R.drawable.ic_add) { ModuleMineApi.navigateToAddArticleActivity() } + .setRightView(com.btpj.lib_base.R.drawable.ic_add) { ModuleMineApi.navToAddArticleActivity() } includeList.apply { recyclerView.apply { diff --git a/module_project/src/main/alone/AndroidManifest.xml b/module_project/src/main/alone/AndroidManifest.xml index 5e4f566..105d850 100644 --- a/module_project/src/main/alone/AndroidManifest.xml +++ b/module_project/src/main/alone/AndroidManifest.xml @@ -1,13 +1,26 @@ - + + + + + + + + \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneActivity.kt b/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneActivity.kt new file mode 100644 index 0000000..4222fa9 --- /dev/null +++ b/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneActivity.kt @@ -0,0 +1,25 @@ +package com.btpj.module_project.ui.alone + +import android.os.Bundle +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.export.ModuleMineApi +import com.btpj.lib_base.R +import com.btpj.lib_base.databinding.CommonContainerBinding +import com.btpj.lib_base.export.ModuleProjectApi + +/** + * 作为Application时的测试页面 + * + * @author LTP 2022/4/8 + */ +@Route(path = ModuleMineApi.ROUTER_MINE_LOGIN_ACTIVITY) +class AloneActivity : + BaseVMBActivity(R.layout.common_container) { + + override fun initView(savedInstanceState: Bundle?) { + supportFragmentManager.beginTransaction() + .add(R.id.fl_container, ModuleProjectApi.getProjectFragment()) + .commit() + } +} \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneViewModel.kt b/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneViewModel.kt new file mode 100644 index 0000000..7bfc439 --- /dev/null +++ b/module_project/src/main/java/com/btpj/module_project/ui/alone/AloneViewModel.kt @@ -0,0 +1,10 @@ +package com.btpj.module_project.ui.alone + +import com.btpj.lib_base.base.BaseViewModel + +/** + * @author LTP 2022/3/9 + */ +class AloneViewModel : BaseViewModel() { + override fun start() {} +} \ No newline at end of file diff --git a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt index f0efcc4..25edfa3 100644 --- a/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt +++ b/module_project/src/main/java/com/btpj/module_project/ui/project/ProjectChildFragment.kt @@ -63,7 +63,7 @@ class ProjectChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) R.id.iv_collect -> if (mAdapter.getItem(position).collect) { mViewModel.unCollectArticle(mAdapter.getItem(position).id) { diff --git a/module_square/src/main/alone/AndroidManifest.xml b/module_square/src/main/alone/AndroidManifest.xml index 148b656..c6cae8f 100644 --- a/module_square/src/main/alone/AndroidManifest.xml +++ b/module_square/src/main/alone/AndroidManifest.xml @@ -1,14 +1,26 @@ - + + + + + + + \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneActivity.kt b/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneActivity.kt new file mode 100644 index 0000000..01ed05c --- /dev/null +++ b/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneActivity.kt @@ -0,0 +1,25 @@ +package com.btpj.module_square.ui.alone + +import android.os.Bundle +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.export.ModuleMineApi +import com.btpj.lib_base.R +import com.btpj.lib_base.databinding.CommonContainerBinding +import com.btpj.lib_base.export.ModuleSquareApi + +/** + * 作为Application时的测试页面 + * + * @author LTP 2022/4/8 + */ +@Route(path = ModuleMineApi.ROUTER_MINE_LOGIN_ACTIVITY) +class AloneActivity : + BaseVMBActivity(R.layout.common_container) { + + override fun initView(savedInstanceState: Bundle?) { + supportFragmentManager.beginTransaction() + .add(R.id.fl_container, ModuleSquareApi.getSquareFragment()) + .commit() + } +} \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneViewModel.kt b/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneViewModel.kt new file mode 100644 index 0000000..6627879 --- /dev/null +++ b/module_square/src/main/java/com/btpj/module_square/ui/alone/AloneViewModel.kt @@ -0,0 +1,10 @@ +package com.btpj.module_square.ui.alone + +import com.btpj.lib_base.base.BaseViewModel + +/** + * @author LTP 2022/3/9 + */ +class AloneViewModel : BaseViewModel() { + override fun start() {} +} \ No newline at end of file diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt index 62d5a45..26c9b6d 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/SquareFragment.kt @@ -40,7 +40,7 @@ class SquareFragment : if (position == 0) { mBinding.titleLayout.setRightView(R.drawable.ic_add) { requireContext().launchCheckLogin { - ModuleMineApi.navigateToAddArticleActivity() + ModuleMineApi.navToAddArticleActivity() } } } else { diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt index d4204e4..21868ad 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/ask/AskFragment.kt @@ -50,7 +50,7 @@ class AskFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt index c4d244b..224522a 100644 --- a/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt +++ b/module_square/src/main/java/com/btpj/module_square/ui/square/square/SquareChildFragment.kt @@ -44,7 +44,7 @@ class SquareChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { diff --git a/module_web/src/main/alone/AndroidManifest.xml b/module_web/src/main/alone/AndroidManifest.xml index 28cdebe..9fae56d 100644 --- a/module_web/src/main/alone/AndroidManifest.xml +++ b/module_web/src/main/alone/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> - + + + + + + + + \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneActivity.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneActivity.kt new file mode 100644 index 0000000..20cebe4 --- /dev/null +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneActivity.kt @@ -0,0 +1,25 @@ +package com.btpj.module_wechat.ui.alone + +import android.os.Bundle +import com.alibaba.android.arouter.facade.annotation.Route +import com.btpj.lib_base.base.BaseVMBActivity +import com.btpj.lib_base.export.ModuleMineApi +import com.btpj.lib_base.R +import com.btpj.lib_base.databinding.CommonContainerBinding +import com.btpj.lib_base.export.ModuleWechatApi + +/** + * 作为Application时的测试页面 + * + * @author LTP 2022/4/8 + */ +@Route(path = ModuleMineApi.ROUTER_MINE_LOGIN_ACTIVITY) +class AloneActivity : + BaseVMBActivity(R.layout.common_container) { + + override fun initView(savedInstanceState: Bundle?) { + supportFragmentManager.beginTransaction() + .add(R.id.fl_container, ModuleWechatApi.getWechatFragment()) + .commit() + } +} \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneViewModel.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneViewModel.kt new file mode 100644 index 0000000..86c8add --- /dev/null +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/alone/AloneViewModel.kt @@ -0,0 +1,10 @@ +package com.btpj.module_wechat.ui.alone + +import com.btpj.lib_base.base.BaseViewModel + +/** + * @author LTP 2022/3/9 + */ +class AloneViewModel : BaseViewModel() { + override fun start() {} +} \ No newline at end of file diff --git a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt index 6107f82..4fd4c5e 100644 --- a/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt +++ b/module_wechat/src/main/java/com/btpj/module_wechat/ui/wechat/WechatChildFragment.kt @@ -61,7 +61,7 @@ class WechatChildFragment : when (view.id) { // 查看作者文章列表 R.id.tv_author -> - ModuleHomeApi.navigateToAuthorActivity(mAdapter.getItem(position).userId) + ModuleHomeApi.navToAuthorActivity(mAdapter.getItem(position).userId) // 收藏与取消收藏 R.id.iv_collect -> if (mAdapter.getItem(position).collect) { From 7a3e374a41d7ff2aecafe2ae39547bc9b982d53c Mon Sep 17 00:00:00 2001 From: BTPJ <1069113473@qq.com> Date: Wed, 11 May 2022 13:58:25 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/WanAndroid_V1.0.apk | Bin 0 -> 4430712 bytes app/release/WanAndroid_V1.5.apk | Bin 4314159 -> 0 bytes app/release/output-metadata.json | 6 +++--- config.gradle | 6 +++--- .../module_home/ui/alone/AloneActivity.kt | 5 +---- .../module_mine/ui/alone/AloneActivity.kt | 6 ++---- .../module_project/ui/alone/AloneActivity.kt | 5 +---- .../module_square/ui/alone/AloneActivity.kt | 5 +---- .../module_wechat/ui/alone/AloneActivity.kt | 5 +---- 9 files changed, 12 insertions(+), 26 deletions(-) create mode 100644 app/release/WanAndroid_V1.0.apk delete mode 100644 app/release/WanAndroid_V1.5.apk diff --git a/app/release/WanAndroid_V1.0.apk b/app/release/WanAndroid_V1.0.apk new file mode 100644 index 0000000000000000000000000000000000000000..4d821bd4e63da3bc01df9192c39a540b9314bf3d GIT binary patch literal 4430712 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