Merge pull request #52 from xuexiangjys/dev/1.1.1

Dev/1.1.1
xuexiangjys · Dec 1, 2019 · 0e25cd2 · 0e25cd2
2 parents 6483fcd + 1c6b987
commit 0e25cd2
Show file tree

Hide file tree

Showing 236 changed files with 9,299 additions and 1,436 deletions.
diff --git a/README.md b/README.md
@@ -63,10 +63,10 @@ allprojects {
 dependencies {
   ...
   //androidx项目
-  implementation 'com.github.xuexiangjys:XUI:1.1.0'
+  implementation 'com.github.xuexiangjys:XUI:1.1.1'
 
   implementation 'androidx.appcompat:appcompat:1.1.0'
-  implementation 'androidx.recyclerview:recyclerview:1.0.0'
+  implementation 'androidx.recyclerview:recyclerview:1.1.0'
   implementation 'com.google.android.material:material:1.1.0-beta01'
   implementation 'com.github.bumptech.glide:glide:4.8.0'
 }
@@ -183,15 +183,19 @@ protected void attachBaseContext(Context newBase) {
 
 * [QMUI_Android](https://github.com/Tencent/QMUI_Android)
 * [AgentWeb](https://github.com/Justson/AgentWeb)
-* [CityPicker](https://github.com/xuexiangjys/CityPicker)
-* [SmartRefreshLayout](https://github.com/scwang90/SmartRefreshLayout)
-* [PictureSelector](https://github.com/LuckSiege/PictureSelector)
+* [Android-Iconics](https://github.com/mikepenz/Android-Iconics)
 * [Android-PickerView](https://github.com/Bigkoo/Android-PickerView)
+* [CityPicker](https://github.com/xuexiangjys/CityPicker)
+* [FlycoBanner_Master](https://github.com/H07000223/FlycoBanner_Master)
+* [Linkage-RecyclerView](https://github.com/KunMinX/Linkage-RecyclerView)
 * [MaterialEditText](https://github.com/rengwuxian/MaterialEditText)
 * [MaterialSpinner](https://github.com/jaredrummler/MaterialSpinner)
-* [FlycoBanner_Master](https://github.com/H07000223/FlycoBanner_Master)
 * [MaterialProgressBar](https://github.com/DreaminginCodeZH/MaterialProgressBar)
+* [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart)
+* [PictureSelector](https://github.com/LuckSiege/PictureSelector)
+* [SmartRefreshLayout](https://github.com/scwang90/SmartRefreshLayout)
 * [SlideBack](https://github.com/ParfoisMeng/SlideBack)
+* [SwipeRecyclerView](https://github.com/yanzhenjie/SwipeRecyclerView)
 
 ## 如果觉得项目还不错，可以考虑打赏一波
 
@@ -210,6 +214,9 @@ C*y | 1￥ | 微信
 *事 | 10￥ | 微信
 优*1 | 168￥ | 微信
 *、 | 20￥ | 微信
+*钰晗 | 6￥ | 支付宝
+*娜 | 3￥ | 微信
+*米 | 20￥ | 微信
 
 ## 联系方式
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.xuexiang.xuidemo"
         minSdkVersion 17
         targetSdkVersion build_versions.target_sdk
-        versionCode 11
-        versionName "1.1.0"
+        versionCode 12
+        versionName "1.1.1"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -89,20 +89,21 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation deps.androidx.multidex
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //下拉刷新、CityPicker、XUI框架需要
 //    implementation deps.androidx.appcompat
 //    implementation deps.androidx.recyclerview
 //    implementation deps.androidx.design
 //    implementation deps.glide
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.1.0-beta01'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.1.0'
+    implementation project(':xui_lib')
+//    implementation 'com.github.xuexiangjys:XUI:1.1.0'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类
@@ -126,6 +127,7 @@ dependencies {
 
     //弹性布局
     implementation 'com.google.android:flexbox:0.3.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
     //悬浮按钮
     implementation 'com.github.clans:fab:1.6.4'
     //RxUtil2
@@ -156,8 +158,6 @@ dependencies {
     implementation 'com.github.xuexiangjys.AgentWeb:agentweb-core:1.0.0'
     implementation 'com.github.xuexiangjys.AgentWeb:agentweb-download:1.0.0'//选填
     implementation 'com.github.xuexiangjys.AgentWeb:agentweb-filechooser:1.0.0'//选填
-    //WebView的回弹布局
-    implementation 'com.lcodecorex:tkrefreshlayout:1.0.7'
 
     //侧边栏菜单
     implementation 'com.yarolegovich:sliding-root-nav:1.1.0'
@@ -185,11 +185,16 @@ dependencies {
     //图标库控件（可选）
     implementation "com.mikepenz:iconics-views:4.0.1-b02"
     //相机拍摄
-    implementation 'com.github.xuexiangjys:CameraView:1.0.0'
+    implementation 'com.github.xuexiangjys:CameraView:1.0.3'
 
     //版本更新
     implementation 'com.github.xuexiangjys:XUpdate:1.1.1'
     implementation 'com.zhy:okhttputils:2.6.2'
+    //腾讯的键值对存储mmkv
+    implementation 'com.tencent:mmkv:1.0.22'
+
+    //双列表联动
+    implementation 'com.kunminx.linkage:linkage-recyclerview:1.9.2'
 
     //umeng统计
     implementation 'com.umeng.umsdk:analytics:8.0.2'

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -244,6 +244,7 @@
 }
 
 -keep public class com.xuexiang.xuidemo.fragment.components.pickerview.**{*;}
+-keep public class com.xuexiang.xuidemo.fragment.expands.linkage.eleme.**{*;}
 
 # agentweb
 -keep class com.just.agentweb.** {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -56,18 +56,24 @@
 
         <activity
             android:name=".activity.MainActivity"
-            android:launchMode="singleTask"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <activity
+            android:name=".activity.LoginActivity"
+            android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|stateHidden"/>
 
         <activity android:name=".activity.UserGuideActivity" />
 
         <activity android:name=".activity.EasyIndicatorActivity" />
 
         <!--&lt;!&ndash;XVideo视频录制&ndash;&gt;-->
         <!--<activity-->
-            <!--android:name="com.xuexiang.xvideo.MediaRecorderActivity"-->
-            <!--android:theme="@style/XVideoNoBarTheme" />-->
+        <!--android:name="com.xuexiang.xvideo.MediaRecorderActivity"-->
+        <!--android:theme="@style/XVideoNoBarTheme" />-->
 
         <!--SearchView-->
         <activity
@@ -78,12 +84,13 @@
             android:name=".base.webview.AgentWebActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:hardwareAccelerated="true"
-            android:label="XUI浏览器"
+            android:label="@string/app_browser_name"
             android:theme="@style/AppTheme">
             <!-- Scheme -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-                <action android:name="com.xuexiang.xui.applink"/>
+                <action android:name="com.xuexiang.xui.applink" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
@@ -93,12 +100,14 @@
                 <data android:scheme="javascript" />
                 <data
                     android:host="xuexiangjys.club"
-                    android:scheme="xui"/>
+                    android:scheme="xui" />
             </intent-filter>
             <!-- AppLink -->
-            <intent-filter android:autoVerify="true"
+            <intent-filter
+                android:autoVerify="true"
                 tools:targetApi="m">
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -111,56 +120,59 @@
                 <data android:mimeType="application/vnd.wap.xhtml+xml" />
                 <data
                     android:host="xuexiangjys.club"
-                    android:scheme="http"/>
+                    android:scheme="http" />
                 <data
                     android:host="xuexiangjys.club"
-                    android:scheme="https"/>
+                    android:scheme="https" />
             </intent-filter>
         </activity>
+        <!-- applink的中转页面 -->
         <activity
-            android:name=".base.BaseActivity"
+            android:name=".base.XPageTransferActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:windowSoftInputMode="adjustPan|stateHidden" />
+        <!--fragment的页面容器-->
         <activity
-            android:name=".widget.iconfont.IconFontActivity"
+            android:name=".base.BaseActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
-            android:name=".base.XPageTransferActivity"
+            android:name=".widget.iconfont.IconFontActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:windowSoftInputMode="adjustPan|stateHidden" />
-
         <activity android:name=".activity.TranslucentActivity" />
-
-        <activity android:name=".fragment.expands.camera.CameraActivity"
-            android:theme="@style/AppTheme.Camera"
+        <activity
+            android:name=".fragment.expands.camera.CameraActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateAlwaysHidden" />
-        <activity android:name=".fragment.expands.camera.PictureCropActivity"
             android:theme="@style/AppTheme.Camera"
+            android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".fragment.expands.camera.PictureCropActivity"
             android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Camera"
             android:windowSoftInputMode="stateAlwaysHidden" />
-        <activity android:name=".fragment.expands.camera.CameraViewActivity"
+        <activity
+            android:name=".fragment.expands.camera.CameraViewActivity"
             android:theme="@style/AppTheme.Camera"
             android:windowSoftInputMode="stateAlwaysHidden" />
-
         <activity
             android:name=".fragment.expands.qrcode.CustomCaptureActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:screenOrientation="portrait"
             android:theme="@style/XQRCodeTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
-
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/title_activity_settings"
             android:theme="@style/SettingTheme" />
 
+        <!-- 版本更新提示-->
         <activity
             android:name=".utils.update.UpdateTipDialog"
             android:theme="@style/DialogTheme" />
+        <!-- Webview拦截提示弹窗-->
         <activity
-            android:name=".base.webview.WebViewTipDialog"
+            android:name=".base.webview.WebViewInterceptDialog"
             android:theme="@style/DialogTheme" />
 
         <!--X5预加载-->