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

修复测试提出的bug，修改设置页面ui

Browse Source
This commit is contained in:
wushaocheng
2022-10-16 01:09:02 +08:00
parent 95e7e56a80
commit 96f953aac7
6 changed files with 28 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -12,6 +12,7 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -425,7 +426,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
ivFollowRoom.setVisibility(AvRoomDataManager.get().isRoomOwner() ? View.GONE : View.VISIBLE);
FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1";
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button));
ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect));
setIdOnlineData();
if (isShowChangeGame()) {
@@ -522,7 +524,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
.subscribe(s -> {
AvRoomDataManager.get().isRoomFans = !AvRoomDataManager.get().isRoomFans;
FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1";
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button));
ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect));
if (AvRoomDataManager.get().isRoomFans) {
SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_010));
PraiseModel.get().setFollowRoomSuccessRoomTip(currentRoomInfo.getUid());
@@ -534,7 +537,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFollowRoomEvent(FollowRoomEvent event) {
// ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.icon_room_liked : R.drawable.icon_room_like);
ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button));
ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect));
}
@Subscribe(threadMode = ThreadMode.MAIN)

119
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
View File

@@ -5,36 +5,27 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.text.SpannableString;
import android.text.TextUtils;
import android.view.View;
import androidx.databinding.DataBindingUtil;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivitySettingBinding;
import com.yizhuan.erban.ui.im.avtivity.BlackListManageActivity;
import com.yizhuan.erban.ui.login.BindPhoneActivity;
import com.yizhuan.erban.ui.login.ShowBindPhoneActivity;
import com.yizhuan.erban.ui.login.helper.LogoutHelper;
import com.yizhuan.erban.ui.user.AboutActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.withdraw.WithdrawModel;
import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
@@ -44,16 +35,12 @@ import org.greenrobot.eventbus.ThreadMode;
import java.io.File;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
/**
* Created by zhouxiangfeng on 2017/4/16.
*/
public class SettingActivity extends BaseActivity implements View.OnClickListener {
private ActivitySettingBinding settingBinding;
private WithdrawInfo withdrawInfos;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -86,31 +73,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
.subscribe(info -> {
//刷新下界面
initView();
if (info != null && info.isBindPhone()) {
setPhoneUI(info.getPhone());
} else {
setPhoneUI("");
}
});
WithdrawModel.get().getWithdrawUserInfo(AuthModel.get().getCurrentUid())
.subscribe(withdrawInfo -> {
withdrawInfos = withdrawInfo;
if (withdrawInfo != null) {
if (!TextUtils.isEmpty(withdrawInfo.zxcAccount) && !withdrawInfo.zxcAccount.equals("null")) {
setAlipayUI(withdrawInfo.zxcAccount + "(" + withdrawInfo.zxcAccountName + ")");
} else {
setAlipayUI("");
}
}
});
}
private void setPhoneUI(String phone) {
settingBinding.tvPhone.setText(TextUtils.isEmpty(phone) ? ResUtil.getString(R.string.ui_setting_settingactivity_02) : phone);
}
private void setAlipayUI(String name) {
settingBinding.tvAlipay.setText(TextUtils.isEmpty(name) ? ResUtil.getString(R.string.ui_setting_settingactivity_03) : name);
}
private void initData() {
@@ -121,47 +84,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
@Override
public void onClick(View view) {
switch (view.getId()) {
case R.id.rly_content://反馈
startActivity(new Intent(getApplicationContext(), FeedbackActivity.class));
break;
case R.id.rly_binder://绑定手机
getDialogManager().showProgressDialog(SettingActivity.this, ResUtil.getString(R.string.ui_setting_settingactivity_04));
AuthModel.get().isBindPhone()
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.subscribe(new SingleObserver<String>() {
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onSuccess(String s) {
getDialogManager().dismissDialog();
ShowBindPhoneActivity.start(SettingActivity.this);
}
@Override
public void onError(Throwable e) {
getDialogManager().dismissDialog();
SingleToastUtil.showToast(e.getMessage());
}
});
break;
case R.id.rly_alipay_binder://绑定支付宝
if (UserModel.get().getCacheLoginUserInfo() == null) {
toast(ResUtil.getString(R.string.ui_setting_settingactivity_05));
return;
}
if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) {
Intent intent = new Intent(getApplicationContext(), BinderAlipayActivity.class);
Bundle mBundle = new Bundle();
mBundle.putSerializable("withdrawInfo", withdrawInfos);
intent.putExtras(mBundle);
startActivity(intent);
} else {
BindPhoneActivity.start(context);
}
break;
case R.id.rly_contact_us:
UIHelper.openContactUs(this);
break;
@@ -171,26 +93,12 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
case R.id.rly_update://关于我们
startActivity(new Intent(getApplicationContext(), AboutActivity.class));
break;
case R.id.rly_lab:
startActivity(new Intent(getApplicationContext(), LabActivity.class));
break;
case R.id.tv_black_manager:
BlackListManageActivity.start(this);
break;
case R.id.rly_login_pwd:
ModifyPwdActivity.start(this, ModifyPwdActivity.LOGIN_PWD);
break;
case R.id.rly_pay_pwd:
if (UserModel.get().getCacheLoginUserInfo() == null) {
toast(ResUtil.getString(R.string.ui_setting_settingactivity_06));
return;
}
if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) {
ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD);
} else {
BindPhoneActivity.start(context);
}
break;
case R.id.btn_login_out://退出登录
LogoutHelper.logout();
finish();
@@ -215,9 +123,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
}
});
break;
case R.id.tv_privacy_setting:
PrivacySettingActivity.start(context);
break;
case R.id.tv_notice_setting:
NoticeSettingActivity.start(context);
@@ -246,34 +151,14 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
}
private void initView() {
//实验室模式只要真实的debug模式
if (XChatApplication.isRealDebug()) {
settingBinding.rlyLab.setVisibility(View.VISIBLE);
} else {
settingBinding.rlyLab.setVisibility(View.GONE);
}
UserInfo cacheLoginUserInfo = UserModel.get().getCacheLoginUserInfo();
if (cacheLoginUserInfo == null) return;
if (cacheLoginUserInfo.getBindType() == 1) {
settingBinding.tvThird.setText(ResUtil.getString(R.string.ui_setting_settingactivity_012));
settingBinding.tvWx.setText(ResUtil.getString(R.string.ui_setting_settingactivity_013));
} else if (cacheLoginUserInfo.getBindType() == 2) {
settingBinding.tvThird.setText("QQ");
settingBinding.tvWx.setText(ResUtil.getString(R.string.ui_setting_settingactivity_014));
} else {
settingBinding.rlThird.setVisibility(View.GONE);
}
if (cacheLoginUserInfo.isBindPasswd()) {
settingBinding.tvLoginPwd.setText(ResUtil.getString(R.string.ui_setting_settingactivity_015));
settingBinding.rlyLoginPwd.setVisibility(View.GONE);
settingBinding.viewSetPassword.setVisibility(View.GONE);
} else {
settingBinding.tvLoginPwd.setText(ResUtil.getString(R.string.ui_setting_settingactivity_016));
}
if (!cacheLoginUserInfo.isBindPaymentPwd()) {
settingBinding.tvPayModify.setText(ResUtil.getString(R.string.ui_setting_settingactivity_017));
} else {
settingBinding.tvPayModify.setText(ResUtil.getString(R.string.ui_setting_settingactivity_018));
}
}
public static class MissingPermissionException extends RuntimeException {

7
app/src/main/res/drawable/bg_room_have_collect_button.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="#ff000000" />
<solid android:color="#26ffffff" />
<corners android:topLeftRadius="12dp" android:topRightRadius="12dp" android:bottomLeftRadius="12dp" android:bottomRightRadius="12dp" />
</shape>

294
app/src/main/res/layout/activity_setting.xml
View File

@@ -30,149 +30,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_third"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:id="@+id/tv_third"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_third"
android:textColor="@color/text_title_color"
android:textSize="@dimen/dp_14" />
<TextView
android:id="@+id/tv_wx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@+id/account_right"
android:text="@string/text_setting_wx"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp" />
<ImageView
android:id="@+id/account_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rly_binder"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_phone"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<ImageView
android:id="@+id/binder_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/binder_right"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="123456" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_alipay_binder"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:id="@+id/label_alipay_binder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_alipay_account"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_alipay_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_alipay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/iv_alipay_right"
android:layout_toEndOf="@id/label_alipay_binder"
android:gravity="end"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp"
tools:text="@string/layout_activity_setting_01" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_login_pwd"
android:layout_width="match_parent"
@@ -187,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_login_password"
android:text="@string/ui_setting_settingactivity_016"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
@@ -203,72 +60,7 @@
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_pay_pwd"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_pay_password"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_pay_pwd_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_pay_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_14"
android:layout_toStartOf="@id/iv_pay_pwd_arrow"
android:text="@string/text_modify"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<TextView
android:id="@+id/tv_privacy_setting"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_setting_item_height"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/privacy_setting"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_14"
android:visibility="gone" />
<View
android:id="@+id/view_set_password"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
@@ -310,8 +102,10 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/line_height_201F27" />
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_permission"
@@ -341,8 +135,10 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/line_height_201F27" />
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_help"
@@ -370,41 +166,6 @@
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_content"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_feedback"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<ImageView
android:id="@+id/arrow_right1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
@@ -572,41 +333,6 @@
tools:ignore="SpUsage" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rly_lab"
android:layout_width="match_parent"
android:layout_height="50dp"
android:clickable="true"
android:focusable="true"
android:onClick="@{click}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_lab"
android:textColor="@color/text_title_color"
android:textSize="14sp" />
<ImageView
android:id="@+id/lab_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/arrow_right" />
</RelativeLayout>
<TextView
android:id="@+id/btn_login_out"
android:layout_width="320dp"

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

@@ -78,7 +78,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="15dp"
app:layout_constraintEnd_toStartOf="@id/ll_user_attentions"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/iv_user_head"
@@ -212,7 +211,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_22"
android:layout_marginEnd="@dimen/dp_10"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"

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

@@ -1056,6 +1056,7 @@
<string name="room_next_pk_starts">距離下一場PK開始</string>
<string name="room_play_music">播放音樂</string>
<string name="room_collect">收藏</string>
<string name="room_have_collect">已收藏</string>
<string name="main_androidmanifest_01">輸入手機號界面</string>
<string name="main_androidmanifest_02">輸入驗證碼界面</string>