Merge pull request #77 from xuexiangjys/dev/1.1.5

Dev/1.1.5

Author: xuexiangjys

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.xuexiang.xuidemo"
         minSdkVersion 17
         targetSdkVersion build_versions.target_sdk
-        versionCode 15
-        versionName "1.1.4"
+        versionCode 16
+        versionName "1.1.5"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -90,21 +90,21 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation deps.androidx.multidex
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
 
     //下拉刷新、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.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.1.4'
+    implementation project(':xui_lib')
+//    implementation 'com.github.xuexiangjys:XUI:1.1.4'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类
@@ -116,7 +116,7 @@ dependencies {
     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.3.0'
+    implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.0'
     annotationProcessor project(':widget_compiler')
     //ButterKnife
     implementation deps.butterknife.runtime
@@ -128,7 +128,7 @@ dependencies {
 
     //弹性布局
     implementation 'com.google.android:flexbox:0.3.1'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     //悬浮按钮
     implementation 'com.github.clans:fab:1.6.4'
     //RxUtil2
@@ -199,7 +199,7 @@ dependencies {
     implementation 'com.alibaba.android:ultraviewpager:1.0.7.8'
     implementation 'com.alibaba.android:tangram:3.3.6'
     //版本更新
-    implementation 'com.github.xuexiangjys:XUpdate:1.1.6'
+    implementation 'com.github.xuexiangjys:XUpdate:2.0.2'
     implementation 'com.zhy:okhttputils:2.6.2'
     //腾讯的键值对存储mmkv
     implementation 'com.tencent:mmkv:1.0.22'

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
     <application
         android:name=".MyApp"
         android:allowBackup="false"
-        android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+        android:configChanges="screenSize|keyboardHidden|orientation|keyboard|locale|layoutDirection"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -59,12 +59,12 @@
 
         <activity
             android:name=".activity.MainActivity"
-            android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+            android:configChanges="screenSize|keyboardHidden|orientation|keyboard|locale|layoutDirection"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activity.LoginActivity"
-            android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+            android:configChanges="screenSize|keyboardHidden|orientation|keyboard|locale|layoutDirection"
             android:launchMode="singleInstance"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateHidden" />
@@ -141,7 +141,7 @@
         <!--fragment的页面容器-->
         <activity
             android:name=".base.BaseActivity"
-            android:configChanges="screenSize|keyboardHidden|orientation|keyboard"
+            android:configChanges="screenSize|keyboardHidden|orientation|keyboard|locale|layoutDirection"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".widget.iconfont.IconFontActivity"

app/src/main/java/com/xuexiang/xuidemo/MyApp.java

@@ -64,7 +64,7 @@ private void initUI() {
         XUI.debug(MyApp.isDebug());
         if (SettingSPUtils.getInstance().isUseCustomFont()) {
             //设置默认字体为华文行楷
-           XUI.getInstance().initFontStyle("fonts/hwxk.ttf");
+            XUI.initFontStyle("fonts/hwxk.ttf");
         }
         PictureFileUtils.setAppName("xui");
 
@@ -82,5 +82,4 @@ public static boolean isDebug() {
     }
 
 
-
 }

app/src/main/java/com/xuexiang/xuidemo/activity/MainActivity.java

@@ -1,11 +1,13 @@
 package com.xuexiang.xuidemo.activity;
 
+import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -36,6 +38,7 @@
 import com.xuexiang.xuidemo.utils.XToastUtils;
 import com.xuexiang.xutil.common.ClickUtils;
 import com.xuexiang.xutil.system.DeviceUtils;
+import com.yarolegovich.slidingrootnav.SlideGravity;
 import com.yarolegovich.slidingrootnav.SlidingRootNav;
 import com.yarolegovich.slidingrootnav.SlidingRootNavBuilder;
 import com.yarolegovich.slidingrootnav.callback.DragStateListener;
@@ -77,11 +80,18 @@ protected void onCreate(Bundle savedInstanceState) {
         //登记一下
         MobclickAgent.onProfileSignIn(DeviceUtils.getAndroidID());
 
+        initData();
+
         initSlidingMenu(savedInstanceState);
 
         initViews();
     }
 
+    private void initData() {
+        mMenuTitles = ResUtils.getStringArray(R.array.menu_titles);
+        mMenuIcons = ResUtils.getDrawableArray(this, R.array.menu_icons);
+    }
+
     @Override
     protected boolean isSupportSlideBack() {
         return false;
@@ -147,6 +157,12 @@ public void onTabReselected(TabLayout.Tab tab) {
         });
     }
 
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        initSlidingMenu(null);
+    }
 
     public void openMenu() {
         if (mSlidingRootNav != null) {
@@ -168,10 +184,8 @@ public boolean isMenuOpen() {
     }
 
     private void initSlidingMenu(Bundle savedInstanceState) {
-        mMenuTitles = ResUtils.getStringArray(R.array.menu_titles);
-        mMenuIcons = ResUtils.getDrawableArray(this, R.array.menu_icons);
-
         mSlidingRootNav = new SlidingRootNavBuilder(this)
+                .withGravity(ResUtils.isRtl() ? SlideGravity.RIGHT : SlideGravity.LEFT)
                 .withMenuOpened(false)
                 .withContentClickableWhenMenuOpened(false)
                 .withSavedState(savedInstanceState)

app/src/main/java/com/xuexiang/xuidemo/adapter/NewsCardViewListAdapter.java

@@ -1,11 +1,19 @@
 package com.xuexiang.xuidemo.adapter;
 
+import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 
 import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
 import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
+import com.xuexiang.xui.utils.WidgetUtils;
 import com.xuexiang.xuidemo.R;
 import com.xuexiang.xuidemo.adapter.entity.NewInfo;
+import com.xuexiang.xuidemo.fragment.components.refresh.diffutil.DiffUtilCallback;
+import com.xuexiang.xutil.common.CollectionUtils;
+import com.xuexiang.xutil.common.logger.Logger;
+
+import java.util.List;
 
 /**
  * @author XUE
@@ -32,4 +40,43 @@ public void bindData(@NonNull RecyclerViewHolder holder, int position, NewInfo m
         }
     }
 
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position, @NonNull List<Object> payloads) {
+        if (CollectionUtils.isEmpty(payloads)) {
+            Logger.e("正在进行全量刷新:" + position);
+            onBindViewHolder(holder, position);
+            return;
+        }
+        // payloads为非空的情况，进行局部刷新
+
+        //取出我们在getChangePayload（）方法返回的bundle
+        Bundle payload = WidgetUtils.getChangePayload(payloads);
+        if (payload == null) {
+            return;
+        }
+
+        Logger.e("正在进行增量刷新:" + position);
+        NewInfo newInfo = getItem(position);
+        for (String key : payload.keySet()) {
+            switch (key) {
+                case DiffUtilCallback.PAYLOAD_USER_NAME:
+                    //这里可以用payload里的数据，不过newInfo也是新的 也可以用
+                    holder.text(R.id.tv_user_name, newInfo.getUserName());
+                    break;
+                case DiffUtilCallback.PAYLOAD_PRAISE:
+                    holder.text(R.id.tv_praise, payload.getInt(DiffUtilCallback.PAYLOAD_PRAISE) == 0 ? "点赞" : String.valueOf(payload.getInt(DiffUtilCallback.PAYLOAD_PRAISE)));
+                    break;
+                case DiffUtilCallback.PAYLOAD_COMMENT:
+                    holder.text(R.id.tv_comment, payload.getInt(DiffUtilCallback.PAYLOAD_COMMENT) == 0 ? "评论" : String.valueOf(payload.getInt(DiffUtilCallback.PAYLOAD_COMMENT)));
+                    break;
+                case DiffUtilCallback.PAYLOAD_READ_NUMBER:
+                    holder.text(R.id.tv_read, "阅读量 " + payload.getInt(DiffUtilCallback.PAYLOAD_READ_NUMBER));
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
 }

app/src/main/java/com/xuexiang/xuidemo/adapter/dropdownmenu/CityDropDownAdapter.java

@@ -55,10 +55,10 @@ protected void convert(ViewHolder holder, String item, int position) {
         if (mSelectPosition != -1) {
             if (mSelectPosition == position) {
                 holder.mText.setSelected(true);
-                holder.mText.setCompoundDrawablesWithIntrinsicBounds(null, null, ResUtils.getVectorDrawable(holder.mText.getContext(), R.drawable.ic_checked_right), null);
+                holder.mText.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, ResUtils.getVectorDrawable(holder.mText.getContext(), R.drawable.ic_checked_right), null);
             } else {
                 holder.mText.setSelected(false);
-                holder.mText.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+                holder.mText.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, null, null);
             }
         }
     }

app/src/main/java/com/xuexiang/xuidemo/adapter/entity/NewInfo.java

@@ -2,14 +2,20 @@
 
 import androidx.annotation.NonNull;
 
+import java.util.concurrent.atomic.AtomicLong;
+
 /**
  * 新闻信息
  *
  * @author xuexiang
  * @since 2019/4/7 下午12:07
  */
-public class NewInfo {
+public class NewInfo implements Cloneable {
+
+    private static AtomicLong sAtomicLong = new AtomicLong();
 
+
+    private long ID;
     /**
      * 用户名
      */
@@ -76,6 +82,7 @@ public NewInfo(String tag, String title, String summary, String imageUrl, String
 
 
     public NewInfo(String tag, String title) {
+        ID = sAtomicLong.incrementAndGet();
         Tag = tag;
         Title = title;
 
@@ -84,7 +91,21 @@ public NewInfo(String tag, String title) {
         Read = (int) (Math.random() * 500 + 50);
     }
 
+    public NewInfo resetContent() {
+        Praise = (int) (Math.random() * 100 + 5);
+        Comment = (int) (Math.random() * 50 + 5);
+        Read = (int) (Math.random() * 500 + 50);
+        return this;
+    }
+
+    public NewInfo setID(long ID) {
+        this.ID = ID;
+        return this;
+    }
 
+    public long getID() {
+        return ID;
+    }
 
     public String getUserName() {
         return UserName;
@@ -182,4 +203,15 @@ public String toString() {
                 ", DetailUrl='" + DetailUrl + '\'' +
                 '}';
     }
+
+    @NonNull
+    @Override
+    public NewInfo clone() {
+        try {
+            return (NewInfo) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new NewInfo();
+    }
 }