yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

红包图标更改，邀请码UI

Browse Source
This commit is contained in:
oujunhui
2020-07-16 15:03:24 +08:00
parent 0f26792ebf
commit 937a7dd7a6
12 changed files with 93 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageOpenDialog.kt
View File

@@ -161,7 +161,6 @@ class RedPackageOpenDialog : BaseDialog<DialogRedPackageOpenBinding>() {
}
}
}
}
TIME_OUT, REMAIN_ZERO, TIME_OUT_BACK -> {
binding.clOpened.setBackgroundResource(R.drawable.room_red_package_get_bg)
@@ -180,9 +179,6 @@ class RedPackageOpenDialog : BaseDialog<DialogRedPackageOpenBinding>() {
binding.rvUsers.layoutManager = LinearLayoutManager(context)
adapter.setNewData(packageInfo.redEnvelopeItemVOs)
PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe()
}
}

5
app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java
View File

@@ -17,14 +17,9 @@ import android.widget.ImageView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.login.helper.LogoutHelper;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_library.utils.NetworkUtils;
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
/**
* @author zhouxiangfeng
* @date 17/2/26

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

@@ -5,8 +5,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -17,26 +15,21 @@ import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.coorchice.library.utils.LogUtils;
import com.ishumei.smantifraud.SmAntiFraud;
import com.netease.mobsec.rjsb.watchman;
import com.orhanobut.logger.Logger;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseLoginAct;
import com.yizhuan.erban.ui.login.ui.CodeEditText;
import com.yizhuan.xchat_android_constants.XChatConstants;
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.BanAccountException;
import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.auth.exception.ShowPhoneCodeException;
import com.yizhuan.xchat_android_core.code.CodeModel;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

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

@@ -1,6 +1,5 @@
package com.yizhuan.erban.ui.login.fragment;
import android.app.Activity;
import android.os.Bundle;
import android.text.InputFilter;
import android.text.TextUtils;
@@ -17,7 +16,6 @@ import com.sleepbot.datetimepicker.time.TimePickerDialog;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.ui.login.AddUserInfoActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
@@ -28,7 +26,6 @@ import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -46,7 +43,7 @@ public class AddUserInfoFragment extends BaseFragment
TimePickerDialog.OnTimeSetListener {
private static final String TAG = "AddUserInfoFragment";
private TextInputEditText tvNick;
private TextInputEditText tvNick,tvCode;
private Button okBtn;
private ImageView tvRandomNick;
private int gender = -1;
@@ -63,6 +60,7 @@ public class AddUserInfoFragment extends BaseFragment
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
tvNick = view.findViewById(R.id.tv_nick);
tvCode = view.findViewById(R.id.tv_code);
okBtn = view.findViewById(R.id.ok_btn);
tvRandomNick = view.findViewById(R.id.tv_random_nick);
rgGender = view.findViewById(R.id.rg_gender);
@@ -87,6 +85,7 @@ public class AddUserInfoFragment extends BaseFragment
String str_gender = thirdUserInfo.getUserGender() == null ? "" : thirdUserInfo.getUserGender();
gender = str_gender.equals("m") ? UserInfo.GENDER_MALE : UserInfo.GENDER_FEMALE;
rgGender.check(gender == UserInfo.GENDER_MALE ? R.id.rb_male : R.id.rb_female);
tvNick.setText(thirdUserInfo.getUserName());
}
}
init();
@@ -103,8 +102,7 @@ public class AddUserInfoFragment extends BaseFragment
public void onClick(View v) {
switch (v.getId()) {
case R.id.ok_btn:
String nick = tvNick.getText().toString();
if (TextUtils.isEmpty(nick)) {
if (TextUtils.isEmpty(tvNick.getText())) {
toast("昵称不能为空！");
return;
}
@@ -112,7 +110,7 @@ public class AddUserInfoFragment extends BaseFragment
toast("必须要选性别哦");
return;
}
commit(tvNick.getText().toString(), avatarUrl, gender);
commit(tvNick.getText().toString().trim(), avatarUrl, gender,tvCode.getText()==null?"":tvCode.getText().toString().trim());
break;
case R.id.tv_random_nick:
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_INFORMATION_RANDOM_NAME,
@@ -145,7 +143,7 @@ public class AddUserInfoFragment extends BaseFragment
});
}
private void commit(String nick, String avatarUrl, int gender) {
private void commit(String nick, String avatarUrl, int gender,String shareCode) {
UserInfo userInfo = new UserInfo();
userInfo.setUid(AuthModel.get().getCurrentUid());
userInfo.setNick(nick);
@@ -169,7 +167,7 @@ public class AddUserInfoFragment extends BaseFragment
roomUid = linkedInfo.getRoomUid();
uid = linkedInfo.getUid();
}
UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, null)
UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode)
.compose(bindUntilEvent(FragmentEvent.DESTROY))
.subscribe(new SingleObserver<UserInfo>() {
@Override

BIN
app/src/main/res/drawable-xhdpi/room_red_package_in.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/room_red_package_in.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

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

@@ -40,7 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginStart="@dimen/login_btn_padding"
android:layout_marginEnd="@dimen/login_btn_padding"
app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +113,7 @@
app:layout_constraintTop_toBottomOf="@id/rg_gender"
app:layout_constraintStart_toEndOf="@id/tv_nick_title"
app:layout_constraintEnd_toStartOf="@id/tv_random_nick"
android:layout_marginTop="80dp"
android:layout_marginTop="70dp"
tools:ignore="SpUsage" />
@@ -143,6 +143,51 @@
/>
<TextView
android:id="@+id/tv_code_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邀请码"
android:textSize="@dimen/dp_15"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/tv_code"
android:layout_marginStart="75dp"
/>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/tv_code"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="end"
android:paddingStart="@dimen/dp_9"
android:paddingTop="@dimen/dp_15"
android:textColor="@color/white"
android:textSize="@dimen/dp_14"
android:lines="1"
android:maxLength="8"
android:singleLine="true"
android:background="@null"
android:text="@string/text_default_code"
app:layout_constraintTop_toBottomOf="@id/view"
app:layout_constraintStart_toEndOf="@id/tv_code_title"
app:layout_constraintEnd_toEndOf="@id/view1"
android:layout_marginTop="15dp"
tools:ignore="SpUsage" />
<View
android:id="@+id/view1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#30F4F4F4"
app:layout_constraintTop_toBottomOf="@id/tv_code_title"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginStart="75dp"
android:layout_marginEnd="75dp"
/>
<Button
android:id="@+id/ok_btn"
@@ -156,7 +201,7 @@
android:text="@string/done"
android:textColor="@color/appColor"
android:textSize="@dimen/sp_15"
app:layout_constraintTop_toBottomOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/view1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="SpUsage" />

33
app/src/main/res/layout/fragment_me.xml
View File

@@ -473,6 +473,39 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/me_item_invite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
android:paddingEnd="15dp"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@mipmap/icon_invite"
android:text="@string/menu_my_invite"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:drawablePadding="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:drawableEnd="@drawable/arrow_right"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/me_item_wallet"
android:layout_width="match_parent"

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

@@ -92,6 +92,7 @@
<string name="menu_my_wallet">我的钱包</string>
<string name="menu_my_income">我的礼物票</string>
<string name="menu_my_level">我的等级</string>
<string name="menu_my_invite">邀请好友</string>
<string name="menu_my_decoration">我的装扮</string>
<string name="menu_my_union">我的公会</string>
<string name="menu_my_gold_charge">钻石/充值</string>
@@ -638,6 +639,7 @@
<string name="common_loading_tips">loading…</string>
<string name="text_default_nick">我是一只小萌新</string>
<string name="text_default_code">(选填)</string>
<string name="text_room_queuing_micro_mode">排麦模式</string>
<string name="text_room_pure_mode">纯净模式</string>

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

@@ -8,14 +8,12 @@ import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nis.quicklogin.QuickLogin;
import com.netease.nis.quicklogin.listener.QuickLoginPreMobileListener;
import com.netease.nis.quicklogin.listener.QuickLoginTokenListener;
@@ -23,19 +21,13 @@ import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseLoginAct;
import com.yizhuan.erban.ui.login.LoginPhoneActivity;
import com.yizhuan.erban.utils.OAIDUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
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.BanAccountException;
import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import com.yizhuan.xchat_android_library.utils.TelephonyUtils;
import com.yizhuan.xchat_android_library.utils.codec.MD5Utils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

2
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -854,7 +854,7 @@ public final class UserModel extends BaseModel implements IUserModel {
@Field("voiceDura") String voiceDura,
@Field("region") String region,
@Field("userDesc") String userDesc,
@Field("shareCode") String shareCode);
@Field("inviteCode") String shareCode);
/**
* @param ticket