diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java index 9dc389494..c2a4b35b0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java @@ -90,7 +90,7 @@ public class LoginCodeActivity extends BaseLoginAct { onFindViews(); initData(); onSetListener(); - getSmsCode(); +// getSmsCode(); } @SuppressLint("SetTextI18n") @@ -116,10 +116,10 @@ public class LoginCodeActivity extends BaseLoginAct { codeEt.setOnTextFinishListener(new CodeEditText.OnTextFinishListener() { @Override public void onTextFinish(CharSequence text, int length) { -// login(); + login(); // LogUtils.e(text.toString()); - Intent intent = new Intent(LoginCodeActivity.this,AddUserInfoActivity.class); - startActivity(intent); +// Intent intent = new Intent(LoginCodeActivity.this,AddUserInfoActivity.class); +// startActivity(intent); } }); } @@ -205,6 +205,7 @@ public class LoginCodeActivity extends BaseLoginAct { @Override public void onError(Throwable e) { toast(e.getMessage()); +// finish(); Logger.e(TAG, "获取短信失败!"); } }); @@ -220,6 +221,7 @@ public class LoginCodeActivity extends BaseLoginAct { String shuMeiDeviceId = SmAntiFraud.getDeviceId(); AuthModel.get().login( mPhone, + "123456aa", smsCode, yiDunLoginToken, shuMeiDeviceId) diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index ccca31799..e62986ce0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -9,13 +9,10 @@ import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.Button; -import android.widget.EditText; import android.widget.ImageView; import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.TextView; -import com.coorchice.library.utils.LogUtils; import com.fourmob.datetimepicker.date.DatePickerDialog; import com.jph.takephoto.model.TResult; import com.netease.nim.uikit.common.util.string.StringUtil; @@ -28,7 +25,6 @@ import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.ui.login.AddUserInfoActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; @@ -39,22 +35,17 @@ import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.utils.StringUtils; -import com.yizhuan.xchat_android_library.utils.TimeUtils; import java.io.File; import java.util.ArrayList; -import java.util.Calendar; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; import me.shihao.library.XRadioGroup; /** @@ -67,31 +58,23 @@ public class AddUserInfoFragment extends BaseFragment TimePickerDialog.OnTimeSetListener, ErbanTakePhotoActivity.TakePhotoCallBack { private static final String TAG = "AddUserInfoFragment"; - private CircleImageView civAvatar; private TextInputEditText tvNick; private TextInputEditText tvGender; -// private TextInputEditText tvBirthday; private Button okBtn; -// private TextView tvGenderMen; -// private TextView tvGenderWomen; - - private ImageView ivRandomAvatar; - - private TextView tvRandomNick; - -// private DatePickerDialog datePickerDialog; - +// private ImageView ivRandomAvatar; + private ImageView tvRandomNick; private String avatarUrl; private String avatarUrlWX; private File photoFile; - private int gender = -1; private XRadioGroup rgGender; private RadioButton rbMale; - private RadioButton rbFemale; - AddUserInfoActivity addUserInfoActivity; + // private TextInputEditText tvBirthday; + // private TextView tvGenderMen; + // private TextView tvGenderWomen; + // private DatePickerDialog datePickerDialog; @Override public void onAttach(Activity activity) { @@ -110,17 +93,16 @@ public class AddUserInfoFragment extends BaseFragment civAvatar = view.findViewById(R.id.civ_avatar); tvNick = view.findViewById(R.id.tv_nick); tvGender = view.findViewById(R.id.tv_gender); -// tvBirthday = view.findViewById(R.id.tv_birthday); okBtn = view.findViewById(R.id.ok_btn); -// tvGenderMen = view.findViewById(R.id.tv_gender_men); -// tvGenderWomen = view.findViewById(R.id.tv_gender_women); - ivRandomAvatar = view.findViewById(R.id.iv_random_avatar); tvRandomNick = view.findViewById(R.id.tv_random_nick); - ivRandomAvatar.setVisibility(View.GONE); rgGender = view.findViewById(R.id.rg_gender); rbMale = view.findViewById(R.id.rb_male); - rbFemale = view.findViewById(R.id.rb_female); tvRandomNick.setVisibility(View.GONE); +// ivRandomAvatar.setVisibility(View.GONE); +// ivRandomAvatar = view.findViewById(R.id.iv_random_avatar); +// tvBirthday = view.findViewById(R.id.tv_birthday); +// tvGenderMen = view.findViewById(R.id.tv_gender_men); +// tvGenderWomen = view.findViewById(R.id.tv_gender_women); } @Override @@ -128,14 +110,14 @@ public class AddUserInfoFragment extends BaseFragment gender = -1; civAvatar.setOnClickListener(this); tvGender.setOnClickListener(this); -// tvBirthday.setOnClickListener(this); okBtn.setOnClickListener(this); -// tvGenderMen.setOnClickListener(this); -// tvGenderWomen.setOnClickListener(this); - ivRandomAvatar.setOnClickListener(this); tvRandomNick.setOnClickListener(this); init(); addWXUserInfo(); +// ivRandomAvatar.setOnClickListener(this); +// tvGenderMen.setOnClickListener(this); +// tvGenderWomen.setOnClickListener(this); +// tvBirthday.setOnClickListener(this); } @@ -143,9 +125,9 @@ public class AddUserInfoFragment extends BaseFragment ThirdUserInfo thirdUserInfo = AuthModel.get().getThirdUserInfo(); if (thirdUserInfo != null) { avatarUrlWX = thirdUserInfo.getUserIcon(); - if (thirdUserInfo.getBirth() > 0) { +// if (thirdUserInfo.getBirth() > 0) { // tvBirthday.setText(TimeUtils.getDateTimeString(thirdUserInfo.getBirth(), "yyyy-MM-dd")); - } +// } String nick = thirdUserInfo.getUserName(); if (!StringUtil.isEmpty(nick)) { if (nick.length() > 15) { @@ -174,9 +156,9 @@ public class AddUserInfoFragment extends BaseFragment UserModel.get().getRandomConfig() .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) .doOnSuccess(userRandomConfig -> { - if (userRandomConfig.isAvatar()) { - ivRandomAvatar.setVisibility(View.VISIBLE); - } +// if (userRandomConfig.isAvatar()) { +// ivRandomAvatar.setVisibility(View.VISIBLE); +// } if (userRandomConfig.isNick()) { tvRandomNick.setVisibility(View.VISIBLE); } @@ -186,15 +168,8 @@ public class AddUserInfoFragment extends BaseFragment rgGender.setOnCheckedChangeListener(new XRadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(XRadioGroup radioGroup, int i) { - - if (i == rbMale.getId()){ - gender = UserInfo.GENDER_MALE; - }else { - gender = UserInfo.GENDER_FEMALE; - - } - LogUtils.e(gender+""); -// LogUtils.e(i == rbMale.getId()?gender = UserInfo.GENDER_MALE:gender = UserInfo.GENDER_FEMALE); + gender = i == rbMale.getId()?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; +// LogUtils.e(gender+""); } }); } @@ -202,28 +177,28 @@ public class AddUserInfoFragment extends BaseFragment @Override public void onClick(View v) { switch (v.getId()) { - case R.id.tv_gender: - ButtonItem maleItem = new ButtonItem("男", new ButtonItem.OnClickListener() { - @Override - public void onClick() { - gender = UserInfo.GENDER_MALE; - tvGender.setText("男"); - } - }); - - ButtonItem femaleItem = new ButtonItem("女", new ButtonItem.OnClickListener() { - @Override - public void onClick() { - gender = UserInfo.GENDER_FEMALE; - tvGender.setText("女"); - } - }); - - List genderList = new ArrayList<>(); - genderList.add(maleItem); - genderList.add(femaleItem); - getDialogManager().showCommonPopupDialog(genderList, "取消", false); - break; +// case R.id.tv_gender: +// ButtonItem maleItem = new ButtonItem("男", new ButtonItem.OnClickListener() { +// @Override +// public void onClick() { +// gender = UserInfo.GENDER_MALE; +// tvGender.setText("男"); +// } +// }); +// +// ButtonItem femaleItem = new ButtonItem("女", new ButtonItem.OnClickListener() { +// @Override +// public void onClick() { +// gender = UserInfo.GENDER_FEMALE; +// tvGender.setText("女"); +// } +// }); +// +// List genderList = new ArrayList<>(); +// genderList.add(maleItem); +// genderList.add(femaleItem); +// getDialogManager().showCommonPopupDialog(genderList, "取消", false); +// break; // case R.id.tv_birthday: // if (datePickerDialog.isAdded()) { @@ -235,20 +210,17 @@ public class AddUserInfoFragment extends BaseFragment // datePickerDialog.show(getChildFragmentManager(), "DATEPICKER_TAG"); // } // break; - case R.id.ok_btn: String nick = tvNick.getText().toString(); if (TextUtils.isEmpty(nick)) { toast("昵称不能为空！"); return; } - // String birth = tvBirthday.getText().toString(); // if (TextUtils.isEmpty(birth)) { // toast("生日不能为空！"); // return; // } - if (gender == -1) { toast("必须要选性别哦"); return; @@ -299,29 +271,28 @@ public class AddUserInfoFragment extends BaseFragment buttonItemList.add(localItem); getDialogManager().showCommonPopupDialog(buttonItemList, "取消", false); break; - - case R.id.iv_random_avatar: - StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_AVATAR, - "随机头像"); - ivRandomAvatar.setEnabled(false); - UserModel.get().getRandomAvatar() - .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(String avatar, String error) { - super.accept(avatar, error); - ivRandomAvatar.setEnabled(true); - if (error != null) { - toast(error); - return; - } - if (!TextUtils.isEmpty(avatar)) { - avatarUrl = avatar; - ImageLoadUtilsV2.loadAvatar(civAvatar, avatar); - } - } - }); - break; +// case R.id.iv_random_avatar: +// StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_AVATAR, +// "随机头像"); +// ivRandomAvatar.setEnabled(false); +// UserModel.get().getRandomAvatar() +// .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) +// .subscribe(new DontWarnObserver() { +// @Override +// public void accept(String avatar, String error) { +// super.accept(avatar, error); +// ivRandomAvatar.setEnabled(true); +// if (error != null) { +// toast(error); +// return; +// } +// if (!TextUtils.isEmpty(avatar)) { +// avatarUrl = avatar; +// ImageLoadUtilsV2.loadAvatar(civAvatar, avatar); +// } +// } +// }); +// break; case R.id.tv_random_nick: StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME, @@ -354,7 +325,6 @@ public class AddUserInfoFragment extends BaseFragment private void commit() { String nick = tvNick.getText().toString(); // String birth = tvBirthday.getText().toString(); - UserInfo userInfo = new UserInfo(); userInfo.setUid(AuthModel.get().getCurrentUid()); // userInfo.setBirthStr(birth); diff --git a/app/src/main/res/mipmap-xhdpi/bg_login.png b/app/src/main/res/drawable-xhdpi/bg_login.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/bg_login.png rename to app/src/main/res/drawable-xhdpi/bg_login.png diff --git a/app/src/main/res/layout/activity_addinfo.xml b/app/src/main/res/layout/activity_addinfo.xml index 9aac85404..9b6510cf6 100644 --- a/app/src/main/res/layout/activity_addinfo.xml +++ b/app/src/main/res/layout/activity_addinfo.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_horizontal" - android:background="@mipmap/bg_login" + android:background="@drawable/bg_login" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_add_user_info.xml b/app/src/main/res/layout/fragment_add_user_info.xml index 2ee464494..057e1c2fe 100644 --- a/app/src/main/res/layout/fragment_add_user_info.xml +++ b/app/src/main/res/layout/fragment_add_user_info.xml @@ -5,17 +5,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_horizontal" - android:background="@mipmap/bg_login" android:orientation="vertical"> - - - - - - + android:padding="@dimen/dp_10" + android:src="@mipmap/ic_random_nick" + /> KTV中... loading… - 我是一只小萌新 + 我是一只小萌新辅导辅导辅导辅导辅导发的辅导辅导费 排麦模式 纯净模式 diff --git a/app/src/model_customer_server/res/layout/activity_login_code.xml b/app/src/model_customer_server/res/layout/activity_login_code.xml index caf76ec02..f007b7533 100644 --- a/app/src/model_customer_server/res/layout/activity_login_code.xml +++ b/app/src/model_customer_server/res/layout/activity_login_code.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@mipmap/bg_login"> + android:background="@drawable/bg_login"> + android:background="@drawable/bg_login"> + + + + \ No newline at end of file diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java index 9faf9facf..3028632af 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java +++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java @@ -37,12 +37,10 @@ public class QuickLoginUiConfig { int BOTTOM_OFFSET = 0; UnifyUiConfig uiConfig = new UnifyUiConfig.Builder() // 状态栏 - .setStatusBarColor(Color.WHITE) .setStatusBarDarkColor(true) + .setBackgroundImage("bg_login") // 设置导航栏 - .setNavigationTitle("一键登录") - .setNavigationTitleColor(ContextCompat.getColor(context, R.color.color_333333)) - .setNavigationBackgroundColor(Color.WHITE) + .setNavigationTitle(" ") .setNavigationIcon("quick_pass_back") .setNavigationBackIconWidth(25) .setNavigationBackIconHeight(25) @@ -55,36 +53,36 @@ public class QuickLoginUiConfig { .setLogoTopYOffset(logoToTop) .setHideLogo(false) //手机掩码 - .setMaskNumberColor(ContextCompat.getColor(context, R.color.color_common_text_content)) + .setMaskNumberColor(ContextCompat.getColor(context, R.color.white)) .setMaskNumberSize(maskNumSize) .setMaskNumberXOffset(X_OFFSET) .setMaskNumberTopYOffset(maskNumToTop) .setMaskNumberBottomYOffset(BOTTOM_OFFSET) // 认证品牌 .setSloganSize(sloganSize) - .setSloganColor(ContextCompat.getColor(context, R.color.color_ABAAB2)) + .setSloganColor(ContextCompat.getColor(context, R.color.white)) .setSloganXOffset(X_OFFSET) .setSloganTopYOffset(sloganToTop) .setSloganBottomYOffset(BOTTOM_OFFSET) // 登录按钮 .setLoginBtnText("本机号码一键登录") - .setLoginBtnTextColor(Color.WHITE) + .setLoginBtnTextColor(R.color.color_7154EE) .setLoginBtnBackgroundRes("bg_quick_pass") - .setLoginBtnWidth(280) + .setLoginBtnWidth(225) .setLoginBtnHeight(loginBtnHeight) - .setLoginBtnTextSize(16) + .setLoginBtnTextSize(15) .setLoginBtnXOffset(X_OFFSET) .setLoginBtnTopYOffset(loginBtnToTop) .setLoginBtnBottomYOffset(BOTTOM_OFFSET) // 隐私栏 .setPrivacyTextStart("登录即代表同意") - .setProtocolText("轻寻隐私政策") + .setProtocolText("《66陪玩隐私政策》") .setProtocolLink(UriProvider.getPrivacyAgreement()) - .setProtocol2Text("轻寻用户协议") + .setProtocol2Text("《66陪玩用户协议》") .setProtocol2Link(UriProvider.getUserProtocolUrl()) - .setPrivacyTextEnd("并授权轻寻获取本机号码") - .setPrivacyTextColor(ContextCompat.getColor(context, R.color.color_333333)) - .setPrivacyProtocolColor(ContextCompat.getColor(context, R.color.color_FE4C62)) + .setPrivacyTextEnd("并授权66陪玩获取本机号码") + .setPrivacyTextColor(ContextCompat.getColor(context, R.color.color_BAB0FF)) + .setPrivacyProtocolColor(ContextCompat.getColor(context, R.color.white)) .setHidePrivacyCheckBox(false) /** diff --git a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java index 7a2e9593b..b746f07ff 100644 --- a/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java +++ b/app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java @@ -87,7 +87,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe onSetListener(); permission(); showLoginTip(); - preFetchMobileNum(); AuthModel.get().isFromLogin = true; AppUpgradeHelper.checkAppUpgrade(this); } @@ -125,7 +124,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe case R.id.tv_login_quick_pass: StatisticManager.Instance().onEvent( StatisticsProtocol.Event.EVENT_ONE_CLICK_LOGIN, "一键登录"); - onePass(); + preFetchMobileNum(); break; case R.id.img_phone_login: @@ -157,8 +156,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe public void onGetMobileNumberSuccess(String YDToken, final String mobileNumber) { // 注:对于3网UI统一版本SDK，即2.0.0及以后版本，直接在该回调中调用取号接口onePass即可 getDialogManager().dismissDialog(); - - tvLoginQuickPass.setVisibility(View.VISIBLE); + onePass(); } @Override @@ -167,8 +165,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe toast("一键登录失败，请使用其他方式登录"); LogUtil.e("QuickPassLogin", msg); getDialogManager().dismissDialog(); -// LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); - tvLoginQuickPass.setVisibility(View.INVISIBLE); + LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); } }); } diff --git a/app/src/module_quick_pass/res/drawable/bg_login.png b/app/src/module_quick_pass/res/drawable/bg_login.png new file mode 100644 index 000000000..12aa5034f Binary files /dev/null and b/app/src/module_quick_pass/res/drawable/bg_login.png differ diff --git a/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml b/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml index e0a60b646..c73b224be 100644 --- a/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml +++ b/app/src/module_quick_pass/res/drawable/bg_quick_pass.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml index 155fbf9d6..d59685d54 100644 --- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml +++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:background="@mipmap/bg_login"> + android:background="@drawable/bg_login"> #FAFAFA #B3B3B3 #34EBDE + #BAB0FF \ No newline at end of file