更换启动页背景，修改1.0.0页面布局

app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java

@@ -4,38 +4,23 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
-import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.EditText;
 
-import androidx.core.content.ContextCompat;
-
+import com.netease.nim.uikit.StatusBarUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.ui.login.helper.LogoutHelper;
-import com.yizhuan.erban.ui.setting.ResetPasswordActivity;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException;
-import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
-import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
 
@@ -79,7 +64,24 @@ public class LoginPasswordActivity extends BaseActivity {
         edtPhone.addTextChangedListener(textWatcher);
         edtPassword.addTextChangedListener(textWatcher);
         btnNext.setOnClickListener(v -> login());
-        findViewById(R.id.tv_forget_password).setOnClickListener(v -> ResetPasswordActivity.start(context, ResetPasswordActivity.FROM_NOT_LOGIN));
+        findViewById(R.id.tv_forget_password).setOnClickListener(v ->
+                getDialogManager().showOkCancelDialog("请联系客服处理", "我知道了", "", () -> {
+
+                })
+//                ResetPasswordActivity.start(context, ResetPasswordActivity.FROM_NOT_LOGIN)
+        );
+    }
+
+    @Override
+    protected void setStatusBar() {
+        super.setStatusBar();
+        StatusBarUtil.transparencyBar(this);
+        StatusBarUtil.StatusBarLightMode(this);
+    }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
     }
 
     @Override

app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java

@@ -19,6 +19,7 @@ import com.android.billingclient.api.SkuDetails;
 import com.appsflyer.AFInAppEventParameterName;
 import com.appsflyer.AFInAppEventType;
 import com.appsflyer.AppsFlyerLib;
+import com.netease.nim.uikit.StatusBarUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseMvpActivity;
 import com.yizhuan.erban.base.TitleBar;
@@ -80,6 +81,17 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
         initBilling();
     }
 
+    @Override
+    protected void setStatusBar() {
+        super.setStatusBar();
+        StatusBarUtil.transparencyBar(this);
+        StatusBarUtil.StatusBarLightMode(this);
+    }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
 
     /*初始化*/
     public void initBilling() {
@@ -230,7 +242,7 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
             mTitleBar.setLeftImageResource(R.drawable.arrow_left_white);
             mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent));
             mTitleBar.setLeftClickListener(v -> finish());
-            mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary));
+            mTitleBar.setActionTextColor(getResources().getColor(R.color.white));
             mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.charge_my_earnings)) {
                 @Override
                 public void performAction(View view) {

app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java

@@ -17,14 +17,21 @@ import android.view.WindowManager;
 
 import com.jungly.gridpasswordview.GridPasswordView;
 import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.trello.rxlifecycle3.android.FragmentEvent;
 import com.yizhuan.erban.R;
+import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.ui.setting.VerifyPhoneActivity;
 import com.yizhuan.erban.ui.wallet.ExchangeGoldActivity;
 import com.yizhuan.erban.ui.withdraw.WithdrawActivity;
+import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
+import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
+import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.util.Objects;
+
 //也可继承design中的BottomSheetDialogFragment
 public class PassWordFragment extends DialogFragment {
 
@@ -47,6 +54,8 @@ public class PassWordFragment extends DialogFragment {
     /**用于标识密码类型*/
     private int type = TYPE_DEFALUT;
 
+    private DialogManager mDialogManager;
+
     public static PassWordFragment newInstace(long value) {
         PassWordFragment passWordFragment = new PassWordFragment();
         Bundle bundle = new Bundle();
@@ -132,6 +141,14 @@ public class PassWordFragment extends DialogFragment {
         return view;
     }
 
+    public DialogManager getDialogManager() {
+        if (mDialogManager == null) {
+            mDialogManager = new DialogManager(getContext());
+            mDialogManager.setCanceledOnClickOutside(false);
+        }
+        return mDialogManager;
+    }
+
     private void init(View view) {
         if (getArguments() != null) {
             value = getArguments().getLong("values");

app/src/main/res/drawable/bg_common_confirm_press.xml

@@ -8,7 +8,7 @@
         android:startColor="#ED66FF"
         android:type="linear"
         android:useLevel="true" />
-    <corners android:radius="10dp" />
+    <corners android:radius="28dp" />
 
 
 </shape>

app/src/main/res/layout/activity_charge.xml

@@ -10,7 +10,7 @@
     <View
         android:id="@+id/iv_bg"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="210dp"
         android:background="@drawable/bg_common_normal"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -18,6 +18,7 @@
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_30"
         app:layout_constraintTop_toTopOf="parent"
         tools:layout_height="50dp" />
 

gradle.properties

@@ -24,5 +24,5 @@ only_arm64=false
 
 channel_file=channel.txt
 
-version_name=5.0.0
-version_code=500
+version_name=1.0.0
+version_code=100