From f5b71fdcb2ad03c57324366e80dafba4dadfce01 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 14 Mar 2023 17:24:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B4=A9=E6=BA=83=E9=A2=84=E6=A1=88=20=20https://jira?= =?UTF-8?q?.shanqu.cc/browse/GHZS-1216?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DataUtils.java | 5 ++ .../fragment/MainWrapperFragment.java | 32 +++++++++++ .../fragment/user/RealNameInfoFragment.kt | 6 ++ .../ic_realname_error_arrow.png | Bin 0 -> 222 bytes .../ic_realname_error_close.png | Bin 0 -> 297 bytes .../ic_realname_error_hint.png | Bin 0 -> 3449 bytes .../ic_realname_error_arrow.png | Bin 0 -> 222 bytes .../ic_realname_error_close.png | Bin 0 -> 297 bytes .../ic_realname_error_hint.png | Bin 0 -> 3379 bytes app/src/main/res/layout/fragment_main.xml | 52 ++++++++++++++++++ .../main/res/layout/fragment_real_name.xml | 4 +- app/src/main/res/values/strings.xml | 4 ++ .../gamecenter/common/constant/Constants.java | 6 +- .../src/main/res/values-night/colors.xml | 3 +- module_common/src/main/res/values/colors.xml | 2 + .../gamecenter/login/entity/IdCardEntity.kt | 3 +- 16 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_arrow.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_close.png create mode 100644 app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_hint.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_realname_error_arrow.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_realname_error_close.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_realname_error_hint.png diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index e50c623ac5..f18f358b0f 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -13,6 +13,7 @@ import com.gh.base.GlobalActivityManager; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.common.base.activity.BaseActivity; import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.gamecenter.common.retrofit.BiResponse; import com.gh.gamecenter.common.utils.SensorsBridge; @@ -31,6 +32,8 @@ import com.halo.assistant.HaloApp; import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; +import org.greenrobot.eventbus.EventBus; + import io.reactivex.schedulers.Schedulers; import io.sentry.Sentry; import io.sentry.android.core.SentryAndroid; @@ -173,6 +176,8 @@ public class DataUtils { values.put(GhContentProvider.KEY_IS_ADULT, false); } + EventBus.getDefault().post(new EBReuse(Constants.EB_REALNAME_RESULT)); + // new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values); try { // Unknown URL content://com.gh.gamecenter.provider/certification diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 294e2a8c94..2b2167e815 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -34,10 +34,12 @@ import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.NewLogUtils; import com.gh.gamecenter.R; +import com.gh.gamecenter.ShellActivity; import com.gh.gamecenter.category2.CategoryV2Fragment; import com.gh.gamecenter.common.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.gamecenter.common.callback.BiCallback; import com.gh.gamecenter.common.callback.OnDoubleTapListener; +import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.common.syncpage.SyncPageRepository; @@ -45,6 +47,8 @@ import com.gh.gamecenter.common.tracker.TrackerLogger; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.core.utils.DisplayUtils; +import com.gh.gamecenter.core.utils.GsonUtils; +import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.databinding.FragmentMainBinding; import com.gh.gamecenter.entity.SubjectData; import com.gh.gamecenter.entity.SubjectRecommendEntity; @@ -58,6 +62,7 @@ import com.gh.gamecenter.game.GameFragment; import com.gh.gamecenter.game.columncollection.detail.ColumnCollectionDetailFragment; import com.gh.gamecenter.game.commoncollection.detail.CommonCollectionDetailFragment; import com.gh.gamecenter.gamecollection.square.GameCollectionSquareFragment; +import com.gh.gamecenter.login.entity.UserInfoEntity; import com.gh.gamecenter.message.MessageUnreadRepository; import com.gh.gamecenter.message.MessageUnreadViewModel; import com.gh.gamecenter.personal.HaloPersonalFragment; @@ -579,6 +584,33 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem } else { mBinding.mainTabCommunity.setVisibility(View.VISIBLE); } + } else if (Constants.EB_REALNAME_RESULT.equals(reuse.getType())) { + updateRealNameErrorContainer(); + } + } + + private void updateRealNameErrorContainer() { + String deviceCertificationInfoString = + SPUtils.getString(Constants.SP_DEVICE_CERTIFICATION_PREFIX + HaloApp.getInstance().getGid()); + + // 未点过关闭按钮并且处于实名认证失败状态的，显示提示 view + if (!SPUtils.getBoolean(Constants.SP_REALNAME_ERROR_HINT_IGNORED) + && !TextUtils.isEmpty(deviceCertificationInfoString)) { + UserInfoEntity entity = GsonUtils.fromJson(deviceCertificationInfoString, UserInfoEntity.class); + if (entity.getIdCard() != null + && entity.getIdCard().getStatus() == 2) { + mBinding.realNameErrorContainer.setVisibility(View.VISIBLE); + ExtensionsKt.enlargeTouchArea(mBinding.realNameErrorCloseIv, 100); + mBinding.realNameErrorCloseIv.setOnClickListener(v -> { + SPUtils.setBoolean(Constants.SP_REALNAME_ERROR_HINT_IGNORED, true); + mBinding.realNameErrorContainer.setVisibility(View.GONE); + }); + mBinding.realNameErrorContainer.setOnClickListener(v -> { + startActivity(ShellActivity.getIntent(requireActivity(), ShellActivity.Type.REAL_NAME_INFO, null)); + }); + } else { + mBinding.realNameErrorContainer.setVisibility(View.GONE); + } } } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt index 4396998c29..21b1d1cc24 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt @@ -218,6 +218,12 @@ class RealNameInfoFragment : ToolbarFragment() { for (i in 0 until idCard?.name!!.length - 1) { sb.append("*") } + + if (idCard.status == 1) { + mBinding.badgeHintTv.text = getText(R.string.realname_pending_badge_hint) + } else { + mBinding.badgeHintTv.text = getText(R.string.realname_success_badge_hint) + } mBinding.nameEt.setText(sb.toString()) mBinding.idCardEt.setText( idCard.id?.replace( diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_arrow.png b/app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..6e7d59f8fec6305275f7d50a744a76afabc56b7d GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}iUB?$u0ZEM85tcs0f1?G%eQQ!HLhvUoGe0wg}!^7Yyff1o1nk|4ie1|Q$Bu(0@qg#MZ5 z7cKq;6b|upaSYKopPX=j&1Ct4Pm$qkwHyQ=#B9y7+{Lg;=ve3ruT2-GZs1)b#8{## zJb~5X0_&~@CbkT&X$!SI7OZCqD`B0J!R5fD!R7FAQiIgadBTzf%nUu>ycnYPT=oE( O&*16m=d#Wzp$PyEM85tcs0f1?G%eQQ!HLhvUoGe0wg}!^7Yyff1o1nk|4ie1|Q$Bu(0@qg#MZ5 z7cKq;6rS(t;uxZFKK0^8-opkwtQX%OYPyr!TN0-ny`yZZWr(Fi+Jwg0My;M*o)Mmh zv`ZFzG5`Mkdu7}5``UN59C*pk%csk-^1#AQ1>T6IcRg8mEqSzrakj`2#|aE>YzC7K zxC-s?U~{X|(zACE4cby$e~(Tw~71_yV2E;OXk;vd$@?2>>WWa>M`t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_hint.png b/app/src/main/res/drawable-night-xxxhdpi/ic_realname_error_hint.png new file mode 100644 index 0000000000000000000000000000000000000000..4dcdd0431238691024888258c082e00c34b07391 GIT binary patch literal 3449 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 JWt~$(698jNOw9lQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_realname_error_close.png b/app/src/main/res/drawable-xxxhdpi/ic_realname_error_close.png new file mode 100644 index 0000000000000000000000000000000000000000..1c24bcf022b2f86547e6dcf754e25eb00bff8327 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}iUB?$u0Z<# zLg)XBoc=Fx{J+5E|6&&qcL`Wzk<0%@&K9X*-9Sa$B|(0{3_iYLVPWy{3H>wEUwQKa zh39*^IEHAPPrbNM@UQ`o+e3SW^!C!;O=~Xd8o38-4CLC?r2l=HPKV0swG-a{Zn*FH zYxeKozikd*elMCA_25f8Tf10O$b$VdbflrHmLAYgD=-31rG*gW(m&+N}Mq& z%*wW+)8!X%Y2LE4T*RAlXj`u!gQu&X%Q~loCIF(6cXI#$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_realname_error_hint.png b/app/src/main/res/drawable-xxxhdpi/ic_realname_error_hint.png new file mode 100644 index 0000000000000000000000000000000000000000..4f75500bc7bc8a66420cc2f5deaa1bb619fe0ba7 GIT binary patch literal 3379 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 JPDHLkV1nc;TYvxn literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 83cb23c90b..d5c95319ef 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -17,6 +17,58 @@ android:layout_above="@id/lightgame_tab_container" android:background="@drawable/shadow" /> + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e2ec674478..1aaa2963b1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -410,6 +410,10 @@ 安装游戏 使用云存档后，将会覆盖您畅玩助手内的相关游戏进度，若您想保留自己的游戏数据，请先上传您当前的游戏存档后再使用 + 您的实名认证未通过，请重新认证 + 您已完成实名认证，该信息仅自己可见 + 实名信息认证中...\n认证期间不影响您正常的游戏体验 + 去 设置偏好]]> ，让推荐更懂你的心~ diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java index 0a40202b26..5af507362d 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java @@ -459,7 +459,11 @@ public class Constants { public static final String VIDEO_OPTION_ALL = "video_option_all"; public static final String VIDEO_OPTION_WIFI = "video_option_wifi"; public static final String VIDEO_OPTION_CLOSE = "video_option_close"; - + public static final String AD_ICON_ACTIVE = "ad_icon_active"; public static final String IS_AD_DATA = "is_ad_data"; + + public static final String EB_REALNAME_RESULT = "realname_result"; + + public static final String SP_REALNAME_ERROR_HINT_IGNORED = "realname_error_hint_ignored"; } diff --git a/module_common/src/main/res/values-night/colors.xml b/module_common/src/main/res/values-night/colors.xml index c94dd3e253..39f40ea090 100644 --- a/module_common/src/main/res/values-night/colors.xml +++ b/module_common/src/main/res/values-night/colors.xml @@ -157,7 +157,8 @@ #FE7D20 #555555 - + + #423928 @android:color/black #08000000 diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index 99d31d7990..a102fd7811 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -167,6 +167,8 @@ #FE7D20 #CCCCCC + + #FFF6E5 @android:color/black #08000000 diff --git a/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt b/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt index e1bd16dcb4..58e3c16ac2 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/entity/IdCardEntity.kt @@ -10,5 +10,6 @@ class IdCardEntity( var revise: Boolean? = false, var minor: Boolean? = false, // 是否是未成年人 @SerializedName("id_photo") - var idPhoto: String? = null + var idPhoto: String? = null, + var status: Int = 0 // 实名状态，若为 1 代表正在实名中，为 2 代表实名失败需要重新实名 ) \ No newline at end of file