version:7.3

fix: update:细节调整
2022-12-29 11:47:32 +08:00
parent f05d2aa40e
commit 5bd102b891
19 changed files with 136 additions and 39 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
        applicationId "com.uiui.aios"
        minSdkVersion 24
        targetSdkVersion 29
-        versionCode 62
-        versionName "7.1"
+        versionCode 64
+        versionName "7.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

--- a/app/src/main/java/com/uiui/aios/activity/QuickAppActivity.java
+++ b/app/src/main/java/com/uiui/aios/activity/QuickAppActivity.java
@@ -4,6 +4,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
+import android.util.Log;

 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -16,12 +17,16 @@ import com.uiui.aios.bean.AppSelectBean;
 import com.uiui.aios.view.GridSpaceItemDecoration;

 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;

 import butterknife.BindView;
 import butterknife.ButterKnife;

 public class QuickAppActivity extends BaseActivity {
+    private static final String TAG = QuickAppActivity.class.getSimpleName();
+
    public static final String QUICK_APP_KEY = "QuickAppPackageKey";
    public static final String QUICK_APP_REFRESH_KEY = "QuickAppRefreshKey";
    public static final String QUICK_APP_ENABLED_KEY = "QuickAppEnabledKey";
@@ -31,6 +36,15 @@ public class QuickAppActivity extends BaseActivity {
    @BindView(R.id.recyclerView)
    RecyclerView recyclerView;

+    private Set<String> hideApp = new HashSet<String>() {{
+        this.add(BuildConfig.APPLICATION_ID);
+        this.add("com.android.calendar");
+        this.add("com.android.dreams.basic");
+        this.add("com.android.musicfx");
+        this.add("com.uiui.appstore");
+        this.add("com.uiui.sn");
+    }};
+
    @Override
    public int getLayoutId() {
        return R.layout.activity_quick_app;
@@ -62,11 +76,12 @@ public class QuickAppActivity extends BaseActivity {
        List<AppSelectBean> appSelectBeanList = new ArrayList<>();
        List<PackageInfo> applicationInfos = pm.getInstalledPackages(0);
        for (PackageInfo packageInfo : applicationInfos) {
-            if (BuildConfig.APPLICATION_ID.equals(packageInfo.applicationInfo.packageName)) {
+            if (hideApp.contains(packageInfo.applicationInfo.packageName)) {
                continue;
            }
            final boolean isSystem = (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
            if (!listThirdParty || !isSystem) {
+                Log.e(TAG, "getPackageList: " + packageInfo.applicationInfo.packageName);
                AppSelectBean appSelectBean = new AppSelectBean(packageInfo.applicationInfo.loadLabel(pm).toString(), packageInfo.applicationInfo.packageName, packageInfo.applicationInfo.loadIcon(pm));
                appSelectBeanList.add(appSelectBean);
            }
--- a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java
+++ b/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java
@@ -1,23 +1,17 @@
 package com.uiui.aios.activity.code;

 import android.graphics.Color;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;

 import androidx.viewpager.widget.ViewPager;

 import com.bumptech.glide.Glide;
-import com.trello.rxlifecycle4.RxLifecycle;
-import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.uiui.aios.R;
 import com.uiui.aios.adapter.HealthCodeAdapter;
 import com.uiui.aios.base.BaseActivity;
-import com.uiui.aios.bean.BaseResponse;
 import com.uiui.aios.bean.HealthCode;
-import com.uiui.aios.network.NetInterfaceManager;
 import com.uiui.aios.utils.ToastUtil;
-import com.uiui.aios.utils.Utils;
 import com.uiui.aios.view.ScaleCircleNavigator;

 import net.lucode.hackware.magicindicator.MagicIndicator;
@@ -28,11 +22,6 @@ import java.util.List;

 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;

 public class HealthCodeActivity extends BaseActivity implements HealthCodeContact.CodeView {
    @BindView(R.id.viewPager)
@@ -41,6 +30,8 @@ public class HealthCodeActivity extends BaseActivity implements HealthCodeContac
    MagicIndicator mMagicIndicator;
    @BindView(R.id.iv_nodata)
    ImageView iv_nodata;
+    @BindView(R.id.iv_back)
+    ImageView iv_back;

    private HealthCodePresenter mPresenter;
    private HealthCodeAdapter mHealthCodeAdapter;
@@ -57,6 +48,12 @@ public class HealthCodeActivity extends BaseActivity implements HealthCodeContac
        mPresenter = new HealthCodePresenter(this);
        mPresenter.attachView(this);
        mPresenter.setLifecycle(lifecycleSubject);
+        iv_back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
        mHealthCodeAdapter = new HealthCodeAdapter();
        mViewPager.setAdapter(mHealthCodeAdapter);
        scaleCircleNavigator = new ScaleCircleNavigator(this);
--- a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java
+++ b/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java
@@ -60,7 +60,7 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactH
        contactHolder.tv_name.setText(contact.getName());
        if (DIALER_PACKAGE.equals(contact.getMobile())) {
            contactHolder.tv_phone.setText("");
-            Glide.with(contactHolder.iv_head).load(R.drawable.dialer_icon).error(R.drawable.dialer_icon).into(contactHolder.iv_head);
+            Glide.with(contactHolder.iv_head).load(R.drawable.icon_dialer).error(R.drawable.icon_dialer).into(contactHolder.iv_head);
        } else {
            contactHolder.tv_phone.setText(contact.getMobile());
            Glide.with(contactHolder.iv_head).load(contact.getAvatar()).error(R.drawable.default_head).into(contactHolder.iv_head);
--- a/app/src/main/java/com/uiui/aios/utils/IconUtils.java
+++ b/app/src/main/java/com/uiui/aios/utils/IconUtils.java
@@ -22,7 +22,7 @@ public class IconUtils {
        this.add("com.android.deskclock");//时钟
        this.add("com.android.dialer");//电话
        this.add("com.android.dialer");//电话
-//        this.add("com.android.gallery3d");//图库
+        this.add("com.android.gallery3d");//图库
        this.add("com.android.mms");//信息
        this.add("com.android.mms.ui");//信息
        this.add("com.android.messaging");//信息
@@ -60,7 +60,7 @@ public class IconUtils {
        this.add("com_android_deskclock");
        this.add("com_android_dialer");
        this.add("com_android_dialer");
-//        this.add("com_android_gallery3d_app");
+        this.add("com_android_gallery3d_app");
        this.add("com_android_mms_ui");
        this.add("com_android_mms_ui");
        this.add("com_android_mms_ui");
--- a/app/src/main/res/drawable-hdpi/dialer_icon.png
+++ b/app/src/main/res/drawable-hdpi/dialer_icon.png
--- a/app/src/main/res/drawable-hdpi/icon_dialer.png
+++ b/app/src/main/res/drawable-hdpi/icon_dialer.png
--- a/app/src/main/res/drawable/background_weather_rain.xml
+++ b/app/src/main/res/drawable/background_weather_rain.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <!-- 内部颜色 -->
-    <solid
-        android:color="#00b7ee" />
+    <solid android:color="@color/default_blue" />
    <!-- 圆角的幅度 -->
    <corners
-        android:topLeftRadius="16dp"
-        android:topRightRadius="16dp"
        android:bottomLeftRadius="16dp"
-        android:bottomRightRadius="16dp" />
+        android:bottomRightRadius="16dp"
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />

    <padding
-        android:top="4dp"
        android:bottom="4dp"
        android:left="4dp"
        android:right="4dp"
-        />
+        android:top="4dp" />
 </shape>
--- a/app/src/main/res/drawable/et_bg.xml
+++ b/app/src/main/res/drawable/et_bg.xml
@@ -4,5 +4,5 @@
    <stroke
        android:width="2px"
        android:color="@color/lightGray" />
-    <corners android:radius="@dimen/dp_8" />
+    <corners android:radius="@dimen/dp_4" />
 </shape>
--- a/app/src/main/res/drawable/join_background.xml
+++ b/app/src/main/res/drawable/join_background.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <!-- 内部颜色 -->
-    <solid android:color="@color/default_background_color" />
+    <solid android:color="@color/default_blue" />
    <!-- 圆角的幅度 -->
-    <corners android:radius="@dimen/dp_8" />
+    <corners android:radius="@dimen/dp_4" />

    <padding
        android:bottom="0dp"
--- a/app/src/main/res/drawable/joined_background.xml
+++ b/app/src/main/res/drawable/joined_background.xml
@@ -3,7 +3,7 @@
    <!-- 内部颜色 -->
    <solid android:color="@color/lightGray" />
    <!-- 圆角的幅度 -->
-    <corners android:radius="@dimen/dp_8" />
+    <corners android:radius="@dimen/dp_4" />

    <padding
        android:bottom="0dp"
--- a/app/src/main/res/drawable/notice_voice_background.xml
+++ b/app/src/main/res/drawable/notice_voice_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
    <!-- 内部颜色 -->
-    <solid android:color="@color/notice_blue" />
+    <solid android:color="@color/default_blue" />
    <!-- 圆角的幅度 -->
    <corners
        android:bottomLeftRadius="30dp"
--- a/app/src/main/res/layout-land/activity_code.xml
+++ b/app/src/main/res/layout-land/activity_code.xml
@@ -6,6 +6,50 @@
    android:layout_height="match_parent"
    tools:context=".activity.code.HealthCodeActivity">

+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_32"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:layout_marginStart="8dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/back_white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView5"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/family_space"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_back"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="家庭空间"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_18"
+            android:layout_marginStart="@dimen/dp_4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageView5"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewPager"
        android:layout_width="match_parent"
@@ -13,7 +57,7 @@
        app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />

    <net.lucode.hackware.magicindicator.MagicIndicator
        android:id="@+id/magicIndicator"
--- a/app/src/main/res/layout-land/activity_contact.xml
+++ b/app/src/main/res/layout-land/activity_contact.xml
@@ -9,7 +9,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/constraintLayout"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_40"
+        android:layout_height="@dimen/dp_32"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
--- a/app/src/main/res/layout-port/activity_code.xml
+++ b/app/src/main/res/layout-port/activity_code.xml
@@ -6,6 +6,50 @@
    android:layout_height="match_parent"
    tools:context=".activity.code.HealthCodeActivity">

+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_32"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:layout_marginStart="8dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/back_white"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView5"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/family_space"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_back"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="家庭空间"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_18"
+            android:layout_marginStart="@dimen/dp_4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageView5"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewPager"
        android:layout_width="match_parent"
@@ -13,7 +57,7 @@
        app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />

    <net.lucode.hackware.magicindicator.MagicIndicator
        android:id="@+id/magicIndicator"
--- a/app/src/main/res/layout-port/activity_contact.xml
+++ b/app/src/main/res/layout-port/activity_contact.xml
@@ -9,7 +9,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/constraintLayout"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_40"
+        android:layout_height="@dimen/dp_32"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
--- a/app/src/main/res/layout-port/fragment_custom.xml
+++ b/app/src/main/res/layout-port/fragment_custom.xml
@@ -424,11 +424,11 @@
                            android:layout_marginEnd="@dimen/dp_8"
                            app:cpvDuration="1000"
                            app:cpvLabelTextColor="@color/white"
-                            app:cpvLabelTextSize="26sp"
+                            app:cpvLabelTextSize="24sp"
                            app:cpvNormalColor="#c1d4c4"
                            app:cpvProgressColor="#27602f"
                            app:cpvShowTick="false"
-                            app:cpvStrokeWidth="@dimen/dp_4"
+                            app:cpvStrokeWidth="@dimen/dp_8"
                            app:layout_constraintBottom_toBottomOf="parent"
                            app:layout_constraintEnd_toEndOf="parent"
                            app:layout_constraintTop_toTopOf="parent" />
--- a/app/src/main/res/layout/dialog_privacy_policy.xml
+++ b/app/src/main/res/layout/dialog_privacy_policy.xml
@@ -77,7 +77,7 @@
                android:gravity="center"
                android:text="同意"
                android:textStyle="bold"
-                android:textColor="@color/notice_blue"
+                android:textColor="@color/default_blue"
                android:textSize="@dimen/sp_12"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="@+id/tv_content"
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,7 +12,7 @@
    <color name="lightGray">#FFD3D3D3</color>
    <color name="tv_add_color">#4880ff</color>
    <color name="yellow">#F8B551</color>
-    <color name="notice_blue">#0480FF</color>
+    <color name="default_blue">#0480FF</color>
    <color name="ok_button">#4D4B50</color>
    <color name="red">#FF0000</color>
    <color name="actions_item_pressed">#424144</color>