diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 8e1e9d3df..f55f09b2d 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -327,13 +327,13 @@ public class MainActivity extends BaseMvpActivity UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); if (userInfo != null) { handleLinkedJump(this); - if (userInfo.isShowLimitCharge() && - PmDialogShowMrg.get().isHasShow() && - DemoCache.readNewUserChargeGift() == 1) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NUGIFT_POP_SHOW, getString(R.string.enjoy_the_popup_exposure)); - NewUserChargeGiftDialog.start(context); - DemoCache.saveNewUserChargeGift(2); - } +// if (userInfo.isShowLimitCharge() && +// PmDialogShowMrg.get().isHasShow() && +// DemoCache.readNewUserChargeGift() == 1) { +// StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NUGIFT_POP_SHOW, getString(R.string.enjoy_the_popup_exposure)); +// NewUserChargeGiftDialog.start(context); +// DemoCache.saveNewUserChargeGift(2); +// } // checkShowAnchorCardView(); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index b2c83de3c..dc0e8eb01 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -73,6 +73,8 @@ public class ChargeActivity extends BaseMvpActivity { if (isChecked) { + mTvProHint.setVisibility(View.GONE); DemoCache.saveBoolean(NEED_CHECKED_CHARGE_PROTOCOL, true); } }); + } @Override @@ -290,6 +294,10 @@ public class ChargeActivity extends BaseMvpActivity { + if (!mTvProtocol.isChecked()) { + mTvProHint.setVisibility(View.VISIBLE); + return; + } if (mChargePosition != -1) { ChargeBean bean = mChargeAdapter.getItem(mChargePosition); if (bean != null && bean.getSkuDetails() != null) { diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index 8c5c0584d..77f864242 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -111,6 +111,19 @@ android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" /> + Google登錄 選擇其他方式登錄 同意隱私政策和用戶協議後,才可以註冊登錄哦~ + 請勾選同意《用戶充值協議》 手機號 請輸入您的手機號/兔兔ID 請輸入您的密碼 diff --git a/app/src/module_community/res/layout/item_userinfo_dynamic.xml b/app/src/module_community/res/layout/item_userinfo_dynamic.xml index fa8fac0e6..fd4d18183 100644 --- a/app/src/module_community/res/layout/item_userinfo_dynamic.xml +++ b/app/src/module_community/res/layout/item_userinfo_dynamic.xml @@ -196,6 +196,7 @@ android:paddingEnd="0dp">