Merge pull request #67 from xuexiangjys/dev/1.1.4

Dev/1.1.4

README.md

@@ -65,11 +65,11 @@ allprojects {
 dependencies {
   ...
   //androidx项目
-  implementation 'com.github.xuexiangjys:XUI:1.1.3'
+  implementation 'com.github.xuexiangjys:XUI:1.1.4'
 
   implementation 'androidx.appcompat:appcompat:1.1.0'
   implementation 'androidx.recyclerview:recyclerview:1.1.0'
-  implementation 'com.google.android.material:material:1.1.0-beta01'
+  implementation 'com.google.android.material:material:1.1.0'
   implementation 'com.github.bumptech.glide:glide:4.11.0'
 }
 ```
@@ -197,6 +197,7 @@ protected void attachBaseContext(Context newBase) {
 * [Android-Iconics](https://github.com/mikepenz/Android-Iconics)
 * [Android-PickerView](https://github.com/Bigkoo/Android-PickerView)
 * [CityPicker](https://github.com/xuexiangjys/CityPicker)
+* [ELinkageScroll](https://github.com/MFC-TEC/ELinkageScroll)
 * [FlycoBanner_Master](https://github.com/H07000223/FlycoBanner_Master)
 * [Linkage-RecyclerView](https://github.com/KunMinX/Linkage-RecyclerView)
 * [MaterialEditText](https://github.com/rengwuxian/MaterialEditText)
@@ -208,6 +209,7 @@ protected void attachBaseContext(Context newBase) {
 * [SlideBack](https://github.com/ParfoisMeng/SlideBack)
 * [SwipeRecyclerView](https://github.com/yanzhenjie/SwipeRecyclerView)
 
+
 ## 如果觉得项目还不错，可以考虑打赏一波
 
 > 你的打赏是我维护的动力，我将会列出所有打赏人员的清单在下方作为凭证，打赏前请留下打赏项目的备注！
@@ -238,7 +240,15 @@ C*y | 1￥ | 微信
 *云 | 20.21￥ | 支付宝
 *钰晗 | 66￥ | 支付宝
 *杰柱 | 10￥ | 支付宝
-
+*毛 | 6.66￥ | 微信
+*凯 | 10￥ | 微信
+r*o | 8.88￥ | 微信
+T*8 | 7.77￥ | 微信
+v*d | 20￥ | 微信
+B*G | 1￥ | 微信
+*舞 | 10￥ | 微信
+*肉 | 2￥ | 微信
+*拖 | 12.12￥ | 微信
 
 ## 联系方式
 

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.xuexiang.xuidemo"
         minSdkVersion 17
         targetSdkVersion build_versions.target_sdk
-        versionCode 14
-        versionName "1.1.3"
+        versionCode 15
+        versionName "1.1.4"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -99,24 +99,24 @@ dependencies {
 //    implementation deps.glide
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.1.3'
+    implementation project(':xui_lib')
+//    implementation 'com.github.xuexiangjys:XUI:1.1.3'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类
-    implementation 'com.github.xuexiangjys.XUtil:xutil-core:1.1.7'
-    implementation 'com.github.xuexiangjys.XUtil:xutil-sub:1.1.7'
+    implementation 'com.github.xuexiangjys.XUtil:xutil-core:1.1.8'
+    implementation 'com.github.xuexiangjys.XUtil:xutil-sub:1.1.8'
     //切片
     implementation 'com.github.xuexiangjys.XAOP:xaop-runtime:1.0.5x'
     //页面路由
     implementation 'com.github.xuexiangjys.XRouter:xrouter-runtime:1.0.1'
     annotationProcessor 'com.github.xuexiangjys.XRouter:xrouter-compiler:1.0.1'
     //XPage页面框架
-    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.9'
+    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.3.0'
     annotationProcessor project(':widget_compiler')
     //ButterKnife
     implementation deps.butterknife.runtime
@@ -191,12 +191,15 @@ dependencies {
     implementation "com.mikepenz:iconics-views:4.0.1-b02"
     //相机拍摄
     implementation 'com.github.xuexiangjys:CameraView:1.0.3'
-
     //另一款相机拍摄库，使用更简单
     implementation 'com.wonderkiln:camerakit:0.13.1'
 
+    //阿里巴巴组件
+    implementation 'com.alibaba.android:vlayout:1.2.36'
+    implementation 'com.alibaba.android:ultraviewpager:1.0.7.8'
+    implementation 'com.alibaba.android:tangram:3.3.6'
     //版本更新
-    implementation 'com.github.xuexiangjys:XUpdate:1.1.4'
+    implementation 'com.github.xuexiangjys:XUpdate:1.1.6'
     implementation 'com.zhy:okhttputils:2.6.2'
     //腾讯的键值对存储mmkv
     implementation 'com.tencent:mmkv:1.0.22'

app/proguard-rules.pro

@@ -321,5 +321,14 @@
     native <methods>;
 }
 
-
+# materialedittext
 -keep class com.xuexiang.xui.widget.edittext.materialedittext.** { *; }
+
+# vlayout
+-keepattributes InnerClasses
+-keep class com.alibaba.android.vlayout.ExposeLinearLayoutManagerEx { *; }
+-keep class android.support.v7.widget.RecyclerView$LayoutParams { *; }
+-keep class android.support.v7.widget.RecyclerView$ViewHolder { *; }
+-keep class android.support.v7.widget.ChildHelper { *; }
+-keep class android.support.v7.widget.ChildHelper$Bucket { *; }
+-keep class android.support.v7.widget.RecyclerView$LayoutManager { *; }

app/src/main/AndroidManifest.xml

@@ -32,6 +32,8 @@
         android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
@@ -80,12 +82,16 @@
         <activity
             android:name=".activity.SearchViewActivity"
             android:label="SearchView" />
+        <activity
+            android:name=".activity.SearchComponentActivity"
+            android:launchMode="singleTask" />
 
         <activity
             android:name=".base.webview.AgentWebActivity"
             android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
             android:hardwareAccelerated="true"
             android:label="@string/app_browser_name"
+            android:launchMode="singleTask"
             android:theme="@style/AppTheme">
             <!-- Scheme -->
             <intent-filter>