From 05e5459e6b0ac4010be85b82558235805db6b1e5 Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 4 Nov 2025 00:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=95=BF=E6=8C=89app?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=88=96=E6=98=BE=E7=A4=BA=E6=97=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E4=BC=9A=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ttstd/dialer/activity/main/MainActivity.java  | 13 ++++++-------
 .../ttstd/dialer/fragment/app/AppFragment.java    | 15 ++++++++++-----
 .../com/ttstd/dialer/view/ApkPagerAdapter.java    | 12 ++++++++++++
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/ttstd/dialer/activity/main/MainActivity.java b/app/src/main/java/com/ttstd/dialer/activity/main/MainActivity.java
index d837d2a..0031c14 100644
--- a/app/src/main/java/com/ttstd/dialer/activity/main/MainActivity.java
+++ b/app/src/main/java/com/ttstd/dialer/activity/main/MainActivity.java
@@ -79,7 +79,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
 
         if (mSettingsFragment == null) {
             mSettingsFragment = new SettingsFragment();
-            mFragments.add(mContactFragment);
+            mFragments.add(mSettingsFragment);
             mFragmentSize += 1;
             mCurrentIndex += 1;
         }
@@ -153,23 +153,22 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
             int end = Math.min(start + APK_PER_FRAGMENT, mAppInfos.size());
             List<AppInfo> subList = new ArrayList<>(mAppInfos.subList(start, end));
             Log.e(TAG, "setAppList: subList size = " + subList.size());
-//            AppFragment fragment = AppFragment.newInstance(subList);
-            AppFragment fragment = new AppFragment(subList);
-            fragment.setUpdateCallback(new AppFragment.UpdateCallback() {
+//            AppFragment appFragment = AppFragment.newInstance(subList);
+            AppFragment appFragment = new AppFragment(subList);
+            Log.e(TAG, "setAppList: appFragment hashCode = " + appFragment.hashCode());
+            appFragment.setUpdateCallback(new AppFragment.UpdateCallback() {
                 @Override
                 public void onUpdate() {
                     mViewModel.getOutsideApp();
                 }
             });
-            mFragments.add(fragment);
+            mFragments.add(appFragment);
             Log.e(TAG, "setAppList: add mFragments size = " + mFragments.size());
         }
         mScaleCircleNavigator.setCircleCount(mFragments.size());
         mScaleCircleNavigator.notifyDataSetChanged();
 
         mApkPagerAdapter.setFragments(mFragments);
-        mApkPagerAdapter.notifyDataSetChanged();
-
     }
 
     public class BtnClick {
diff --git a/app/src/main/java/com/ttstd/dialer/fragment/app/AppFragment.java b/app/src/main/java/com/ttstd/dialer/fragment/app/AppFragment.java
index 17676f9..eae54f1 100644
--- a/app/src/main/java/com/ttstd/dialer/fragment/app/AppFragment.java
+++ b/app/src/main/java/com/ttstd/dialer/fragment/app/AppFragment.java
@@ -40,6 +40,7 @@ public class AppFragment extends BaseMvvmFragment<AppViewModel, FragmentAppBindi
 
     public AppFragment(List<AppInfo> appInfos) {
         mAppInfos = appInfos;
+        Log.e(TAG, "AppFragment: mAppInfos = " + mAppInfos.hashCode());
     }
 
     public interface UpdateCallback {
@@ -68,7 +69,7 @@ public class AppFragment extends BaseMvvmFragment<AppViewModel, FragmentAppBindi
 
     @Override
     protected void initView(Bundle bundle) {
-        Log.e(TAG, "initView: ");
+        Log.e(TAG, "initView: " + this.hashCode());
 
         mAppAdapter = new AppAdapter(LoaderManager.getInstance(this));
         mAppAdapter.setShortcutCallback(new AppAdapter.ShortcutCallback() {
@@ -81,6 +82,13 @@ public class AppFragment extends BaseMvvmFragment<AppViewModel, FragmentAppBindi
         mViewDataBinding.recyclerView.setLayoutManager(new GridLayoutManager(mContext, 3));
         mViewDataBinding.recyclerView.addItemDecoration(new EqualHeightDecoration(3));
         mViewDataBinding.recyclerView.setAdapter(mAppAdapter);
+
+        if (mAppInfos != null) {
+            Log.e(TAG, "initView: mAppInfos size = " + mAppInfos.size());
+            Log.e(TAG, "initView: mAppInfos = " + mAppInfos.hashCode());
+            mAppAdapter.setAppInfos(mAppInfos);
+        }
+
     }
 
     @Override
@@ -101,10 +109,7 @@ public class AppFragment extends BaseMvvmFragment<AppViewModel, FragmentAppBindi
 //        if (getArguments() != null) {
 //            mAppInfos = (List<AppInfo>) getArguments().getSerializable(ARG_APP_LIST);
 //        }
-        if (mAppInfos != null) {
-            Log.e(TAG, "initData: mAppInfos size = " + mAppInfos.size());
-            mAppAdapter.setAppInfos(mAppInfos);
-        }
+
     }
 
     @Override
diff --git a/app/src/main/java/com/ttstd/dialer/view/ApkPagerAdapter.java b/app/src/main/java/com/ttstd/dialer/view/ApkPagerAdapter.java
index 927e2e4..ac27330 100644
--- a/app/src/main/java/com/ttstd/dialer/view/ApkPagerAdapter.java
+++ b/app/src/main/java/com/ttstd/dialer/view/ApkPagerAdapter.java
@@ -16,6 +16,7 @@ public class ApkPagerAdapter extends FragmentPagerAdapter {
 
     public void setFragments(List<Fragment> fragments) {
         this.fragments = fragments;
+        notifyDataSetChanged();
     }
 
     @Override
@@ -33,4 +34,15 @@ public class ApkPagerAdapter extends FragmentPagerAdapter {
     public int getItemPosition(Object object) {
         return POSITION_NONE;
     }
+
+    @Override
+    public long getItemId(int position) {
+        // 返回Fragment的hashCode，或者任何能唯一标识该Fragment实例的值。
+        // 确保当fragments列表更新后，新的Fragment实例会有新的ID。
+        if (fragments != null && position < fragments.size()) {
+            return fragments.get(position).hashCode();
+        }
+        return super.getItemId(position);
+    }
+
 }
\ No newline at end of file