优化代码写法及代码逻辑

Author: getActivity

app/src/main/java/com/hjq/demo/ui/activity/SplashActivity.java

@@ -2,6 +2,7 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.view.View;
 import androidx.annotation.NonNull;
@@ -28,6 +29,7 @@
  *    time   : 2018/10/18
  *    desc   : 闪屏界面
  */
+@SuppressLint("CustomSplashScreen")
 public final class SplashActivity extends AppActivity {
 
     private LottieAnimationView mLottieView;
@@ -106,9 +108,10 @@ protected ImmersionBar createStatusBarConfig() {
                 .hideBar(BarHide.FLAG_HIDE_BAR);
     }
 
+    @SuppressLint("MissingSuperCall")
     @Override
     public void onBackPressed() {
-        //禁用返回键
+        // 禁用返回键
         //super.onBackPressed();
     }
 

app/src/main/java/com/hjq/demo/ui/adapter/common/NavigationAdapter.java

@@ -70,6 +70,7 @@ public void setOnNavigationListener(@Nullable OnNavigationListener listener) {
      * {@link BaseAdapter.OnItemClickListener}
      */
 
+    @SuppressLint("NotifyDataSetChanged")
     @Override
     public void onItemClick(@NonNull RecyclerView recyclerView, @NonNull View itemView, int position) {
         if (mSelectedPosition == position) {

app/src/main/java/com/hjq/demo/ui/dialog/common/AddressDialog.java

@@ -40,6 +40,10 @@
  */
 public final class AddressDialog {
 
+    private static final int TYPE_PROVINCE = 0;
+    private static final int TYPE_CITY = 1;
+    private static final int TYPE_AREA = 2;
+
     public static final class Builder
             extends BaseDialog.Builder<Builder>
             implements TabAdapter.OnTabListener,
@@ -149,7 +153,7 @@ public Builder setProvince(String province) {
                 if (!province.equals(data.get(i).getName())) {
                     continue;
                 }
-                selectedAddress(0, i, false);
+                selectedAddress(TYPE_PROVINCE, i, false);
                 break;
             }
             return this;
@@ -178,7 +182,7 @@ public Builder setCity(String city) {
                 }
                 // 避开直辖市，因为选择省的时候已经自动跳过市区了
                 if (mAdapter.getItem(1).size() > 1) {
-                    selectedAddress(1, i, false);
+                    selectedAddress(TYPE_CITY, i, false);
                 }
                 break;
             }
@@ -220,22 +224,22 @@ public void onSelected(int recyclerViewPosition, int clickItemPosition) {
         @SuppressWarnings("all")
         private void selectedAddress(int type, int position, boolean smoothScroll) {
             switch (type) {
-                case 0:
+                case TYPE_PROVINCE:
                     // 记录当前选择的省份
                     mProvince = mAdapter.getItem(type).get(position).getName();
                     mTabAdapter.setItem(type, mProvince);
 
                     mTabAdapter.addItem(getString(R.string.address_hint));
-                    mTabAdapter.setSelectedPosition(type + 1);
+                    mTabAdapter.setSelectedPosition(TYPE_CITY);
                     mAdapter.addItem(AddressManager.getCityList(mAdapter.getItem(type).get(position).getNext()));
-                    mViewPager2.setCurrentItem(type + 1, smoothScroll);
+                    mViewPager2.setCurrentItem(TYPE_CITY, smoothScroll);
 
                     // 如果当前选择的是直辖市，就直接跳过选择城市，直接选择区域
-                    if (mAdapter.getItem(type + 1).size() == 1) {
-                        selectedAddress(type + 1, 0, false);
+                    if (mAdapter.getItem(TYPE_CITY).size() == 1) {
+                        selectedAddress(TYPE_CITY, 0, false);
                     }
                     break;
-                case 1:
+                case TYPE_CITY:
                     // 记录当前选择的城市
                     mCity = mAdapter.getItem(type).get(position).getName();
                     mTabAdapter.setItem(type, mCity);
@@ -251,13 +255,13 @@ private void selectedAddress(int type, int position, boolean smoothScroll) {
 
                     } else {
                         mTabAdapter.addItem(getString(R.string.address_hint));
-                        mTabAdapter.setSelectedPosition(type + 1);
+                        mTabAdapter.setSelectedPosition(TYPE_AREA);
                         mAdapter.addItem(AddressManager.getAreaList(mAdapter.getItem(type).get(position).getNext()));
-                        mViewPager2.setCurrentItem(type + 1, smoothScroll);
+                        mViewPager2.setCurrentItem(TYPE_AREA, smoothScroll);
                     }
 
                     break;
-                case 2:
+                case TYPE_AREA:
                     // 记录当前选择的区域
                     mArea = mAdapter.getItem(type).get(position).getName();
                     mTabAdapter.setItem(type, mArea);

app/src/main/java/com/hjq/demo/ui/dialog/common/AlbumDialog.java

@@ -68,24 +68,26 @@ public Builder setListener(@Nullable OnListener listener) {
         @Override
         public void onItemClick(@NonNull RecyclerView recyclerView, @NonNull View itemView, int position) {
             List<AlbumInfo> data = mAdapter.getData();
-
-            for (AlbumInfo info : data) {
-                if (info.isSelect()) {
-                    info.setSelect(false);
-                    break;
+            for (int i = 0; i < data.size(); i++) {
+                AlbumInfo albumInfo = data.get(i);
+                if (!albumInfo.isSelect()) {
+                    continue;
                 }
+                albumInfo.setSelect(false);
+                mAdapter.notifyItemChanged(i);
+                break;
             }
-            mAdapter.getItem(position).setSelect(true);
-            mAdapter.notifyDataSetChanged();
+
+            AlbumInfo albumInfo = mAdapter.getItem(position);
+            albumInfo.setSelect(true);
+            mAdapter.notifyItemChanged(position);
 
             // 延迟消失
             postDelayed(() -> {
-
                 if (mListener != null) {
-                    mListener.onSelected(getDialog(), position, mAdapter.getItem(position));
+                    mListener.onSelected(getDialog(), position, albumInfo);
                 }
                 dismiss();
-
             }, 300);
         }
 

app/src/main/java/com/hjq/demo/ui/dialog/common/SelectDialog.java

@@ -226,7 +226,7 @@ private Map<Integer, Object> getSelectSet() {
         /**
          * {@link BaseAdapter.OnItemClickListener}
          */
-
+        @SuppressLint("NotifyDataSetChanged")
         @Override
         public void onItemClick(@NonNull RecyclerView recyclerView, @NonNull View itemView, int position) {
             if (mSelectSet.containsKey(position)) {

app/src/main/java/com/hjq/demo/widget/PlayerView.java

@@ -190,9 +190,7 @@ public void run() {
     /**
      * 隐藏提示
      */
-    private final Runnable mHideMessageRunnable = () -> {
-        mMessageLayout.setVisibility(GONE);
-    };
+    private final Runnable mHideMessageRunnable = () -> mMessageLayout.setVisibility(GONE);
 
     public PlayerView(@NonNull Context context) {
         this(context, null);
@@ -579,12 +577,13 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         if (progress != 0) {
             // 记录当前播放进度
             mCurrentProgress = progress;
-        } else {
-            // 如果 Activity 返回到后台，progress 会等于 0，而 mVideoView.getDuration 会等于 -1
-            // 所以要避免在这种情况下记录当前的播放进度，以便用户从后台返回到前台的时候恢复正确的播放进度
-            if (mVideoView.getDuration() > 0) {
-                mCurrentProgress = progress;
-            }
+            return;
+        }
+
+        // 如果 Activity 返回到后台，progress 会等于 0，而 mVideoView.getDuration 会等于 -1
+        // 所以要避免在这种情况下记录当前的播放进度，以便用户从后台返回到前台的时候恢复正确的播放进度
+        if (mVideoView.getDuration() > 0) {
+            mCurrentProgress = 0;
         }
     }
 

app/src/main/java/com/hjq/demo/widget/webview/BrowserFullScreenController.java

@@ -47,13 +47,12 @@ public void enterFullScreen(@NonNull Activity activity, @Nullable View customVie
         mCustomViewCallback = callback;
 
         int currentActivityOrientation = activity.getRequestedOrientation();
-        int targetActivityOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
         // 如果当前 Activity 不是横屏，就将 Activity 设置成横屏
-        if (currentActivityOrientation != targetActivityOrientation) {
+        if (currentActivityOrientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
             try {
                 // 兼容问题：在 Android 8.0 的手机上可以固定 Activity 的方向，但是这个 Activity 不能是透明的，否则就会抛出异常
                 // 复现场景：只需要给 Activity 主题设置 <item name="android:windowIsTranslucent">true</item> 属性即可
-                activity.setRequestedOrientation(targetActivityOrientation);
+                activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
             } catch (IllegalStateException e) {
                 // java.lang.IllegalStateException: Only fullscreen activities can request orientation
                 e.printStackTrace();

app/src/main/java/com/hjq/demo/widget/webview/BrowserViewClient.java

@@ -57,6 +57,7 @@ public void onReceivedError(@NonNull WebView view, @NonNull WebResourceRequest r
     /**
      * 网页加载错误时回调，需要注意的是：这个方法会在 onPageFinished 之前调用
      */
+    @SuppressWarnings("deprecation")
     @Override
     public final void onReceivedError(@NonNull WebView view, int errorCode, @NonNull String description, @NonNull String failingUrl) {
         super.onReceivedError(view, errorCode, description, failingUrl);

app/src/main/res-common/layout/permission_description_popup.xml

@@ -21,9 +21,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginHorizontal="@dimen/dp_15"
             android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginRight="@dimen/dp_12"
             android:text="@string/common_permission_description_title"
             android:textColor="#333333"
             android:textSize="@dimen/sp_14"
@@ -33,9 +32,8 @@
             android:id="@+id/tv_permission_description_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginHorizontal="@dimen/dp_15"
             android:layout_marginTop="@dimen/dp_5"
-            android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_12"
             android:textColor="#666666"
             android:textSize="@dimen/sp_13"

library/base/src/main/java/com/hjq/base/BaseDialog.java

@@ -921,7 +921,6 @@ public BaseDialog create() {
                         mAnimStyle = BaseDialog.ANIM_RIGHT;
                         break;
                     default:
-                        mAnimStyle = BaseDialog.ANIM_DEFAULT;
                         break;
                 }
             }