Merge pull request #23 from molihuan/dev

Update Dependencies
molihuan · Sep 18, 2023 · 42f6cec · 42f6cec
2 parents 3cf3d95 + 9aedb4b
commit 42f6cec
Show file tree

Hide file tree

Showing 30 changed files with 399 additions and 178 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@
 
 #### 在开始之前可以给项目一个Star吗？非常感谢，你的支持是我唯一的动力。欢迎Star和Issues!
 
-#### 欢迎Pr，请Pr提交到dev分支
+#### 我们需要你的Pr，注意(请提交到dev分支)
 
 #### 项目地址：
 ##### [Github地址](https://github.com/molihuan/mlhfileselectorlib)
@@ -90,7 +90,8 @@ dependencyResolutionManagement {
 ```java
 dependencies {
     ...
-    // 请将"版本"替换成具体的版本号，如 1.1.11
+    // 建议使用最新发布版，最新发布版请看上面
+    // 请将"版本"替换成具体的版本号，如 1.1.15
     implementation 'io.github.molihuan:pathselector:版本'
 }
 ```
@@ -477,6 +478,7 @@ PathSelectFragment selector = PathSelector.build(this, MConstants.BUILD_DIALOG)
 | setHandleItemListeners(CommonItemListener... handleItemListener) | 设置长按弹出选项回调                                   |                                                 |
 | setTitlebarFragment(AbstractTitlebarFragment titlebarFragment) | 设置自定义标题栏UI                                     | 自己的Fragment必须继承AbstractTitlebarFragment  |
 | setHandleFragment(AbstractHandleFragment handleFragment)     | 设置长按弹出自定义UI                                   | 自己的Fragment必须继承AbstractHandleFragment    |
+| setLifeCycle(AbstractLifeCycle lifeCycle)                    | 设置一些生命周期钩子                                   | 重写对应的方法即可                              |
 | start()                                                      | 开始构建                                               | 必须调用                                        |
 | ......                                                       | ......                                                 |                                                 |
 
@@ -550,18 +552,18 @@ PathSelectFragment selector = PathSelector.build(this, MConstants.BUILD_DIALOG)
 ### LICENSE 
 
 ```
-   Copyright [2020] molihuan
+Copyright [2020] molihuan
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 ```
 
diff --git a/README_EN.md b/README_EN.md
@@ -37,7 +37,7 @@ Automatically apply storage permission, support Android4.4 ~ 13, no longer need
 
 #### Can you give the project a Star before starting? Thank you very much, your support is the only thing that keeps me going. Welcome Star and Issues!
 
-#### Welcome to Pr, please submit to the dev branch
+#### We need your Pr. Note (please Pr to dev branch)
 
 #### Project Address：
 ##### [Github](https://github.com/molihuan/mlhfileselectorlib)
@@ -88,7 +88,8 @@ dependencyResolutionManagement {
 ```java
 dependencies {
     ...
-    // Please replace "version" with a specific version number, e.g. 1.1.11
+    // We recommend using the latest release version, please see above for the latest release version
+    // Please replace "version" with a specific version number, e.g. 1.1.15
     implementation 'io.github.molihuan:pathselector:version'
 }
 ```
@@ -473,6 +474,7 @@ PathSelectFragment selector = PathSelector.build(this, MConstants.BUILD_DIALOG)
 | setHandleItemListeners(CommonItemListener... handleItemListener) | Set long press popup option callback                         |                                                              |
 | setTitlebarFragment(AbstractTitlebarFragment titlebarFragment) | Set custom title bar UI                                      | Your own Fragment must extend AbstractTitlebarFragment       |
 | setHandleFragment(AbstractHandleFragment handleFragment)     | Set long press to pop up custom UI                           | Your own Fragment must extend AbstractHandleFragment         |
+| setLifeCycle(AbstractLifeCycle lifeCycle)                    | Set some life cycle hooks                                    | Just rewrite the corresponding method                        |
 | start()                                                      | Start building                                               | Must be called                                               |
 | ......                                                       | ......                                                       | ......                                                       |
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,17 +10,17 @@ android {
         applicationId "com.molihuan.demo01"
         minSdkVersion 25
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled true      // 开启代码混淆
+            minifyEnabled false      // 开启代码混淆
             zipAlignEnabled false    // 开启Zip压缩优化
-            shrinkResources true    // 移除未被使用的资源
+            shrinkResources false    // 移除未被使用的资源
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -38,13 +38,13 @@ dependencies {
 
     //远程aar集成
 
-//    implementation 'io.github.molihuan:pathselector:1.1.1'
+//    implementation 'io.github.molihuan:pathselector:1.1.15'
 
     //本地aar集成
 
 //    implementation fileTree(dir: "../pathselector/build/outputs/aar/", includes: ["*-release.aar", "*.jar"])
 //    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.11'
-    implementation 'com.github.getActivity:XXPermissions:16.5'
+    implementation 'com.github.getActivity:XXPermissions:18.3'
 
     //调试用
 

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,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "1.1",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/app/src/main/java/com/molihuan/pathselectdemo/activity/MainActivity.java b/app/src/main/java/com/molihuan/pathselectdemo/activity/MainActivity.java
@@ -12,6 +12,7 @@
 
 import com.molihuan.pathselectdemo.R;
 import com.molihuan.pathselectdemo.fragments.CustomTitlebarFragment;
+import com.molihuan.pathselectdemo.fragments.TestFragment;
 import com.molihuan.pathselector.PathSelector;
 import com.molihuan.pathselector.configs.PathSelectorConfig;
 import com.molihuan.pathselector.controller.AbstractFileBeanController;
@@ -107,10 +108,11 @@ public void onClick(View v) {
                 customTitlebarSelectShow();
                 break;
             case R.id.btn_test:
+
                 FragmentTools.fragmentReplace(
                         getSupportFragmentManager(),
                         R.id.fragment_select_show_area,
-                        new CustomTitlebarFragment(),
+                        new TestFragment(),
                         "55"
                 );
 
@@ -128,7 +130,6 @@ public void onClick(View v) {
     private void dialogSelectShow() {
         //获取PathSelectFragment实例onBackPressed中处理返回按钮点击事件
         selector = PathSelector.build(MainActivity.this, MConstants.BUILD_DIALOG)
-                .setRootPath("/storage/emulated/0/bilibili视频合并/")
                 .setMorePopupItemListeners(
                         new CommonItemListener("SelectAll") {
                             @Override

diff --git a/app/src/main/java/com/molihuan/pathselectdemo/fragments/CustomTitlebarFragment.java b/app/src/main/java/com/molihuan/pathselectdemo/fragments/CustomTitlebarFragment.java
@@ -27,6 +27,7 @@ public void getComponents(View view) {
         btn1 = view.findViewById(R.id.my_btn1);
         btn2 = view.findViewById(R.id.my_btn2);
 
+
         btn1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -39,6 +40,7 @@ public void onClick(View v) {
                 psf.selectAllFile(true);
             }
         });
+
     }
 
 }
diff --git a/app/src/main/java/com/molihuan/pathselectdemo/fragments/TestFragment.java b/app/src/main/java/com/molihuan/pathselectdemo/fragments/TestFragment.java
@@ -0,0 +1,26 @@
+package com.molihuan.pathselectdemo.fragments;
+
+import android.view.View;
+import android.widget.Button;
+
+import com.molihuan.pathselectdemo.R;
+import com.molihuan.pathselector.fragment.AbstractFragment;
+import com.molihuan.pathselector.utils.Mtools;
+
+public class TestFragment extends AbstractFragment {
+    @Override
+    public int setFragmentViewId() {
+        return R.layout.test_fragment;
+    }
+
+    @Override
+    public void getComponents(View view) {
+        Button btn = view.findViewById(R.id.test_btn1);
+        btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Mtools.toast("66666");
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/layout/fragment_custom_titlebar.xml b/app/src/main/res/layout/fragment_custom_titlebar.xml
@@ -16,4 +16,9 @@
         android:layout_height="wrap_content"
         android:text="selectAll" />
 
+    <FrameLayout
+        android:id="@+id/tt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/test_fragment.xml b/app/src/main/res/layout/test_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <Button
+        android:id="@+id/test_btn1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="test fragment" />
+
+</LinearLayout>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue May 31 14:54:31 CST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip