yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设置-修改密码,黑名单

Browse Source
This commit is contained in:
hch
2023-10-23 15:08:13 +08:00
parent d7e4ad9aca
commit 758b87e426
22 changed files with 969 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
View File

@@ -539,7 +539,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
* 设置
*/
private void forwardSetting() {
// mContext.startActivity(new Intent(mContext, SettingActivity.class));
mContext.startActivity(new Intent(mContext, SettingActivity.class));
}
/**

14
OneToOne/src/main/java/com/shayu/onetoone/activity/login/ChooseLabelActivity.java
View File

@@ -20,6 +20,7 @@ import com.shayu.onetoone.bean.LabelBean;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.xuexiang.xui.widget.flowlayout.FlowTagLayout;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.http.base.HttpCallback;
@@ -47,6 +48,8 @@ public class ChooseLabelActivity extends AbsOTOActivity {
Button submit; //提交
boolean isUserHome;
@Override
protected int getLayoutId() {
return R.layout.activity_choose_label;
@@ -59,6 +62,9 @@ public class ChooseLabelActivity extends AbsOTOActivity {
}
private void initDate() {
isUserHome = getIntent().getBooleanExtra("isUserHome", false);
OTONetManager.getInstance(mContext).getSysLabel(new HttpCallback<List<LabelBean>>() {
@Override
public void onSuccess(List<LabelBean> data) {
@@ -134,8 +140,12 @@ public class ChooseLabelActivity extends AbsOTOActivity {
public void onSuccess(HttpCallbackModel data) {
Toast.makeText(mContext, data.getMsg(), Toast.LENGTH_SHORT).show();
if (data.getCode() == 0) {
RouteManager.forwardMainActivity();
finish();
if (isUserHome) {
finish();
} else {
RouteManager.forwardMainActivity();
finish();
}
}
}

5
OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
View File

@@ -3,7 +3,6 @@ package com.shayu.onetoone.activity.login;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
@@ -21,13 +20,11 @@ import com.blankj.utilcode.util.StringUtils;
import com.lxj.xpopup.XPopup;
import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.AbsOTOActivity;
import com.shayu.onetoone.activity.MainActivity;
import com.shayu.onetoone.bean.AvatarBean;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.view.UserAvatarPopup;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
@@ -204,7 +201,7 @@ public class CompleteActivity extends AbsOTOActivity {
public void onSuccess(HttpCallbackModel data) {
Toast.makeText(mContext, data.getMsg(), Toast.LENGTH_SHORT).show();
if (data.getCode() == 0) {
RouteManager.forwardChooseActivity();
RouteManager.forwardChooseLabelActivity(false);
finish();
}
}

151
OneToOne/src/main/java/com/shayu/onetoone/activity/setting/FollowActivity.java Normal file
View File

@@ -0,0 +1,151 @@
package com.shayu.onetoone.activity.setting;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.fastjson.JSON;
import com.shayu.onetoone.R;
import com.shayu.onetoone.adapter.SearchAdapter;
import com.shayu.onetoone.bean.SearchUserBean;
import com.shayu.onetoone.utils.MainHttpConsts;
import com.shayu.onetoone.utils.MainHttpUtil;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.event.FollowEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.RouteUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.Arrays;
import java.util.List;
/**
* 我的关注 TA的关注
*/
public class FollowActivity extends AbsActivity implements OnItemClickListener<SearchUserBean> {
public static void forward(Context context, String toUid, int isBlack) {
Intent intent = new Intent(context, FollowActivity.class);
intent.putExtra(Constants.TO_UID, toUid);
intent.putExtra(Constants.isBlack, isBlack);
context.startActivity(intent);
}
private CommonRefreshView mRefreshView;
private SearchAdapter mAdapter;
private String mToUid;
private int isBlack;
private int intoIndex = 0;
@Override
protected int getLayoutId() {
return R.layout.activity_follow;
}
@Override
protected void main() {
mToUid = getIntent().getStringExtra(Constants.TO_UID);
isBlack = getIntent().getIntExtra(Constants.isBlack, 0);
if (TextUtils.isEmpty(mToUid)) {
return;
}
mRefreshView = findViewById(R.id.refreshView);
if (isBlack == 1) {
setTitle(mContext.getString(R.string.my_black));
} else if (mToUid.equals(CommonAppConfig.getInstance().getUid())) {
setTitle(mContext.getString(R.string.follow_my_follow));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_follow);
} else {
setTitle(mContext.getString(R.string.follow_ta_follow));
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_follow_2);
}
mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<SearchUserBean>() {
@Override
public RefreshAdapter<SearchUserBean> getAdapter() {
if (mAdapter == null) {
mAdapter = new SearchAdapter(mContext, Constants.FOLLOW_FROM_FOLLOW);
mAdapter.setOnItemClickListener(FollowActivity.this);
}
return mAdapter;
}
@Override
public void loadData(int p, HttpCallback callback) {
if (isBlack == 1) {
MainHttpUtil.getBlackList(p, callback);
} else {
MainHttpUtil.getFollowList(mToUid, p, callback);
}
}
@Override
public List<SearchUserBean> processData(String[] info) {
return JSON.parseArray(Arrays.toString(info), SearchUserBean.class);
}
@Override
public void onRefreshSuccess(List<SearchUserBean> list, int listCount) {
}
@Override
public void onRefreshFailure() {
}
@Override
public void onLoadMoreSuccess(List<SearchUserBean> loadItemList, int loadItemCount) {
}
@Override
public void onLoadMoreFailure() {
}
});
EventBus.getDefault().register(this);
mRefreshView.initData();
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onFollowEvent(FollowEvent e) {
if (mAdapter != null) {
mAdapter.updateItem(e.getToUid(), e.getIsAttention());
}
}
@Override
protected void onDestroy() {
EventBus.getDefault().unregister(this);
MainHttpUtil.cancel(MainHttpConsts.GET_FOLLOW_LIST);
super.onDestroy();
}
@Override
public void onItemClick(SearchUserBean bean, int position) {
RouteUtil.forwardUserHome(mContext, bean.getId(), 0);
intoIndex = 1;
}
@Override
protected void onResume() {
super.onResume();
if (intoIndex == 1) {
intoIndex = 0;
mRefreshView.initData();
}
}
}

91
OneToOne/src/main/java/com/shayu/onetoone/activity/setting/ModifyPwdActivity.java Normal file
View File

@@ -0,0 +1,91 @@
package com.shayu.onetoone.activity.setting;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.user.AuthActivity;
import com.shayu.onetoone.manager.OTONetManager;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.utils.ToastUtil;
import java.util.List;
/**
* 重置密码
*/
public class ModifyPwdActivity extends AbsActivity implements View.OnClickListener {
private EditText mEditOld;
private EditText mEditNew;
private EditText mEditConfirm;
@Override
protected int getLayoutId() {
return R.layout.activity_modify_pwd;
}
@Override
protected void main() {
setTitle(mContext.getString(R.string.modify_pwd));
mEditOld = (EditText) findViewById(R.id.edit_old);
mEditNew = (EditText) findViewById(R.id.edit_new);
mEditConfirm = (EditText) findViewById(R.id.edit_confirm);
findViewById(R.id.btn_confirm).setOnClickListener(this);
}
@Override
public void onClick(View v) {
modify();
}
private void modify() {
String pwdOld = mEditOld.getText().toString().trim();
if (TextUtils.isEmpty(pwdOld)) {
mEditOld.setError(mContext.getString(R.string.modify_pwd_old_1));
return;
}
String pwdNew = mEditNew.getText().toString().trim();
if (TextUtils.isEmpty(pwdNew)) {
mEditNew.setError(mContext.getString(R.string.modify_pwd_new_1));
return;
}
String pwdConfirm = mEditConfirm.getText().toString().trim();
if (TextUtils.isEmpty(pwdConfirm)) {
mEditConfirm.setError(mContext.getString(R.string.modify_pwd_confirm_1));
return;
}
if (!pwdNew.equals(pwdConfirm)) {
mEditConfirm.setError(mContext.getString(R.string.reg_pwd_error));
return;
}
OTONetManager.getInstance(ModifyPwdActivity.this).updatePass(pwdOld, pwdNew, pwdConfirm, new HttpCallback<HttpCallbackModel>() {
@Override
public void onSuccess(HttpCallbackModel data) {
if (data.getCode() == 0) {
ToastUtil.show(data.getMsg());
finish();
} else {
ToastUtil.show(data.getMsg());
}
}
@Override
public void onError(String error) {
}
});
}
@Override
protected void onDestroy() {
super.onDestroy();
}
}

15
OneToOne/src/main/java/com/shayu/onetoone/activity/setting/SettingActivity.java
View File

@@ -51,7 +51,18 @@ public class SettingActivity extends AbsActivity {
RouteUtil.forwardEditProfileActivity();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.change_the_password), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
forwardModifyPwd();
}
});
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.blacklist), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
FollowActivity.forward(mContext,CommonAppConfig.getInstance().getUserBean().getId(),1);
}
});
// 达人认证
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.toBlogger), new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
@@ -103,7 +114,7 @@ public class SettingActivity extends AbsActivity {
* 修改密码
*/
private void forwardModifyPwd() {
//startActivity(new Intent(mContext, ModifyPwdActivity.class));
startActivity(new Intent(mContext, ModifyPwdActivity.class));
}
/**

43
OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
View File

@@ -6,6 +6,7 @@ import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -18,6 +19,7 @@ import com.sahooz.library.Country;
import com.sahooz.library.CountryPicker;
import com.sahooz.library.OnPick;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.AuthBean;
import com.shayu.onetoone.bean.AvatarBean;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
@@ -75,6 +77,7 @@ public class EditProfileActivity extends AbsActivity {
private TextView mSex;
private TextView mCity;
private TextView tv_bind_phone;
private TextView auth_status;
private ProcessImageUtil cameraUtil;
private UserBean mUserBean;
private String mProvinceVal;
@@ -88,6 +91,8 @@ public class EditProfileActivity extends AbsActivity {
int userSex;
AuthBean authBean;
@Override
protected int getLayoutId() {
return R.layout.activity_edit_profile;
@@ -96,6 +101,7 @@ public class EditProfileActivity extends AbsActivity {
@Override
protected void main() {
setTitle(mContext.getString(R.string.edit_profile));
auth_status = findViewById(R.id.auth_status);
mAvatar = (ImageView) findViewById(R.id.avatar);
mName = (TextView) findViewById(R.id.name);
mSign = (TextView) findViewById(R.id.sign);
@@ -247,6 +253,12 @@ public class EditProfileActivity extends AbsActivity {
} else {
showTaskDialog();
}
} else if (i == R.id.btn_like) {
if (isInto) {
editLabel();
} else {
showTaskDialog();
}
} else if (i == R.id.btn_sign) {
if (isInto) {
forwardSign();
@@ -263,7 +275,6 @@ public class EditProfileActivity extends AbsActivity {
public void onSex(int sex) {
userSex = sex;
OTONetManager.getInstance(EditProfileActivity.this).setFiled("sex", String.valueOf(sex), new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
@Override
public void onSuccess(HttpCallbackModel data) {
@@ -323,6 +334,10 @@ public class EditProfileActivity extends AbsActivity {
}
}
private void editLabel() {
RouteManager.forwardChooseLabelActivity(true);
}
private void editName() {
Intent intent = new Intent(mContext, EditNameActivity.class);
intent.putExtra(Constants.NICK_NAME, mUserBean.getUserNiceName());
@@ -665,6 +680,32 @@ public class EditProfileActivity extends AbsActivity {
}
}*/
OTONetManager.getInstance(EditProfileActivity.this).getAuthInfo(new com.yunbao.common.http.base.HttpCallback<AuthBean>() {
@Override
public void onSuccess(AuthBean data) {
authBean = data;
if (data.getName_auth() == 2) {//已通过
auth_status.setText("認證通過");
auth_status.setTextColor(getResources().getColor(R.color.green_81c160));
auth_status.setVisibility(View.GONE);
findViewById(R.id.img_auth_status).setVisibility(View.VISIBLE);
} else if (data.getName_auth() == 3) {//已提交
auth_status.setText("審核中");
auth_status.setTextColor(getResources().getColor(R.color.gray1));
} else if (data.getName_auth() == 4) {
auth_status.setText("審核失敗重新提交");
auth_status.setTextColor(getResources().getColor(R.color.red));
} else {
auth_status.setText("去認證");
auth_status.setTextColor(getResources().getColor(R.color.black2));
}
}
@Override
public void onError(String error) {
}
});
}