version:1.3.5

fix:
update:dock增加短信,去掉显示sim卡联系人
This commit is contained in:
2024-10-29 15:51:11 +08:00
parent d215329e28
commit 5ab9e05191
11 changed files with 26 additions and 16 deletions

View File

@@ -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"

View File

@@ -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("正在上传");

View File

@@ -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);
}
});

View File

@@ -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");
}};

View File

@@ -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 =

View File

@@ -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));
}

View File

@@ -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()));
}

View File

@@ -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);
}

View File

@@ -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);
}
});

View File

@@ -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");
}

View File

@@ -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;
}
}