更新了一些库的版本

zhoujia456888 · Jan 21, 2021 · 297f578 · 297f578
1 parent 863e752
commit 297f578
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ build
 .externalNativeBuild
 .cxx
 local.properties
+/app/release
diff --git a/LibEasyGlide/build.gradle b/LibEasyGlide/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
     id 'kotlin-kapt'
 }
 

diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
-/build
+/build
+/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,16 +13,61 @@ android {
         applicationId "com.jloveh.beautifulgirl2"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
+            //混淆开启
             minifyEnabled false
+            shrinkResources false
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            applicationVariants.all { variant ->
+                variant.outputs.all { output ->
+                    def outputFile = output.outputFileName
+                    if (outputFile != null && outputFileName.endsWith('.apk')) {
+                        def fileName = "BeautifulGirl2_" +
+                                "v${defaultConfig.versionName}_" +
+                                "${defaultConfig.versionCode}_" +
+                                "${releaseTime()}_${variant.buildType.name}.apk"
+                        output.outputFileName = new File(fileName)
+                    }
+                }
+            }
+        }
+
+        debug {
+            signingConfig signingConfigs.debug
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    signingConfigs {
+        release {
+            //签名文件路径
+            storeFile file { "../keyStorePath.keystore" }
+            //签名密码
+            storePassword "abcd1234"
+            //别名
+            keyAlias "key0"
+            //别名密码
+            keyPassword "abcd1234"
+        }
+
+        debug {
+            //签名文件路径
+            storeFile file { "../keyStorePath.keystore" }
+            //签名密码
+            storePassword "abcd1234"
+            //别名
+            keyAlias "key0"
+            //别名密码
+            keyPassword "abcd1234"
         }
     }
     compileOptions {
@@ -36,6 +81,7 @@ android {
     buildFeatures {
         dataBinding = true
     }
+
 }
 
 dependencies {
@@ -53,7 +99,7 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
 
     //https://github.com/li-xiaojun/XPopup
-    implementation 'com.lxj:xpopup:2.2.13'
+    implementation 'com.lxj:xpopup:2.2.14'
 
     //https://github.com/hegaojian/JetpackMvvm
     implementation 'me.hegj:JetpackMvvm:1.2.0'
@@ -78,9 +124,10 @@ dependencies {
     //Adapter框架 https://github.com/CymChad/BaseRecyclerViewAdapterHelper/blob/master/readme/0-BaseRecyclerViewAdapterHelper.md
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
 
-    //下拉刷新上拉加载 https://github.com/scwang90/SmartRefreshLayout/tree/androidx
-    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-x'
-    implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-x'
+    //下拉刷新上拉加载 https://github.com/scwang90/SmartRefreshLayout
+    implementation 'com.scwang.smart:refresh-layout-kernel:2.0.3'
+    implementation 'com.scwang.smart:refresh-header-material:2.0.3'    //谷歌刷新头
+    implementation  'com.scwang.smart:refresh-footer-ball:2.0.3'        //球脉冲加载
 
     //自定义程序崩溃页面  https://github.com/Ereza/CustomActivityOnCrash
     implementation 'cat.ereza:customactivityoncrash:2.3.0'
@@ -89,4 +136,8 @@ dependencies {
     implementation 'com.just.agentweb:agentweb-androidx:4.1.4' // (必选)
     implementation 'com.just.agentweb:filechooser-androidx:4.1.4'// (可选)
     implementation 'com.download.library:downloader-androidx:4.1.4'// (可选)
+}
+
+def releaseTime() {
+    return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
 }
diff --git a/app/release/BeautifulGirl2_v1.0.1_2_20210121_release.apk b/app/release/BeautifulGirl2_v1.0.1_2_20210121_release.apk
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0",
-      "outputFile": "app-release.apk"
+      "versionCode": 2,
+      "versionName": "1.0.1",
+      "outputFile": "BeautifulGirl2_v1.0.1_2_20210121_release.apk"
     }
   ]
 }
diff --git a/app/src/main/java/com/jloveh/beautifulgirl2/ui/activity/MainActivity.kt b/app/src/main/java/com/jloveh/beautifulgirl2/ui/activity/MainActivity.kt
@@ -50,7 +50,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             XPopup.Builder(this)
                 .asInputConfirm(
                     "请输入地址",
-                    "如果不能访问，那就用自带浏览器进去98tang.com，复制网页上的地址粘贴到这里."
+                    "如果不能访问，那就用自带浏览器进去98tang.com，复制网页上的地址粘贴到这里.",
+                    "${webUrlSp.getString("webUrl", "https://www.98awwyou21.xyz")}",
+                    "https://www.98tang.com"
                 ) {
                     webUrlSp.put("webUrl", it)
                 }.show()

diff --git a/app/src/main/java/com/jloveh/beautifulgirl2/ui/fragment/MZiTuFragment.kt b/app/src/main/java/com/jloveh/beautifulgirl2/ui/fragment/MZiTuFragment.kt
@@ -67,11 +67,11 @@ class MZiTuFragment : BaseFragment<MainViewModel, FragmentBeautifulgirlBinding>(
         presentPage = mzituUrl
         GlobalScope.launch(Dispatchers.IO) {
             var url = "${mzituUrl}page/$page/"
-         //   LogUtils.e("mzituUrl:" + url)
+            //   LogUtils.e("mzituUrl:" + url)
             val doc: Document = Jsoup.connect(url).userAgent(UserAgent).get()
 
             var postlist = doc.select("div.postlist").select("li")
-          //   LogUtils.e("postlist:${postlist.size}")
+            //   LogUtils.e("postlist:${postlist.size}")
 
             beautifulImgDataList.clear()
 
@@ -80,7 +80,7 @@ class MZiTuFragment : BaseFragment<MainViewModel, FragmentBeautifulgirlBinding>(
 
                 var picturesDetailsUrl = it.select("a").attr("abs:href")
 
-                beautifulImgData = BeautifulImgData(mzituUrl, beautifulImgUrl, picturesDetailsUrl,url)
+                beautifulImgData = BeautifulImgData(mzituUrl, beautifulImgUrl, picturesDetailsUrl, url)
                 beautifulImgDataList.add(beautifulImgData)
             }
 

diff --git a/app/src/main/res/layout/include_recyclerview.xml b/app/src/main/res/layout/include_recyclerview.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refreshlayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -20,7 +20,7 @@
             app:srlEnableLoadMore="true"
             app:srlPrimaryColor="@color/color_FF5C5C">
 
-            <com.scwang.smartrefresh.header.MaterialHeader
+            <com.scwang.smart.refresh.header.MaterialHeader
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
@@ -29,10 +29,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-            <com.scwang.smartrefresh.layout.footer.BallPulseFooter
+            <com.scwang.smart.refresh.footer.BallPulseFooter
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
     </merge>
 </layout>
diff --git a/keyStore.keystore b/keyStore.keystore