diff --git a/app/build.gradle b/app/build.gradle index ba64424..94737bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId "com.uiui.aios" minSdkVersion 24 targetSdkVersion 29 - versionCode 54 - versionName "6.3" + versionCode 55 + versionName "6.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java index 9f0cc70..94f0a42 100644 --- a/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/aios/activity/main/MainActivity.java @@ -186,6 +186,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { public void initData() { registmNewAppReceiver(); registerSOSNumberReceiver(); + registerUpdateDesktopReceiver(); mAlarmServiceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { @@ -344,7 +345,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { } } - private void getData(){ + private void getData() { if (!isNotificationListenersEnabled()) { ToastUtil.show("请授予\"" + getString(R.string.app_name) + "\"使用通知权"); gotoNotificationAccessSetting(this); @@ -483,6 +484,12 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { if (mNewAppReceiver != null) { unregisterReceiver(mNewAppReceiver); } + if (sosNumberReceiver != null) { + unregisterReceiver(sosNumberReceiver); + } + if (updateDesktopReceiver != null) { + unregisterReceiver(updateDesktopReceiver); + } } private void registmNewAppReceiver() { @@ -534,6 +541,27 @@ public class MainActivity extends BaseActivity implements MainContact.MainView { } } + private UpdateDesktopReceiver updateDesktopReceiver; + + private void registerUpdateDesktopReceiver() { + if (updateDesktopReceiver == null) { + updateDesktopReceiver = new UpdateDesktopReceiver(); + } + IntentFilter filter = new IntentFilter(); + filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); + filter.addAction("UPDATE_DESKTOP_ICON"); + registerReceiver(updateDesktopReceiver, filter); + } + + class UpdateDesktopReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + Log.e(TAG, "onReceive: " + intent.getAction()); + addData(); + } + } + @Override public void setSystemSettings() { mMainPresenter.getDesktopLayout(); diff --git a/app/src/main/java/com/uiui/aios/dialog/PrivacyPolicyDialog.java b/app/src/main/java/com/uiui/aios/dialog/PrivacyPolicyDialog.java index 8ed8651..b0f0d8d 100644 --- a/app/src/main/java/com/uiui/aios/dialog/PrivacyPolicyDialog.java +++ b/app/src/main/java/com/uiui/aios/dialog/PrivacyPolicyDialog.java @@ -80,7 +80,6 @@ public class PrivacyPolicyDialog extends AlertDialog { } }, 122, 128, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); spannableString.setSpan(new ForegroundColorSpan(Color.BLUE), 122, 128, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - // spannableString.setSpan(new ClickableSpan() { // @Override // public void onClick(@NonNull View widget) { @@ -88,7 +87,6 @@ public class PrivacyPolicyDialog extends AlertDialog { // } // }, 129, 137, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // spannableString.setSpan(new ForegroundColorSpan(Color.BLUE), 129, 137, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - tv_content.setText(spannableString); tv_content.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java index eba008f..f4b0cee 100644 --- a/app/src/main/java/com/uiui/aios/utils/ApkUtils.java +++ b/app/src/main/java/com/uiui/aios/utils/ApkUtils.java @@ -27,6 +27,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.text.Collator; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -163,6 +164,13 @@ public class ApkUtils { Log.i(TAG, "queryFilterAppInfo: " + resolveInfo.activityInfo.packageName); allowPackages.add(resolveInfo.activityInfo.packageName); } + String appListString = Settings.System.getString(context.getContentResolver(), "only_jgy_shortcut_list"); + List packageList = new ArrayList<>(); + if (!TextUtils.isEmpty(appListString)) { + packageList = new ArrayList<>(Arrays.asList(appListString.split(","))); + } + + int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 0); for (ApplicationInfo app : appInfos) { if (appIsDisable(context, app.packageName)) { @@ -175,12 +183,14 @@ public class ApkUtils { applicationInfos.add(app); } } else { -// if(app.uid > 10000){//通过uid排除系统应用,在一些手机上效果不好 -// applicationInfos.add(app); -// } - if (allowPackages.contains(app.packageName) && !excludePackageName.contains(app.packageName)) { -// if (allowPackages.contains(app.packageName)) { - applicationInfos.add(app); + if (setting_other_appInstaller == 0) {//不显示自己安装的 + if (packageList.contains(app.packageName)){ + applicationInfos.add(app); + } + }else { + if (allowPackages.contains(app.packageName) && !excludePackageName.contains(app.packageName)) { + applicationInfos.add(app); + } } } } @@ -188,7 +198,6 @@ public class ApkUtils { applicationInfos.removeIf(applicationInfo -> "com.uiui.city".equals(applicationInfo.packageName)); // applicationInfos.removeIf(applicationInfo -> "com.uiui.sn".equals(applicationInfo.packageName)); } - applicationInfos.sort(new Comparator() { @Override public int compare(ApplicationInfo o1, ApplicationInfo o2) { diff --git a/app/src/main/res/layout-land/fragment_control.xml b/app/src/main/res/layout-land/fragment_control.xml index 0329166..ad5faa3 100644 --- a/app/src/main/res/layout-land/fragment_control.xml +++ b/app/src/main/res/layout-land/fragment_control.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/control_background" tools:context=".fragment.ControlFragment"> @@ -79,7 +78,7 @@ android:id="@+id/cl_wifi" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -127,7 +126,7 @@ @@ -289,7 +288,7 @@ android:id="@+id/cl_bt" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -336,7 +335,7 @@ android:id="@+id/cl_battery" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -384,7 +383,7 @@ diff --git a/app/src/main/res/layout-land/fragment_custom.xml b/app/src/main/res/layout-land/fragment_custom.xml index 17495d3..72c14f8 100644 --- a/app/src/main/res/layout-land/fragment_custom.xml +++ b/app/src/main/res/layout-land/fragment_custom.xml @@ -20,10 +20,10 @@ android:id="@+id/cl_weather" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="4dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" + android:layout_marginEnd="@dimen/dp_2" + android:layout_marginBottom="@dimen/dp_2" android:layout_weight="3" android:background="@drawable/custom_bg_weather" android:visibility="visible"> @@ -43,8 +43,8 @@ android:id="@+id/textView3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="天气预报" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -71,7 +71,7 @@ android:id="@+id/tv_location" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/dp_2" android:text="位置" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -147,10 +147,10 @@ android:id="@+id/cl_clean" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="4dp" + android:layout_marginStart="@dimen/dp_2" + android:layout_marginTop="@dimen/dp_4" + android:layout_marginEnd="@dimen/dp_2" + android:layout_marginBottom="@dimen/dp_2" android:layout_weight="3" android:background="@drawable/custom_bg_clean" tools:ignore="NestedWeights"> @@ -159,8 +159,8 @@ android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="一键加速" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -182,8 +182,8 @@ @@ -213,8 +213,8 @@ android:id="@+id/textView7" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="紧急呼叫" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -256,7 +256,7 @@ - + @@ -265,8 +265,8 @@ - - + + @@ -303,10 +303,10 @@ android:id="@+id/cl_guard" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="8dp" - android:layout_marginTop="4dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_2" + android:layout_marginEnd="@dimen/dp_2" + android:layout_marginBottom="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/custom_bg_guard"> @@ -315,8 +315,8 @@ android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="爱心提醒" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -351,10 +351,10 @@ android:id="@+id/cl_health" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:layout_marginTop="4dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="8dp" + android:layout_marginStart="@dimen/dp_2" + android:layout_marginTop="@dimen/dp_2" + android:layout_marginEnd="@dimen/dp_2" + android:layout_marginBottom="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/custom_bg_health"> @@ -362,8 +362,8 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="健康码" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -400,10 +400,10 @@ android:id="@+id/cl_contact" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:layout_marginTop="4dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="8dp" + android:layout_marginStart="@dimen/dp_2" + android:layout_marginTop="@dimen/dp_2" + android:layout_marginEnd="@dimen/dp_2" + android:layout_marginBottom="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/custom_bg_contact"> @@ -411,8 +411,8 @@ android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginStart="@dimen/dp_4" + android:layout_marginTop="@dimen/dp_4" android:text="通讯录" android:textColor="@color/white" android:textSize="@dimen/sp_16" @@ -436,10 +436,10 @@ android:id="@+id/cl_appstore" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginStart="4dp" - android:layout_marginTop="4dp" - android:layout_marginEnd="8dp" - android:layout_marginBottom="8dp" + android:layout_marginStart="@dimen/dp_2" + android:layout_marginTop="@dimen/dp_2" + android:layout_marginEnd="@dimen/dp_4" + android:layout_marginBottom="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/custom_bg_ai" android:visibility="gone"> @@ -447,8 +447,8 @@ @@ -74,7 +72,7 @@ android:id="@+id/cl_wifi" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -128,7 +126,7 @@ android:id="@+id/cl_bt" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -174,7 +172,7 @@ android:id="@+id/cl_battery" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="1" android:background="@drawable/control_background_item"> @@ -218,11 +216,10 @@ - @@ -416,7 +413,7 @@ android:id="@+id/cl_location" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_margin="@dimen/dp_8" + android:layout_margin="@dimen/dp_4" android:layout_weight="2" android:background="@drawable/control_background_item">