moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录页部分UI

Browse Source
This commit is contained in:
oujunhui
2020-04-10 21:26:18 +08:00
parent 71bff56b2a
commit 9de0be4db2
17 changed files with 118 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java
View File

@@ -90,7 +90,7 @@ public class LoginCodeActivity extends BaseLoginAct {
onFindViews(); onFindViews();
initData(); initData();
onSetListener(); onSetListener();
getSmsCode(); // getSmsCode();
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
@@ -116,10 +116,10 @@ public class LoginCodeActivity extends BaseLoginAct {
codeEt.setOnTextFinishListener(new CodeEditText.OnTextFinishListener() { codeEt.setOnTextFinishListener(new CodeEditText.OnTextFinishListener() {
@Override @Override
public void onTextFinish(CharSequence text, int length) { public void onTextFinish(CharSequence text, int length) {
// login(); login();
// LogUtils.e(text.toString()); // LogUtils.e(text.toString());
Intent intent = new Intent(LoginCodeActivity.this,AddUserInfoActivity.class); // Intent intent = new Intent(LoginCodeActivity.this,AddUserInfoActivity.class);
startActivity(intent); // startActivity(intent);
} }
}); });
} }
@@ -205,6 +205,7 @@ public class LoginCodeActivity extends BaseLoginAct {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
toast(e.getMessage()); toast(e.getMessage());
// finish();
Logger.e(TAG, "获取短信失败!"); Logger.e(TAG, "获取短信失败!");
} }
}); });
@@ -220,6 +221,7 @@ public class LoginCodeActivity extends BaseLoginAct {
String shuMeiDeviceId = SmAntiFraud.getDeviceId(); String shuMeiDeviceId = SmAntiFraud.getDeviceId();
AuthModel.get().login( AuthModel.get().login(
mPhone, mPhone,
"123456aa",
smsCode, smsCode,
yiDunLoginToken, yiDunLoginToken,
shuMeiDeviceId) shuMeiDeviceId)

162
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -9,13 +9,10 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import com.coorchice.library.utils.LogUtils;
import com.fourmob.datetimepicker.date.DatePickerDialog; import com.fourmob.datetimepicker.date.DatePickerDialog;
import com.jph.takephoto.model.TResult; import com.jph.takephoto.model.TResult;
import com.netease.nim.uikit.common.util.string.StringUtil; 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.common.widget.CircleImageView;
import com.yizhuan.erban.ui.login.AddUserInfoActivity; import com.yizhuan.erban.ui.login.AddUserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; 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.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel; 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.UserInfo;
import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_library.utils.StringUtils; import com.yizhuan.xchat_android_library.utils.StringUtils;
import com.yizhuan.xchat_android_library.utils.TimeUtils;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import io.reactivex.SingleObserver; import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import me.shihao.library.XRadioGroup; import me.shihao.library.XRadioGroup;
/** /**
@@ -67,31 +58,23 @@ public class AddUserInfoFragment extends BaseFragment
TimePickerDialog.OnTimeSetListener, ErbanTakePhotoActivity.TakePhotoCallBack { TimePickerDialog.OnTimeSetListener, ErbanTakePhotoActivity.TakePhotoCallBack {
private static final String TAG = "AddUserInfoFragment"; private static final String TAG = "AddUserInfoFragment";
private CircleImageView civAvatar; private CircleImageView civAvatar;
private TextInputEditText tvNick; private TextInputEditText tvNick;
private TextInputEditText tvGender; private TextInputEditText tvGender;
// private TextInputEditText tvBirthday;
private Button okBtn; private Button okBtn;
// private TextView tvGenderMen; // private ImageView ivRandomAvatar;
// private TextView tvGenderWomen; private ImageView tvRandomNick;
private ImageView ivRandomAvatar;
private TextView tvRandomNick;
// private DatePickerDialog datePickerDialog;
private String avatarUrl; private String avatarUrl;
private String avatarUrlWX; private String avatarUrlWX;
private File photoFile; private File photoFile;
private int gender = -1; private int gender = -1;
private XRadioGroup rgGender; private XRadioGroup rgGender;
private RadioButton rbMale; private RadioButton rbMale;
private RadioButton rbFemale;
AddUserInfoActivity addUserInfoActivity; AddUserInfoActivity addUserInfoActivity;
// private TextInputEditText tvBirthday;
// private TextView tvGenderMen;
// private TextView tvGenderWomen;
// private DatePickerDialog datePickerDialog;
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
@@ -110,17 +93,16 @@ public class AddUserInfoFragment extends BaseFragment
civAvatar = view.findViewById(R.id.civ_avatar); civAvatar = view.findViewById(R.id.civ_avatar);
tvNick = view.findViewById(R.id.tv_nick); tvNick = view.findViewById(R.id.tv_nick);
tvGender = view.findViewById(R.id.tv_gender); tvGender = view.findViewById(R.id.tv_gender);
// tvBirthday = view.findViewById(R.id.tv_birthday);
okBtn = view.findViewById(R.id.ok_btn); 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); tvRandomNick = view.findViewById(R.id.tv_random_nick);
ivRandomAvatar.setVisibility(View.GONE);
rgGender = view.findViewById(R.id.rg_gender); rgGender = view.findViewById(R.id.rg_gender);
rbMale = view.findViewById(R.id.rb_male); rbMale = view.findViewById(R.id.rb_male);
rbFemale = view.findViewById(R.id.rb_female);
tvRandomNick.setVisibility(View.GONE); 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 @Override
@@ -128,14 +110,14 @@ public class AddUserInfoFragment extends BaseFragment
gender = -1; gender = -1;
civAvatar.setOnClickListener(this); civAvatar.setOnClickListener(this);
tvGender.setOnClickListener(this); tvGender.setOnClickListener(this);
// tvBirthday.setOnClickListener(this);
okBtn.setOnClickListener(this); okBtn.setOnClickListener(this);
// tvGenderMen.setOnClickListener(this);
// tvGenderWomen.setOnClickListener(this);
ivRandomAvatar.setOnClickListener(this);
tvRandomNick.setOnClickListener(this); tvRandomNick.setOnClickListener(this);
init(); init();
addWXUserInfo(); 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(); ThirdUserInfo thirdUserInfo = AuthModel.get().getThirdUserInfo();
if (thirdUserInfo != null) { if (thirdUserInfo != null) {
avatarUrlWX = thirdUserInfo.getUserIcon(); avatarUrlWX = thirdUserInfo.getUserIcon();
if (thirdUserInfo.getBirth() > 0) { // if (thirdUserInfo.getBirth() > 0) {
// tvBirthday.setText(TimeUtils.getDateTimeString(thirdUserInfo.getBirth(), "yyyy-MM-dd")); // tvBirthday.setText(TimeUtils.getDateTimeString(thirdUserInfo.getBirth(), "yyyy-MM-dd"));
} // }
String nick = thirdUserInfo.getUserName(); String nick = thirdUserInfo.getUserName();
if (!StringUtil.isEmpty(nick)) { if (!StringUtil.isEmpty(nick)) {
if (nick.length() > 15) { if (nick.length() > 15) {
@@ -174,9 +156,9 @@ public class AddUserInfoFragment extends BaseFragment
UserModel.get().getRandomConfig() UserModel.get().getRandomConfig()
.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.doOnSuccess(userRandomConfig -> { .doOnSuccess(userRandomConfig -> {
if (userRandomConfig.isAvatar()) { // if (userRandomConfig.isAvatar()) {
ivRandomAvatar.setVisibility(View.VISIBLE); // ivRandomAvatar.setVisibility(View.VISIBLE);
} // }
if (userRandomConfig.isNick()) { if (userRandomConfig.isNick()) {
tvRandomNick.setVisibility(View.VISIBLE); tvRandomNick.setVisibility(View.VISIBLE);
} }
@@ -186,15 +168,8 @@ public class AddUserInfoFragment extends BaseFragment
rgGender.setOnCheckedChangeListener(new XRadioGroup.OnCheckedChangeListener() { rgGender.setOnCheckedChangeListener(new XRadioGroup.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(XRadioGroup radioGroup, int i) { public void onCheckedChanged(XRadioGroup radioGroup, int i) {
gender = i == rbMale.getId()?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE;
if (i == rbMale.getId()){ // LogUtils.e(gender+"");
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);
} }
}); });
} }
@@ -202,28 +177,28 @@ public class AddUserInfoFragment extends BaseFragment
@Override @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()) { switch (v.getId()) {
case R.id.tv_gender: // case R.id.tv_gender:
ButtonItem maleItem = new ButtonItem("男", new ButtonItem.OnClickListener() { // ButtonItem maleItem = new ButtonItem("男", new ButtonItem.OnClickListener() {
@Override // @Override
public void onClick() { // public void onClick() {
gender = UserInfo.GENDER_MALE; // gender = UserInfo.GENDER_MALE;
tvGender.setText("男"); // tvGender.setText("男");
} // }
}); // });
//
ButtonItem femaleItem = new ButtonItem("女", new ButtonItem.OnClickListener() { // ButtonItem femaleItem = new ButtonItem("女", new ButtonItem.OnClickListener() {
@Override // @Override
public void onClick() { // public void onClick() {
gender = UserInfo.GENDER_FEMALE; // gender = UserInfo.GENDER_FEMALE;
tvGender.setText("女"); // tvGender.setText("女");
} // }
}); // });
//
List<ButtonItem> genderList = new ArrayList<>(); // List<ButtonItem> genderList = new ArrayList<>();
genderList.add(maleItem); // genderList.add(maleItem);
genderList.add(femaleItem); // genderList.add(femaleItem);
getDialogManager().showCommonPopupDialog(genderList, "取消", false); // getDialogManager().showCommonPopupDialog(genderList, "取消", false);
break; // break;
// case R.id.tv_birthday: // case R.id.tv_birthday:
// if (datePickerDialog.isAdded()) { // if (datePickerDialog.isAdded()) {
@@ -235,20 +210,17 @@ public class AddUserInfoFragment extends BaseFragment
// datePickerDialog.show(getChildFragmentManager(), "DATEPICKER_TAG"); // datePickerDialog.show(getChildFragmentManager(), "DATEPICKER_TAG");
// } // }
// break; // break;
case R.id.ok_btn: case R.id.ok_btn:
String nick = tvNick.getText().toString(); String nick = tvNick.getText().toString();
if (TextUtils.isEmpty(nick)) { if (TextUtils.isEmpty(nick)) {
toast("昵称不能为空！"); toast("昵称不能为空！");
return; return;
} }
// String birth = tvBirthday.getText().toString(); // String birth = tvBirthday.getText().toString();
// if (TextUtils.isEmpty(birth)) { // if (TextUtils.isEmpty(birth)) {
// toast("生日不能为空！"); // toast("生日不能为空！");
// return; // return;
// } // }
if (gender == -1) { if (gender == -1) {
toast("必须要选性别哦"); toast("必须要选性别哦");
return; return;
@@ -299,29 +271,28 @@ public class AddUserInfoFragment extends BaseFragment
buttonItemList.add(localItem); buttonItemList.add(localItem);
getDialogManager().showCommonPopupDialog(buttonItemList, "取消", false); getDialogManager().showCommonPopupDialog(buttonItemList, "取消", false);
break; break;
// case R.id.iv_random_avatar:
case R.id.iv_random_avatar: // StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_AVATAR,
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_AVATAR, // "随机头像");
"随机头像"); // ivRandomAvatar.setEnabled(false);
ivRandomAvatar.setEnabled(false); // UserModel.get().getRandomAvatar()
UserModel.get().getRandomAvatar() // .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
.compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) // .subscribe(new DontWarnObserver<String>() {
.subscribe(new DontWarnObserver<String>() { // @Override
@Override // public void accept(String avatar, String error) {
public void accept(String avatar, String error) { // super.accept(avatar, error);
super.accept(avatar, error); // ivRandomAvatar.setEnabled(true);
ivRandomAvatar.setEnabled(true); // if (error != null) {
if (error != null) { // toast(error);
toast(error); // return;
return; // }
} // if (!TextUtils.isEmpty(avatar)) {
if (!TextUtils.isEmpty(avatar)) { // avatarUrl = avatar;
avatarUrl = avatar; // ImageLoadUtilsV2.loadAvatar(civAvatar, avatar);
ImageLoadUtilsV2.loadAvatar(civAvatar, avatar); // }
} // }
} // });
}); // break;
break;
case R.id.tv_random_nick: case R.id.tv_random_nick:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME, StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME,
@@ -354,7 +325,6 @@ public class AddUserInfoFragment extends BaseFragment
private void commit() { private void commit() {
String nick = tvNick.getText().toString(); String nick = tvNick.getText().toString();
// String birth = tvBirthday.getText().toString(); // String birth = tvBirthday.getText().toString();
UserInfo userInfo = new UserInfo(); UserInfo userInfo = new UserInfo();
userInfo.setUid(AuthModel.get().getCurrentUid()); userInfo.setUid(AuthModel.get().getCurrentUid());
// userInfo.setBirthStr(birth); // userInfo.setBirthStr(birth);

0
app/src/main/res/mipmap-xhdpi/bg_login.png → app/src/main/res/drawable-xhdpi/bg_login.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 463 KiB

After

Width:  |  Height:  |  Size: 463 KiB

2
app/src/main/res/layout/activity_addinfo.xml
View File

@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:background="@mipmap/bg_login" android:background="@drawable/bg_login"
android:orientation="vertical"> android:orientation="vertical">

47
app/src/main/res/layout/fragment_add_user_info.xml
View File

@@ -5,17 +5,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:background="@mipmap/bg_login"
android:orientation="vertical"> android:orientation="vertical">
<com.yizhuan.erban.common.widget.CircleImageView <com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_avatar" android:id="@+id/civ_avatar"
android:layout_width="87dp" android:layout_width="87dp"
android:layout_height="87dp" android:layout_height="87dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="110dp" android:layout_marginTop="80dp"
android:src="@drawable/tutu_default_avatar_purple" android:src="@drawable/tutu_default_avatar_purple"
app:cborder_color="@color/transparent" app:cborder_color="@color/transparent"
app:cborder_width="0dp" app:cborder_width="0dp"
@@ -42,55 +39,41 @@
android:layout_marginStart="@dimen/login_btn_padding" android:layout_marginStart="@dimen/login_btn_padding"
android:layout_marginEnd="@dimen/login_btn_padding" android:layout_marginEnd="@dimen/login_btn_padding"
android:layout_marginTop="@dimen/dp_30" android:layout_marginTop="@dimen/dp_30"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="0dp"
android:background="@drawable/shape_trans_radius_10" android:background="@drawable/shape_trans_radius_10"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/civ_avatar" app:layout_constraintTop_toBottomOf="@+id/civ_avatar"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:gravity="center"
> >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
android:text="@string/str_nick_title"
/>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/tv_nick" android:id="@+id/tv_nick"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="@dimen/dp_50" android:gravity="center"
android:paddingStart="0dp"
android:gravity="start|center_vertical"
android:hint="@string/hint_input_nick"
android:paddingTop="@dimen/dp_15" android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15" android:paddingBottom="@dimen/dp_15"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
android:theme="@style/common_edittext_style"
android:lines="1" android:lines="1"
android:background="@null" android:background="@null"
android:maxLength="8"
android:singleLine="true" android:singleLine="true"
android:text="@string/text_default_nick" android:text="@string/text_default_nick"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
<com.coorchice.library.SuperTextView <ImageView
android:id="@+id/tv_random_nick" android:id="@+id/tv_random_nick"
android:text="随机" android:layout_width="wrap_content"
android:gravity="center" android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_9"
android:paddingEnd="@dimen/dp_9"
android:textColor="@color/color_666666"
app:solid="@color/color_E6E6E6"
android:layout_marginTop="@dimen/dp_5"
tools:visibility="visible" tools:visibility="visible"
android:visibility="gone" android:visibility="gone"
app:corner="@dimen/dp_5" android:padding="@dimen/dp_10"
android:textSize="@dimen/dp_11" android:src="@mipmap/ic_random_nick"
android:layout_width="wrap_content" />
android:layout_height="@dimen/dp_20" />
</LinearLayout> </LinearLayout>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
@@ -174,7 +157,7 @@
android:layout_marginBottom="@dimen/dp_16" android:layout_marginBottom="@dimen/dp_16"
android:layout_marginStart="@dimen/login_btn_padding" android:layout_marginStart="@dimen/login_btn_padding"
android:layout_marginEnd="@dimen/login_btn_padding" android:layout_marginEnd="@dimen/login_btn_padding"
android:background="@drawable/shape_trans_radius_10" android:background="@drawable/shape_trans_radius_20"
android:text="@string/done" android:text="@string/done"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_15" android:textSize="@dimen/sp_15"

BIN
app/src/main/res/mipmap-xhdpi/ic_random_nick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 970 B

2
app/src/main/res/values/strings.xml
View File

@@ -636,7 +636,7 @@
<string name="KTV_ing">KTV中...</string> <string name="KTV_ing">KTV中...</string>
<string name="common_loading_tips">loading…</string> <string name="common_loading_tips">loading…</string>
<string name="text_default_nick">我是一只小萌新</string> <string name="text_default_nick">我是一只小萌新辅导辅导辅导辅导辅导发的辅导辅导费</string>
<string name="text_room_queuing_micro_mode">排麦模式</string> <string name="text_room_queuing_micro_mode">排麦模式</string>
<string name="text_room_pure_mode">纯净模式</string> <string name="text_room_pure_mode">纯净模式</string>

2
app/src/model_customer_server/res/layout/activity_login_code.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg_login"> android:background="@drawable/bg_login">
<com.yizhuan.erban.base.TitleBar <com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar" android:id="@+id/title_bar"

2
app/src/model_customer_server/res/layout/activity_login_phone.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg_login"> android:background="@drawable/bg_login">
<com.yizhuan.erban.base.TitleBar <com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar" android:id="@+id/title_bar"

6
app/src/module_album/res/drawable-hdpi/shape_trans_radius_20.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#30ffffff" />
<corners android:radius="20dp" />
</shape>

26
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickLoginUiConfig.java
View File

@@ -37,12 +37,10 @@ public class QuickLoginUiConfig {
int BOTTOM_OFFSET = 0; int BOTTOM_OFFSET = 0;
UnifyUiConfig uiConfig = new UnifyUiConfig.Builder() UnifyUiConfig uiConfig = new UnifyUiConfig.Builder()
// 状态栏 // 状态栏
.setStatusBarColor(Color.WHITE)
.setStatusBarDarkColor(true) .setStatusBarDarkColor(true)
.setBackgroundImage("bg_login")
// 设置导航栏 // 设置导航栏
.setNavigationTitle("一键登录") .setNavigationTitle(" ")
.setNavigationTitleColor(ContextCompat.getColor(context, R.color.color_333333))
.setNavigationBackgroundColor(Color.WHITE)
.setNavigationIcon("quick_pass_back") .setNavigationIcon("quick_pass_back")
.setNavigationBackIconWidth(25) .setNavigationBackIconWidth(25)
.setNavigationBackIconHeight(25) .setNavigationBackIconHeight(25)
@@ -55,36 +53,36 @@ public class QuickLoginUiConfig {
.setLogoTopYOffset(logoToTop) .setLogoTopYOffset(logoToTop)
.setHideLogo(false) .setHideLogo(false)
//手机掩码 //手机掩码
.setMaskNumberColor(ContextCompat.getColor(context, R.color.color_common_text_content)) .setMaskNumberColor(ContextCompat.getColor(context, R.color.white))
.setMaskNumberSize(maskNumSize) .setMaskNumberSize(maskNumSize)
.setMaskNumberXOffset(X_OFFSET) .setMaskNumberXOffset(X_OFFSET)
.setMaskNumberTopYOffset(maskNumToTop) .setMaskNumberTopYOffset(maskNumToTop)
.setMaskNumberBottomYOffset(BOTTOM_OFFSET) .setMaskNumberBottomYOffset(BOTTOM_OFFSET)
// 认证品牌 // 认证品牌
.setSloganSize(sloganSize) .setSloganSize(sloganSize)
.setSloganColor(ContextCompat.getColor(context, R.color.color_ABAAB2)) .setSloganColor(ContextCompat.getColor(context, R.color.white))
.setSloganXOffset(X_OFFSET) .setSloganXOffset(X_OFFSET)
.setSloganTopYOffset(sloganToTop) .setSloganTopYOffset(sloganToTop)
.setSloganBottomYOffset(BOTTOM_OFFSET) .setSloganBottomYOffset(BOTTOM_OFFSET)
// 登录按钮 // 登录按钮
.setLoginBtnText("本机号码一键登录") .setLoginBtnText("本机号码一键登录")
.setLoginBtnTextColor(Color.WHITE) .setLoginBtnTextColor(R.color.color_7154EE)
.setLoginBtnBackgroundRes("bg_quick_pass") .setLoginBtnBackgroundRes("bg_quick_pass")
.setLoginBtnWidth(280) .setLoginBtnWidth(225)
.setLoginBtnHeight(loginBtnHeight) .setLoginBtnHeight(loginBtnHeight)
.setLoginBtnTextSize(16) .setLoginBtnTextSize(15)
.setLoginBtnXOffset(X_OFFSET) .setLoginBtnXOffset(X_OFFSET)
.setLoginBtnTopYOffset(loginBtnToTop) .setLoginBtnTopYOffset(loginBtnToTop)
.setLoginBtnBottomYOffset(BOTTOM_OFFSET) .setLoginBtnBottomYOffset(BOTTOM_OFFSET)
// 隐私栏 // 隐私栏
.setPrivacyTextStart("登录即代表同意") .setPrivacyTextStart("登录即代表同意")
.setProtocolText("轻寻隐私政策") .setProtocolText("《66陪玩隐私政策》")
.setProtocolLink(UriProvider.getPrivacyAgreement()) .setProtocolLink(UriProvider.getPrivacyAgreement())
.setProtocol2Text("轻寻用户协议") .setProtocol2Text("《66陪玩用户协议》")
.setProtocol2Link(UriProvider.getUserProtocolUrl()) .setProtocol2Link(UriProvider.getUserProtocolUrl())
.setPrivacyTextEnd("并授权轻寻获取本机号码") .setPrivacyTextEnd("并授权66陪玩获取本机号码")
.setPrivacyTextColor(ContextCompat.getColor(context, R.color.color_333333)) .setPrivacyTextColor(ContextCompat.getColor(context, R.color.color_BAB0FF))
.setPrivacyProtocolColor(ContextCompat.getColor(context, R.color.color_FE4C62)) .setPrivacyProtocolColor(ContextCompat.getColor(context, R.color.white))
.setHidePrivacyCheckBox(false) .setHidePrivacyCheckBox(false)
/** /**

9
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
View File

@@ -87,7 +87,6 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
onSetListener(); onSetListener();
permission(); permission();
showLoginTip(); showLoginTip();
preFetchMobileNum();
AuthModel.get().isFromLogin = true; AuthModel.get().isFromLogin = true;
AppUpgradeHelper.checkAppUpgrade(this); AppUpgradeHelper.checkAppUpgrade(this);
} }
@@ -125,7 +124,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
case R.id.tv_login_quick_pass: case R.id.tv_login_quick_pass:
StatisticManager.Instance().onEvent( StatisticManager.Instance().onEvent(
StatisticsProtocol.Event.EVENT_ONE_CLICK_LOGIN, "一键登录"); StatisticsProtocol.Event.EVENT_ONE_CLICK_LOGIN, "一键登录");
onePass(); preFetchMobileNum();
break; break;
case R.id.img_phone_login: 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) { public void onGetMobileNumberSuccess(String YDToken, final String mobileNumber) {
// 注:对于3网UI统一版本SDK，即2.0.0及以后版本，直接在该回调中调用取号接口onePass即可 // 注:对于3网UI统一版本SDK，即2.0.0及以后版本，直接在该回调中调用取号接口onePass即可
getDialogManager().dismissDialog(); getDialogManager().dismissDialog();
onePass();
tvLoginQuickPass.setVisibility(View.VISIBLE);
} }
@Override @Override
@@ -167,8 +165,7 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
toast("一键登录失败，请使用其他方式登录"); toast("一键登录失败，请使用其他方式登录");
LogUtil.e("QuickPassLogin", msg); LogUtil.e("QuickPassLogin", msg);
getDialogManager().dismissDialog(); getDialogManager().dismissDialog();
// LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode); LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
tvLoginQuickPass.setVisibility(View.INVISIBLE);
} }
}); });
} }

BIN
app/src/module_quick_pass/res/drawable/bg_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 KiB

2
app/src/module_quick_pass/res/drawable/bg_quick_pass.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners android:radius="10dp"/> <corners android:radius="20dp"/>
<solid android:color="@color/white"/> <solid android:color="@color/white"/>

2
app/src/module_quick_pass/res/layout/act_quick_pass.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:background="@mipmap/bg_login"> android:background="@drawable/bg_login">
<ImageView <ImageView
android:id="@+id/iv_logo_quick_pass" android:id="@+id/iv_logo_quick_pass"

6
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -63,7 +63,7 @@ public class XChatConstants {
/** /**
* 网易易盾 productNumber * 网易易盾 productNumber
*/ */
public static final String YI_DUN_PRODUCT_NUMBER = "YD00937811914948"; public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";
/** /**
* 网易易盾 业务 ID 注册 * 网易易盾 业务 ID 注册
@@ -258,8 +258,8 @@ public class XChatConstants {
public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 个人页动态 public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 个人页动态
public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//广场动态 public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//广场动态
// 轻寻 // 66陪玩
public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "4f7410a22ec8426281d4faf286835c3e" : "398816ccd0094b3fa430dbad3c08c102"; public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "36b8c749cdfd43569fdd2aa10c098d60" : "398816ccd0094b3fa430dbad3c08c102";
// 侧耳 // 侧耳
// public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "cadbb4ed892549dab4d1adc9d62013bb" : "ba4a642810294561b9cd17034a448b49"; // public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "cadbb4ed892549dab4d1adc9d62013bb" : "ba4a642810294561b9cd17034a448b49";

1
nim_uikit/res/values/colors.xml
View File

@@ -70,5 +70,6 @@
<color name="color_FAFAFA">#FAFAFA</color> <color name="color_FAFAFA">#FAFAFA</color>
<color name="color_B3B3B3">#B3B3B3</color> <color name="color_B3B3B3">#B3B3B3</color>
<color name="color_34EBDE">#34EBDE</color> <color name="color_34EBDE">#34EBDE</color>
<color name="color_BAB0FF">#BAB0FF</color>
</resources> </resources>