From 5ab9e0519182073bd2fe094d14198cc46d06a3aa Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 29 Oct 2024 15:51:11 +0800
Subject: [PATCH] =?UTF-8?q?version:1.3.5=20fix:=20update:dock=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9F=AD=E4=BF=A1=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAsim=E5=8D=A1=E8=81=94=E7=B3=BB=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                          | 4 ++--
 .../xxpatx/os/activity/contact/AddContactActivity.java    | 2 +-
 .../xxpatx/os/activity/contact/ContactListActivity.java   | 8 ++++----
 .../java/com/xxpatx/os/activity/dock/DockActivity.java    | 1 +
 .../java/com/xxpatx/os/activity/main/MainActivity.java    | 3 ++-
 .../java/com/xxpatx/os/adapter/DockAppGridAdapter.java    | 3 +++
 .../com/xxpatx/os/adapter/DockAppSelectedAdapter.java     | 3 +++
 .../com/xxpatx/os/fragment/contact/ContactFragment.java   | 8 ++++----
 .../xxpatx/os/fragment/phone/contact/ContactFragment.java | 8 ++++----
 .../main/java/com/xxpatx/os/manager/AppStatusManager.java | 1 +
 app/src/main/java/com/xxpatx/os/utils/ApkUtils.java       | 1 +
 11 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ebbba13..b73371e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.xxpatx.os"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1035
-        versionName "1.3.4"
+        versionCode 1036
+        versionName "1.3.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java b/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java
index b8c847f..98e92a7 100644
--- a/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java
@@ -278,7 +278,7 @@ public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, Ac
                 return;
             }
             if (mViewDataBinding.tbSim.isToggleOn() == 1) {
-                createContact(name, phone);
+//                createContact(name, phone);
             } else {
                 Log.e("checkContact", "avatarFilePath: " + mViewModel.avatarFilePath);
                 mLoadingDialog.setLoadingText("正在上传");
diff --git a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java b/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java
index cbe8293..c84c963 100644
--- a/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java
@@ -85,10 +85,10 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
         mViewModel.getContactListData().observe(this, new Observer<List<Contact>>() {
             @Override
             public void onChanged(List<Contact> contacts) {
-                List<Contact> sim = getSIMContacts();
-                if (sim.size() != 0) {
-                    contacts.addAll(sim);
-                }
+//                List<Contact> sim = getSIMContacts();
+//                if (sim.size() != 0) {
+//                    contacts.addAll(sim);
+//                }
                 mContactAdapter.setContactList(contacts);
             }
         });
diff --git a/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java b/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java
index e16bcfb..bdc119c 100644
--- a/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java
@@ -44,6 +44,7 @@ public class DockActivity extends BaseMvvmActivity<DockViewModel, ActivityDockBi
     };
 
     public static final List<String> INCLUDE_SYSTEM_APP =new ArrayList<String>(){{
+        this.add("com.android.mms");//信息
         this.add("com.mediatek.camera");
     }};
 
diff --git a/app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java b/app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java
index 6759b4e..b0b737f 100644
--- a/app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java
@@ -258,7 +258,8 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
 //        decorView.setOnSystemUiVisibilityChangeListener(mOnSystemUiVisibilityChangeListener);
 //        // 隐藏导航栏
 //        hideNavigationBar();
-
+        ApkUtils.uninstall(MainActivity.this, "cn.etouch.ecalendar");
+        ApkUtils.disableApp(MainActivity.this, "cn.etouch.ecalendar");
     }
 
     private View.OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener =
diff --git a/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java b/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java
index 9d7087c..ae7e80f 100644
--- a/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java
+++ b/app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java
@@ -79,6 +79,9 @@ public class DockAppGridAdapter extends BaseAdapter {
             case "com.mediatek.camera":
                 holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera));
                 break;
+            case "com.android.mms":
+                holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui));
+                break;
             default:
                 holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, pkg));
         }
diff --git a/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java b/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java
index c2b0845..ae55e28 100644
--- a/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java
+++ b/app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java
@@ -62,6 +62,9 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
             case "com.mediatek.camera":
                 holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera));
                 break;
+            case "com.android.mms":
+                holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui));
+                break;
             default:
                 holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, dockApp.getPackageName()));
         }
diff --git a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java b/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java
index 13a68d6..f62a297 100644
--- a/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java
+++ b/app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java
@@ -204,10 +204,10 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
                 } else {
 //                    mViewDataBinding.clNodata.setVisibility(View.GONE);
 //                    mViewDataBinding.rvContact.setVisibility(View.VISIBLE);
-                    List<Contact> sim = getSIMContacts();
-                    if (sim.size() != 0) {
-                        contacts.addAll(sim);
-                    }
+//                    List<Contact> sim = getSIMContacts();
+//                    if (sim.size() != 0) {
+//                        contacts.addAll(sim);
+//                    }
                 }
                 mContactAdapter.setContactList(contacts);
             }
diff --git a/app/src/main/java/com/xxpatx/os/fragment/phone/contact/ContactFragment.java b/app/src/main/java/com/xxpatx/os/fragment/phone/contact/ContactFragment.java
index 9826992..c0fb9ed 100644
--- a/app/src/main/java/com/xxpatx/os/fragment/phone/contact/ContactFragment.java
+++ b/app/src/main/java/com/xxpatx/os/fragment/phone/contact/ContactFragment.java
@@ -103,11 +103,11 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
         mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() {
             @Override
             public void onChanged(List<Contact> contacts) {
-                List<Contact> sim = getSIMContacts();
+//                List<Contact> sim = getSIMContacts();
                 mViewDataBinding.tvPeople.setText(contacts.size() + "人");
-                if (sim.size() != 0) {
-                    contacts.addAll(sim);
-                }
+//                if (sim.size() != 0) {
+//                    contacts.addAll(sim);
+//                }
                 mContactAdapter.setContactList(contacts);
             }
         });
diff --git a/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java b/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java
index 588708d..1ad56e4 100644
--- a/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java
+++ b/app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java
@@ -62,6 +62,7 @@ public class AppStatusManager {
             addHidedApp("com.youloft.calendar");
             addHidedApp("com.honghui.huangli");
             ApkUtils.uninstall(mContext, "cn.etouch.ecalendar");
+            ApkUtils.disableApp(mContext, "cn.etouch.ecalendar");
             mMMKV.encode(CommonConfig.HIDE_CALENDAR_KEY, true);
             Log.e(TAG, "AppStatusManager: hide calendar");
         }
diff --git a/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java b/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java
index 2fcbfe5..67879d4 100644
--- a/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java
+++ b/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java
@@ -477,6 +477,7 @@ public class ApkUtils {
             pm.setApplicationEnabledSetting(pkg, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
             return true;
         } catch (Exception e) {
+            Log.e(TAG, "disableApp: " + e.getMessage());
             return false;
         }
     }