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.Adapter - + - + + 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