diff --git a/app/build.gradle b/app/build.gradle index b73371e..bf5e84c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.xxpatx.os" minSdkVersion 24 targetSdkVersion 29 - versionCode 1036 - versionName "1.3.5" + versionCode 1037 + versionName "1.3.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 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 b0b737f..dcbb96e 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 @@ -4,6 +4,7 @@ import android.Manifest; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -14,11 +15,15 @@ import android.database.Cursor; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.CallLog; import android.provider.ContactsContract; import android.provider.Settings; +import android.speech.tts.TextToSpeech; +import android.telephony.PhoneStateListener; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; @@ -81,10 +86,12 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Locale; import static com.arialyy.aria.core.inf.IEntity.STATE_RUNNING; -public class MainActivity extends BaseMvvmActivity implements NetworkUtils.OnNetworkStatusChangedListener, NotificationService.NotificationListener { +public class MainActivity extends BaseMvvmActivity implements NetworkUtils.OnNetworkStatusChangedListener, + NotificationService.NotificationListener, TextToSpeech.OnInitListener { private static final String TAG = "MainActivity"; @@ -107,8 +114,10 @@ public class MainActivity extends BaseMvvmActivity 0 && cursor.moveToFirst()) { + ret = cursor.getString(1); + cursor.close(); + } + return ret; + } + private void updateIconBg() { int size0 = NotificationService.getNotificationLength("com.android.dialer"); if (size0 == 0) { @@ -900,6 +986,7 @@ public class MainActivity extends BaseMvvmActivity mExcludeApp = new HashSet() {{ this.add("com.android.contacts"); this.add("com.android.dialer"); - this.add("com.mediatek.camera"); +// this.add("com.mediatek.camera"); this.add("cn.etouch.ecalendar"); }}; 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 67879d4..df84b0e 100644 --- a/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java +++ b/app/src/main/java/com/xxpatx/os/utils/ApkUtils.java @@ -180,12 +180,12 @@ public class ApkUtils { this.add("com.xxpatx.os"); this.add("com.xxpatx.store"); this.add("com.android.quicksearchbox"); - this.add("com.android.stk"); +// this.add("com.android.stk"); this.add("com.debug.loggerui"); this.add("com.mediatek.gnss.nonframeworklbs"); - this.add("com.tencent.mm"); - this.add("com.ss.android.ugc.aweme"); - this.add("com.mediatek.camera"); +// this.add("com.tencent.mm"); +// this.add("com.ss.android.ugc.aweme"); +// this.add("com.mediatek.camera"); this.add("cn.etouch.ecalendar"); }};