diff --git a/app/build.gradle b/app/build.gradle
index 3f742a3..aa77f6a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
applicationId "com.uiuios.aios"
minSdkVersion 24
targetSdkVersion 29
- versionCode 20
- versionName "2.9"
+ versionCode 22
+ versionName "3.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e430edd..ea7b6d8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,7 +117,8 @@
android:screenOrientation="sensorPortrait" />
+ android:launchMode="singleTask"
+ android:screenOrientation="landscape" />
diff --git a/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
index f003899..0b85f02 100644
--- a/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/NoticeActivity.java
@@ -95,7 +95,12 @@ public class NoticeActivity extends AppCompatActivity {
finish();
}
Log.e(TAG, "onCreate: " + alarmClockData);
- showData(alarmClockData);
+ jz_video.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ showData(alarmClockData);
+ }
+ },1234);
}
}
diff --git a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
index 50a1ae7..b15ff02 100644
--- a/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
+++ b/app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java
@@ -102,10 +102,10 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
is_twoscreen = Settings.Global.getInt(getContentResolver(), "is_twoscreen", 1) == 1;
if (is_twoscreen) {
-// appListIndex = 2;
-// defaultCurrent = 1;
-// mSecondFragment = new SecondFragment();
-// mFragments.add(mSecondFragment);
+ appListIndex = 2;
+ defaultCurrent = 1;
+ mSecondFragment = new SecondFragment();
+ mFragments.add(mSecondFragment);
}
mCustomFragment = new CustomFragment();
mFragments.add(mCustomFragment);
diff --git a/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
index 3cc1840..9fbfa81 100644
--- a/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
+++ b/app/src/main/java/com/uiuios/aios/adapter/ContactAdapter.java
@@ -3,6 +3,7 @@ package com.uiuios.aios.adapter;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
+import android.provider.Settings;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,6 +18,7 @@ import com.bumptech.glide.Glide;
import com.shehuan.niv.NiceImageView;
import com.uiuios.aios.R;
import com.uiuios.aios.bean.Contact;
+import com.uiuios.aios.utils.ToastUtil;
import java.util.List;
@@ -44,6 +46,11 @@ public class ContactAdapter extends RecyclerView.Adapter excludeClassName = new HashSet() {{
@@ -171,7 +176,6 @@ public class ApkUtils {
if (!TextUtils.isEmpty(appListString)) {
packageList = new ArrayList<>(Arrays.asList(appListString.split(",")));
}
- int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1);
for (ResolveInfo resolveInfo : resolveinfoList) {
String pkg = resolveInfo.activityInfo.packageName;
if (appIsDisable(context, pkg)) {
@@ -184,15 +188,16 @@ public class ApkUtils {
resolveInfos.add(resolveInfo);
}
} else {
- if (setting_other_appInstaller == 0) {//不显示自己安装的
- if (packageList.contains(pkg)) {
- resolveInfos.add(resolveInfo);
- }
- } else {
+// int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 1);
+// if (setting_other_appInstaller == 0) {//不显示自己安装的
+// if (packageList.contains(pkg)) {
+// resolveInfos.add(resolveInfo);
+// }
+// } else {
if (allowPackages.contains(pkg) && !excludePackageName.contains(pkg)) {
resolveInfos.add(resolveInfo);
}
- }
+// }
}
}
if (Settings.Global.getInt(context.getContentResolver(), "is_activity", 0) == 0) {
@@ -235,9 +240,9 @@ public class ApkUtils {
desktopIcons.add(0, dailyIcon);
DesktopIcon familyIcon = new DesktopIcon();
- familyIcon.setIcon(context.getDrawable(R.drawable.icon_family_space));
- familyIcon.setLable("家庭空间");
- familyIcon.setPackageName("aios.family");
+ familyIcon.setIcon(context.getDrawable(R.drawable.com_android_appstore));
+ familyIcon.setLable("应用市场");
+ familyIcon.setPackageName("aios.appstore");
desktopIcons.add(1, familyIcon);
return desktopIcons;
diff --git a/app/src/main/java/com/uiuios/aios/utils/IconUtils.java b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java
index 4434da7..7b0f4ce 100644
--- a/app/src/main/java/com/uiuios/aios/utils/IconUtils.java
+++ b/app/src/main/java/com/uiuios/aios/utils/IconUtils.java
@@ -9,6 +9,7 @@ public class IconUtils {
public static List appClassNameList = new ArrayList() {{
this.add("com.uiuios.sn");//设别信息
this.add("com.uiuios.appstore");//应用市场
+ this.add("aios.appstore");//应用市场
this.add("com.uiui.weather");//天气
this.add("com.android.browser");//浏览器
this.add("com.uiuios.browser");//浏览器
@@ -47,6 +48,7 @@ public class IconUtils {
public static List appIconList = new ArrayList() {{
this.add("com_uiui_sn");
this.add("com_android_appstore");
+ this.add("com_android_appstore");
this.add("com_uiui_weather");
this.add("com_android_browser");
this.add("com_android_browser");
diff --git a/app/src/main/res/drawable-hdpi/com_android_appstore.png b/app/src/main/res/drawable-hdpi/com_android_appstore.png
index ec5d434..9b06c7c 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_appstore.png and b/app/src/main/res/drawable-hdpi/com_android_appstore.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_android_browser.png b/app/src/main/res/drawable-hdpi/com_android_browser.png
index c569613..b22f226 100644
Binary files a/app/src/main/res/drawable-hdpi/com_android_browser.png and b/app/src/main/res/drawable-hdpi/com_android_browser.png differ
diff --git a/app/src/main/res/drawable-hdpi/com_uiui_sn.png b/app/src/main/res/drawable-hdpi/com_uiui_sn.png
index 05e32b2..d52f4db 100644
Binary files a/app/src/main/res/drawable-hdpi/com_uiui_sn.png and b/app/src/main/res/drawable-hdpi/com_uiui_sn.png differ
diff --git a/app/src/main/res/drawable-hdpi/control_background.png b/app/src/main/res/drawable-hdpi/control_background.png
index 6661edb..85e9ea7 100644
Binary files a/app/src/main/res/drawable-hdpi/control_background.png and b/app/src/main/res/drawable-hdpi/control_background.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_contact_icon.png b/app/src/main/res/drawable-hdpi/home_contact_icon.png
index a6dbd79..0995d58 100644
Binary files a/app/src/main/res/drawable-hdpi/home_contact_icon.png and b/app/src/main/res/drawable-hdpi/home_contact_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_quick_app.png b/app/src/main/res/drawable-hdpi/home_quick_app.png
index 9ad3924..3a86c82 100644
Binary files a/app/src/main/res/drawable-hdpi/home_quick_app.png and b/app/src/main/res/drawable-hdpi/home_quick_app.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_reminder_icon.png b/app/src/main/res/drawable-hdpi/home_reminder_icon.png
index 7d4c936..9a69f4b 100644
Binary files a/app/src/main/res/drawable-hdpi/home_reminder_icon.png and b/app/src/main/res/drawable-hdpi/home_reminder_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_settings_icon.png b/app/src/main/res/drawable-hdpi/home_settings_icon.png
index e61d4e2..8f65c5a 100644
Binary files a/app/src/main/res/drawable-hdpi/home_settings_icon.png and b/app/src/main/res/drawable-hdpi/home_settings_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/home_sos_icon.png b/app/src/main/res/drawable-hdpi/home_sos_icon.png
index e5efd36..1186ffb 100644
Binary files a/app/src/main/res/drawable-hdpi/home_sos_icon.png and b/app/src/main/res/drawable-hdpi/home_sos_icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_daily_app.png b/app/src/main/res/drawable-hdpi/icon_daily_app.png
index b3b71c1..19013f4 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_daily_app.png and b/app/src/main/res/drawable-hdpi/icon_daily_app.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon_family_space.png b/app/src/main/res/drawable-hdpi/icon_family_space.png
index 999ee77..1d475b4 100644
Binary files a/app/src/main/res/drawable-hdpi/icon_family_space.png and b/app/src/main/res/drawable-hdpi/icon_family_space.png differ
diff --git a/app/src/main/res/drawable/control_background_item_dis.xml b/app/src/main/res/drawable/control_background_item_dis.xml
index ce87a19..824f480 100644
--- a/app/src/main/res/drawable/control_background_item_dis.xml
+++ b/app/src/main/res/drawable/control_background_item_dis.xml
@@ -2,7 +2,7 @@
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ok_background.xml b/app/src/main/res/drawable/ok_background.xml
index a246594..5c3afaa 100644
--- a/app/src/main/res/drawable/ok_background.xml
+++ b/app/src/main/res/drawable/ok_background.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml
index f2171a8..d54ad8c 100644
--- a/app/src/main/res/drawable/shape_thumb_icon.xml
+++ b/app/src/main/res/drawable/shape_thumb_icon.xml
@@ -8,5 +8,5 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tv_bg_noti.xml b/app/src/main/res/drawable/tv_bg_noti.xml
index 755f4dd..e0d0d3f 100644
--- a/app/src/main/res/drawable/tv_bg_noti.xml
+++ b/app/src/main/res/drawable/tv_bg_noti.xml
@@ -2,7 +2,7 @@
-
+
+
+
+ android:layout_height="match_parent"
+ android:layout_margin="@dimen/sp_16">
-
@@ -532,7 +532,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
- android:background="@drawable/custom_bg_health">
+ android:background="@drawable/custom_bg_app">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-land/item_notification.xml b/app/src/main/res/layout-land/item_notification.xml
index c2390ee..786aee1 100644
--- a/app/src/main/res/layout-land/item_notification.xml
+++ b/app/src/main/res/layout-land/item_notification.xml
@@ -47,7 +47,7 @@
android:maxLines="1"
android:singleLine="true"
android:text="提醒时间"
- android:textColor="@color/title_gray"
+ android:textColor="@color/white"
android:textSize="@dimen/sp_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-port/activity_contact.xml b/app/src/main/res/layout-port/activity_contact.xml
index 910a4d6..8cf0b7c 100644
--- a/app/src/main/res/layout-port/activity_contact.xml
+++ b/app/src/main/res/layout-port/activity_contact.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/control_background"
tools:context=".activity.contact.ContactActivity">
+
+
+ android:layout_height="match_parent"
+ android:layout_margin="@dimen/sp_16">
@@ -97,6 +98,7 @@
android:layout_width="@dimen/dp_68"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/cl_control"
app:layout_constraintStart_toEndOf="@+id/cl_wifi"
app:layout_constraintTop_toTopOf="parent">
@@ -155,7 +157,7 @@
android:maxEms="8"
android:maxLines="1"
android:singleLine="true"
- android:text="快捷设置"
+ android:text="控制中心"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
android:visibility="gone"
@@ -216,7 +218,7 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:text="天气预报"
- android:textColor="@color/white"
+ android:textColor="@color/title_gray"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -229,7 +231,7 @@
android:layout_marginEnd="@dimen/dp_48"
android:gravity="center_vertical"
android:text="10℃"
- android:textColor="@color/white"
+ android:textColor="@color/black"
android:textSize="@dimen/sp_38"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -243,7 +245,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:text="位置"
- android:textColor="@color/white"
+ android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/tv_temp"
@@ -256,7 +258,7 @@
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="天气"
- android:textColor="@color/white"
+ android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_location"
@@ -314,8 +316,8 @@
android:layout_height="@dimen/dp_68"
android:adjustViewBounds="true"
android:scaleType="centerInside"
- android:visibility="visible"
android:src="@drawable/home_reminder_icon"
+ android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -347,7 +349,7 @@
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="1"
- android:background="@drawable/custom_bg_alarm">
+ android:background="@drawable/custom_bg_sos">
@@ -604,7 +606,7 @@
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
- android:background="@drawable/custom_bg_health">
+ android:background="@drawable/custom_bg_app">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 50f2706..7d51e2a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 50f2706..7d51e2a 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 50f2706..7d51e2a 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 50f2706..7d51e2a 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index ec3102b..7d51e2a 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e6de816..5268c11 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,14 +20,15 @@
#8e6afb
#00D56B
- #3b6ab9
+ #ffffff
#ecfafd
- #e1e5fa
- #fadfdf
- #e0fbf3
+ #ffeeee
+ #e1e1ff
+ #d8fdfd
#e08c61
- #e8eafc
+ #47e08e
#fcf3e7
+ #fdf6dc
#eae8e8
#bbbaba