Merge remote-tracking branch 'origin/master'

# Conflicts: # library/build.gradle
zhpanvip · Aug 16, 2021 · 29d7191 · 29d7191
2 parents a41ab4b + 49ee7a5
commit 29d7191
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 14 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,14 +6,16 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:name=".App"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity

diff --git a/app/src/main/java/com/zhpan/oneandroid/App.java b/app/src/main/java/com/zhpan/oneandroid/App.java
@@ -1,10 +1,17 @@
 package com.zhpan.oneandroid;
 
+import android.app.Activity;
 import android.app.Application;
+import android.os.Bundle;
+import android.os.Debug;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.blankj.utilcode.util.LogUtils;
 import com.zhpan.oneandroid.utils.UserInfoHelper;
 
+import java.io.File;
+
 /**
  * @author zhangpan
  * @date 2020/12/11
@@ -15,5 +22,50 @@ public void onCreate() {
         super.onCreate();
         LogUtils.e("App", "App onCreate");
         UserInfoHelper.INSTANCE.init(this);
+
+//        Debug.startMethodTracing(new File(getExternalFilesDir(""),"trace").getAbsolutePath(),8*1024*1024,1_000);
+//        Debug.startMethodTracingSampling(new File(getExternalFilesDir(""), "trace").getAbsolutePath(), 8 * 1024 * 1024, 1_000);
+        // 注册Activity生命周期监听回调
+        registerActivityLifecycleCallbacks(mActivityLifecycleCallbacks);
     }
+
+
+    private final ActivityLifecycleCallbacks mActivityLifecycleCallbacks=new ActivityLifecycleCallbacks() {
+        @Override
+        public void onActivityCreated(@NonNull Activity activity,
+            @Nullable Bundle savedInstanceState) {
+
+        }
+
+        @Override
+        public void onActivityStarted(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityResumed(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityPaused(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityStopped(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity,
+            @NonNull Bundle outState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {
+
+        }
+    };
 }
diff --git a/app/src/main/java/com/zhpan/oneandroid/adapter/BannerAdapter.kt b/app/src/main/java/com/zhpan/oneandroid/adapter/BannerAdapter.kt
@@ -4,6 +4,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import com.zhpan.bannerview.BaseBannerAdapter
+import com.zhpan.bannerview.BaseViewHolder
 import com.zhpan.oneandroid.R
 import com.zhpan.oneandroid.databinding.ItemBannerBinding
 import com.zhpan.oneandroid.model.bean.BannerBean
@@ -14,7 +15,7 @@ import com.zhpan.oneandroid.model.bean.BannerBean
  *   Description:
  * </pre>
  */
-class BannerAdapter : BaseBannerAdapter<BannerBean, BannerViewHolder>() {
+class BannerAdapter : BaseBannerAdapter<BannerBean>() {
     override fun getLayoutId(viewType: Int): Int {
         return R.layout.item_banner
     }
@@ -27,8 +28,9 @@ class BannerAdapter : BaseBannerAdapter<BannerBean, BannerViewHolder>() {
         return BannerViewHolder(itemView!!)
     }
 
-    override fun onBind(
-        holder: BannerViewHolder?,
+
+    override fun bindData(
+        holder: BaseViewHolder<BannerBean>?,
         data: BannerBean?,
         position: Int,
         pageSize: Int

diff --git a/app/src/main/java/com/zhpan/oneandroid/adapter/BannerViewHolder.kt b/app/src/main/java/com/zhpan/oneandroid/adapter/BannerViewHolder.kt
@@ -17,12 +17,12 @@ import com.zhpan.oneandroid.model.bean.BannerBean
 class BannerViewHolder(itemView: View) :
     BaseViewHolder<BannerBean>(itemView) {
     override fun bindData(data: BannerBean, position: Int, pageSize: Int) {
-        val imageView = findView<CornerImageView>(R.id.banner_image)
+        val imageView = findViewById<CornerImageView>(R.id.banner_image)
         Glide.with(imageView).load(data.imagePath).into(imageView)
     }
 
     init {
-        val imageView = findView<CornerImageView>(R.id.banner_image)
+        val imageView = findViewById<CornerImageView>(R.id.banner_image)
         imageView.setRoundCorner(BannerUtils.dp2px(0f))
     }
 }
diff --git a/app/src/main/java/com/zhpan/oneandroid/base/DataBindingAdapter.java b/app/src/main/java/com/zhpan/oneandroid/base/DataBindingAdapter.java
@@ -28,7 +28,7 @@
 public class DataBindingAdapter {
     @BindingAdapter(value = {"binding:adapter", "binding:indicator", "binding:pageClick"}, requireAll = false)
     public static void
-    bindBanner(BannerViewPager<BannerBean, BannerViewHolder> banner,
+    bindBanner(BannerViewPager<BannerBean> banner,
                BannerAdapter adapter, BaseIndicatorView indicatorView,
                BannerViewPager.OnPageClickListener pageClickListener) {
         Resources resources = banner.getContext().getResources();

diff --git a/app/src/main/java/com/zhpan/oneandroid/ui/main/MainActivity.kt b/app/src/main/java/com/zhpan/oneandroid/ui/main/MainActivity.kt
@@ -3,6 +3,7 @@ package com.zhpan.oneandroid.ui.main
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.os.Debug
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.ActionBarDrawerToggle
@@ -28,6 +29,11 @@ class MainActivity : BaseActivity<BaseViewModel, ActivityMainBinding>() {
         setListener()
     }
 
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+//        Debug.stopMethodTracing()
+    }
+
     private fun initView() {
         setTransparentStatusBar()
         with(viewPager2) {
@@ -46,11 +52,11 @@ class MainActivity : BaseActivity<BaseViewModel, ActivityMainBinding>() {
         }
         drawerLayout.apply {
             val drawerToggle = ActionBarDrawerToggle(
-                this@MainActivity,
-                this,
-                toolbar,
-                R.string.navigation_drawer_open,
-                R.string.navigation_drawer_close
+                    this@MainActivity,
+                    this,
+                    toolbar,
+                    R.string.navigation_drawer_open,
+                    R.string.navigation_drawer_close
             )
             addDrawerListener(drawerToggle)
             drawerToggle.syncState()
@@ -80,7 +86,7 @@ class MainActivity : BaseActivity<BaseViewModel, ActivityMainBinding>() {
         val userAvatar = nav_view.getHeaderView(0).findViewById<ImageView>(R.id.avatar)
         userName.text = UserInfoHelper.getUserName()
         Glide.with(userAvatar).load(UserInfoHelper.getUserAvatarUrl())
-            .placeholder(R.mipmap.ic_launcher).error(R.mipmap.ic_launcher).into(userAvatar);
+                .placeholder(R.mipmap.ic_launcher).error(R.mipmap.ic_launcher).into(userAvatar);
     }
 
     private fun setListener() {

diff --git a/library/build.gradle b/library/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.core:core-ktx:$core_ktx_version"
     api 'com.google.android.material:material:1.4.0-beta01'
-    api 'com.github.zhpanvip:BannerViewPager:3.5.1'
+    api 'com.github.zhpanvip:bannerviewpager:3.5.1'
     api 'com.airbnb.android:lottie:3.4.1'
     api 'com.google.android.material:material:1.3.0'
     api "androidx.navigation:navigation-fragment-ktx:2.3.5"