tt/VscoolOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.3.5

Browse Source 
fix:
update:dock增加短信，去掉显示sim卡联系人
This commit is contained in:
tongtongstudio
2024-10-29 15:51:11 +08:00
parent d215329e28
commit 5ab9e05191
11 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -15,8 +15,8 @@ android {
applicationId "com.xxpatx.os" applicationId "com.xxpatx.os"
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 1035 versionCode 1036
versionName "1.3.4" versionName "1.3.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

2
app/src/main/java/com/xxpatx/os/activity/contact/AddContactActivity.java
View File

@@ -278,7 +278,7 @@ public class AddContactActivity extends BaseMvvmActivity<AddContactViewModel, Ac
return; return;
} }
if (mViewDataBinding.tbSim.isToggleOn() == 1) { if (mViewDataBinding.tbSim.isToggleOn() == 1) {
createContact(name, phone); // createContact(name, phone);
} else { } else {
Log.e("checkContact", "avatarFilePath: " + mViewModel.avatarFilePath); Log.e("checkContact", "avatarFilePath: " + mViewModel.avatarFilePath);
mLoadingDialog.setLoadingText("正在上传"); mLoadingDialog.setLoadingText("正在上传");

8
app/src/main/java/com/xxpatx/os/activity/contact/ContactListActivity.java
View File

@@ -85,10 +85,10 @@ public class ContactListActivity extends BaseMvvmActivity<ContactListViewModel,
mViewModel.getContactListData().observe(this, new Observer<List<Contact>>() { mViewModel.getContactListData().observe(this, new Observer<List<Contact>>() {
@Override @Override
public void onChanged(List<Contact> contacts) { public void onChanged(List<Contact> contacts) {
List<Contact> sim = getSIMContacts(); // List<Contact> sim = getSIMContacts();
if (sim.size() != 0) { // if (sim.size() != 0) {
contacts.addAll(sim); // contacts.addAll(sim);
} // }
mContactAdapter.setContactList(contacts); mContactAdapter.setContactList(contacts);
} }
}); });

1
app/src/main/java/com/xxpatx/os/activity/dock/DockActivity.java
View File

@@ -44,6 +44,7 @@ public class DockActivity extends BaseMvvmActivity<DockViewModel, ActivityDockBi
}; };
public static final List<String> INCLUDE_SYSTEM_APP =new ArrayList<String>(){{ public static final List<String> INCLUDE_SYSTEM_APP =new ArrayList<String>(){{
this.add("com.android.mms");//信息
this.add("com.mediatek.camera"); this.add("com.mediatek.camera");
}}; }};

3
app/src/main/java/com/xxpatx/os/activity/main/MainActivity.java
View File

@@ -258,7 +258,8 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
// decorView.setOnSystemUiVisibilityChangeListener(mOnSystemUiVisibilityChangeListener); // decorView.setOnSystemUiVisibilityChangeListener(mOnSystemUiVisibilityChangeListener);
// // 隐藏导航栏 // // 隐藏导航栏
// hideNavigationBar(); // hideNavigationBar();
ApkUtils.uninstall(MainActivity.this, "cn.etouch.ecalendar");
ApkUtils.disableApp(MainActivity.this, "cn.etouch.ecalendar");
} }
private View.OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener = private View.OnSystemUiVisibilityChangeListener mOnSystemUiVisibilityChangeListener =

3
app/src/main/java/com/xxpatx/os/adapter/DockAppGridAdapter.java
View File

@@ -79,6 +79,9 @@ public class DockAppGridAdapter extends BaseAdapter {
case "com.mediatek.camera": case "com.mediatek.camera":
holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera)); holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera));
break; break;
case "com.android.mms":
holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui));
break;
default: default:
holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, pkg)); holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, pkg));
} }

3
app/src/main/java/com/xxpatx/os/adapter/DockAppSelectedAdapter.java
View File

@@ -62,6 +62,9 @@ public class DockAppSelectedAdapter extends RecyclerView.Adapter<DockAppSelected
case "com.mediatek.camera": case "com.mediatek.camera":
holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera)); holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_camera));
break; break;
case "com.android.mms":
holder.iv_icon.setImageDrawable(mContext.getDrawable(R.drawable.com_android_mms_ui));
break;
default: default:
holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, dockApp.getPackageName())); holder.iv_icon.setImageDrawable(ApkUtils.getAppDrawable(mContext, dockApp.getPackageName()));
} }

8
app/src/main/java/com/xxpatx/os/fragment/contact/ContactFragment.java
View File

@@ -204,10 +204,10 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
} else { } else {
// mViewDataBinding.clNodata.setVisibility(View.GONE); // mViewDataBinding.clNodata.setVisibility(View.GONE);
// mViewDataBinding.rvContact.setVisibility(View.VISIBLE); // mViewDataBinding.rvContact.setVisibility(View.VISIBLE);
List<Contact> sim = getSIMContacts(); // List<Contact> sim = getSIMContacts();
if (sim.size() != 0) { // if (sim.size() != 0) {
contacts.addAll(sim); // contacts.addAll(sim);
} // }
} }
mContactAdapter.setContactList(contacts); mContactAdapter.setContactList(contacts);
} }

8
app/src/main/java/com/xxpatx/os/fragment/phone/contact/ContactFragment.java
View File

@@ -103,11 +103,11 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() { mViewModel.mContactListData.observe(this, new Observer<List<Contact>>() {
@Override @Override
public void onChanged(List<Contact> contacts) { public void onChanged(List<Contact> contacts) {
List<Contact> sim = getSIMContacts(); // List<Contact> sim = getSIMContacts();
mViewDataBinding.tvPeople.setText(contacts.size() + "人"); mViewDataBinding.tvPeople.setText(contacts.size() + "人");
if (sim.size() != 0) { // if (sim.size() != 0) {
contacts.addAll(sim); // contacts.addAll(sim);
} // }
mContactAdapter.setContactList(contacts); mContactAdapter.setContactList(contacts);
} }
}); });

1
app/src/main/java/com/xxpatx/os/manager/AppStatusManager.java
View File

@@ -62,6 +62,7 @@ public class AppStatusManager {
addHidedApp("com.youloft.calendar"); addHidedApp("com.youloft.calendar");
addHidedApp("com.honghui.huangli"); addHidedApp("com.honghui.huangli");
ApkUtils.uninstall(mContext, "cn.etouch.ecalendar"); ApkUtils.uninstall(mContext, "cn.etouch.ecalendar");
ApkUtils.disableApp(mContext, "cn.etouch.ecalendar");
mMMKV.encode(CommonConfig.HIDE_CALENDAR_KEY, true); mMMKV.encode(CommonConfig.HIDE_CALENDAR_KEY, true);
Log.e(TAG, "AppStatusManager: hide calendar"); Log.e(TAG, "AppStatusManager: hide calendar");
} }

1
app/src/main/java/com/xxpatx/os/utils/ApkUtils.java
View File

@@ -477,6 +477,7 @@ public class ApkUtils {
pm.setApplicationEnabledSetting(pkg, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0); pm.setApplicationEnabledSetting(pkg, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "disableApp: " + e.getMessage());
return false; return false;
} }
} }