From 5bd102b891afc95bf30888cf121ea843469bd9b5 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Thu, 29 Dec 2022 11:47:32 +0800 Subject: [PATCH] =?UTF-8?q?version:7.3=20fix:=20update:=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../uiui/aios/activity/QuickAppActivity.java | 17 ++++++- .../activity/code/HealthCodeActivity.java | 19 +++----- .../com/uiui/aios/adapter/ContactAdapter.java | 2 +- .../java/com/uiui/aios/utils/IconUtils.java | 4 +- .../main/res/drawable-hdpi/dialer_icon.png | Bin 2959 -> 0 bytes .../main/res/drawable-hdpi/icon_dialer.png | Bin 0 -> 5933 bytes .../res/drawable/background_weather_rain.xml | 15 +++--- app/src/main/res/drawable/et_bg.xml | 2 +- app/src/main/res/drawable/join_background.xml | 4 +- .../main/res/drawable/joined_background.xml | 2 +- .../res/drawable/notice_voice_background.xml | 2 +- .../main/res/layout-land/activity_code.xml | 46 +++++++++++++++++- .../main/res/layout-land/activity_contact.xml | 2 +- .../main/res/layout-port/activity_code.xml | 46 +++++++++++++++++- .../main/res/layout-port/activity_contact.xml | 2 +- .../main/res/layout-port/fragment_custom.xml | 4 +- .../main/res/layout/dialog_privacy_policy.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- 19 files changed, 136 insertions(+), 39 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/dialer_icon.png create mode 100644 app/src/main/res/drawable-hdpi/icon_dialer.png diff --git a/app/build.gradle b/app/build.gradle index 8528013..602d01f 100644 --- 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" diff --git a/app/src/main/java/com/uiui/aios/activity/QuickAppActivity.java b/app/src/main/java/com/uiui/aios/activity/QuickAppActivity.java index 887f076..e4c65dd 100644 --- 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 hideApp = new HashSet() {{ + 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 appSelectBeanList = new ArrayList<>(); List 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); } diff --git a/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java b/app/src/main/java/com/uiui/aios/activity/code/HealthCodeActivity.java index c4e68f6..7b8e806 100644 --- 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); diff --git a/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java b/app/src/main/java/com/uiui/aios/adapter/ContactAdapter.java index 0a54666..1c2a7be 100644 --- 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.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 FV1f!;BP##^ diff --git a/app/src/main/res/drawable-hdpi/icon_dialer.png b/app/src/main/res/drawable-hdpi/icon_dialer.png new file mode 100644 index 0000000000000000000000000000000000000000..c657b8a672fff82c07c2b9983a6c2c339362f87c GIT binary patch literal 5933 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 R_xAy|fvyRxTKg99e*o)J`9S~x literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/background_weather_rain.xml b/app/src/main/res/drawable/background_weather_rain.xml index f8ef3be..e8f3c68 100644 --- a/app/src/main/res/drawable/background_weather_rain.xml +++ b/app/src/main/res/drawable/background_weather_rain.xml @@ -1,20 +1,17 @@ - + - + + android:bottomRightRadius="16dp" + android:topLeftRadius="16dp" + android:topRightRadius="16dp" /> + android:top="4dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/et_bg.xml b/app/src/main/res/drawable/et_bg.xml index 5514a47..a2e8f3d 100644 --- a/app/src/main/res/drawable/et_bg.xml +++ b/app/src/main/res/drawable/et_bg.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/join_background.xml b/app/src/main/res/drawable/join_background.xml index 66d24fe..604e336 100644 --- a/app/src/main/res/drawable/join_background.xml +++ b/app/src/main/res/drawable/join_background.xml @@ -1,9 +1,9 @@ - + - + - + - + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/constraintLayout" /> diff --git a/app/src/main/res/layout-port/activity_code.xml b/app/src/main/res/layout-port/activity_code.xml index f5d8be8..f97bda8 100644 --- 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"> + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/constraintLayout" /> diff --git a/app/src/main/res/layout-port/fragment_custom.xml b/app/src/main/res/layout-port/fragment_custom.xml index 756c6eb..36b0b29 100644 --- 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" /> diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index bfa90c4..1026000 100644 --- 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" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9dfe5a8..28d84e3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,7 +12,7 @@ #FFD3D3D3 #4880ff #F8B551 - #0480FF + #0480FF #4D4B50 #FF0000 #424144