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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OneToOne/src/main/AndroidManifest.xml
View File

@ -211,6 +211,11 @@
android:label="达人认证入口"
android:windowSoftInputMode="stateHidden|adjustResize" />
<activity
android:name=".activity.setting.FollowActivity"
android:label="达人认证入口"
android:windowSoftInputMode="stateHidden|adjustResize" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.shayu.onetoone.fileprovider"

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));
}
/**

10
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,10 +140,14 @@ public class ChooseLabelActivity extends AbsOTOActivity {
public void onSuccess(HttpCallbackModel data) {
Toast.makeText(mContext, data.getMsg(), Toast.LENGTH_SHORT).show();
if (data.getCode() == 0) {
if (isUserHome) {
finish();
} else {
RouteManager.forwardMainActivity();
finish();
}
}
}
@Override
public void onError(String error) {

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) {
}
});
}

218
OneToOne/src/main/java/com/shayu/onetoone/adapter/SearchAdapter.java Normal file
View File

@ -0,0 +1,218 @@
package com.shayu.onetoone.adapter;
import android.content.Context;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSON;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.SearchUserBean;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.Constants;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.LevelBean;
import com.yunbao.common.bean.LiveBean;
import com.yunbao.common.custom.MyRadioButton;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.utils.CommonIconUtil;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.RouteUtil;
import java.util.List;
import pl.droidsonroids.gif.GifImageView;
/**
* Created by cxf on 2018/9/29.
*/
public class SearchAdapter extends RefreshAdapter<SearchUserBean> {
private View.OnClickListener mFollowClickListener;
private View.OnClickListener mClickListener;
private String mFollow;
private String mFollowing;
private int mFrom;
private String mUid;
public SearchAdapter(Context context, int from) {
super(context);
mFrom = from;
mFollow =mContext.getString(R.string.follow);
mFollowing =mContext.getString(R.string.following);
mFollowClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!canClick()) {
return;
}
Object tag = v.getTag();
if (tag == null) {
return;
}
SearchUserBean bean = (SearchUserBean) tag;
CommonHttpUtil.setAttention(bean.getId(), null);
}
};
mClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!canClick()) {
return;
}
Object tag = v.getTag();
if (tag == null) {
return;
}
SearchUserBean bean = (SearchUserBean) tag;
if (mOnItemClickListener != null) {
mOnItemClickListener.onItemClick(bean, 0);
}
}
};
mUid = CommonAppConfig.getInstance().getUid();
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new Vh(mInflater.inflate(R.layout.item_search, parent, false));
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position, @NonNull List payloads) {
Object payload = payloads.size() > 0 ? payloads.get(0) : null;
((Vh) vh).setData(mList.get(position), position, payload);
}
public void updateItem(String id, int attention) {
if (TextUtils.isEmpty(id)) {
return;
}
for (int i = 0, size = mList.size(); i < size; i++) {
SearchUserBean bean = mList.get(i);
if (bean != null && id.equals(bean.getId())) {
bean.setAttention(attention);
notifyItemChanged(i, Constants.PAYLOAD);
break;
}
}
}
class Vh extends RecyclerView.ViewHolder {
ImageView mAvatar;
TextView mName;
TextView mSign;
ImageView mSex;
ImageView mLevelAnchor;
ImageView mLevel;
MyRadioButton mBtnFollow;
GifImageView btn_live;
public Vh(View itemView) {
super(itemView);
mAvatar = (ImageView) itemView.findViewById(R.id.avatar);
mName = (TextView) itemView.findViewById(R.id.name);
mSign = (TextView) itemView.findViewById(R.id.sign);
mSex = (ImageView) itemView.findViewById(R.id.sex);
mLevelAnchor = (ImageView) itemView.findViewById(R.id.level_anchor);
mLevel = (ImageView) itemView.findViewById(R.id.level);
mBtnFollow = (MyRadioButton) itemView.findViewById(R.id.btn_follow);
btn_live = (GifImageView) itemView.findViewById(R.id.btn_live);
itemView.setOnClickListener(mClickListener);
mBtnFollow.setOnClickListener(mFollowClickListener);
}
void setData(final SearchUserBean bean, int position, Object payload) {
itemView.setTag(bean);
mBtnFollow.setTag(bean);
if (payload == null) {
ImgLoader.displayAvatar(mContext, bean.getAvatar(), mAvatar);
mName.setText(bean.getUserNiceName());
mSign.setText(bean.getSignature());
mSex.setImageResource(CommonIconUtil.getSexIcon(bean.getSex()));
btn_live.setVisibility(View.GONE);
if (bean.getIslive() != null && bean.getIslive().equals("1")) {
btn_live.setVisibility(View.VISIBLE);
}
btn_live.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
gotoLive(bean.getId());
}
});
LevelBean anchorLevelBean = CommonAppConfig.getInstance().getAnchorLevel(bean.getLevelAnchor());
if (anchorLevelBean != null) {
ImgLoader.display(mContext, CommonAppConfig.getInstance().HOST + anchorLevelBean.getThumb(), mLevelAnchor);
}
LevelBean levelBean = CommonAppConfig.getInstance().getLevel(bean.getLevel());
if (levelBean != null) {
ImgLoader.display(mContext, levelBean.getThumb(), mLevel);
}
}
// if (mUid.equals(bean.getId())) {
// if (mBtnFollow.getVisibility() == View.VISIBLE) {
// mBtnFollow.setVisibility(View.INVISIBLE);
// }
// } else {
// if (mBtnFollow.getVisibility() != View.VISIBLE) {
// mBtnFollow.setVisibility(View.VISIBLE);
// }
// if (bean.getAttention() == 1) {
// mBtnFollow.doChecked(true);
// mBtnFollow.setText(mFollowing);
// } else {
// mBtnFollow.doChecked(false);
// mBtnFollow.setText(mFollow);
// }
// }
}
}
private void gotoLive(final String live_id) {
LiveHttpUtil.getLiveInfo(live_id, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
if (liveBean == null) {
return;
}
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
}
@Override
public void onCheckError(String contextError) {
}
});
} else {
RouteUtil.forwardUserHome(mContext, live_id, 0);
}
}
});
}
}

62
OneToOne/src/main/java/com/shayu/onetoone/bean/SearchUserBean.java Normal file
View File

@ -0,0 +1,62 @@
package com.shayu.onetoone.bean;
import android.os.Parcel;
import com.alibaba.fastjson.annotation.JSONField;
import com.yunbao.common.bean.UserBean;
/**
* Created by cxf on 2018/9/29.
*/
public class SearchUserBean extends UserBean {
private int attention;
private String isblack;
@JSONField(name = "isattention")
public int getAttention() {
return attention;
}
@JSONField(name = "isblack")
public String getBlack() {
return isblack;
}
@JSONField(name = "isblack")
public void setBlack(String black) {
this.isblack = black;
}
@JSONField(name = "isattention")
public void setAttention(int attention) {
this.attention = attention;
}
public SearchUserBean() {
}
// @Override
// public void writeToParcel(Parcel dest, int flags) {
// super.writeToParcel(dest, flags);
// dest.writeInt(this.attention);
// }
public SearchUserBean(Parcel in) {
super(in);
this.attention = in.readInt();
}
public static final Creator<SearchUserBean> CREATOR = new Creator<SearchUserBean>() {
@Override
public SearchUserBean[] newArray(int size) {
return new SearchUserBean[size];
}
@Override
public SearchUserBean createFromParcel(Parcel in) {
return new SearchUserBean(in);
}
};
}

27
OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
View File

@ -1259,4 +1259,31 @@ public class OTONetManager {
}
}).isDisposed();
}
public void updatePass(
String name, String mobile, String card_no,
HttpCallback<HttpCallbackModel> callback) {
API.get().otoApi(mContext)
.updaePass(name, mobile, card_no)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
@Override
public void accept(ResponseModel<List<BaseModel>> listResponseModel) throws Exception {
if (listResponseModel.getData().getCode() == 0) {
callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
} else {
callback.onError(listResponseModel.getData().getMsg());
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
}
}).isDisposed();
}
}

5
OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
View File

@ -41,6 +41,7 @@ public class RouteManager {
public static final String ACTIVITY_AUTH_BLOGGER_INLET = "/activity/AuthBloggerInletActivity";
public static final String ACTIVITY_END_CALL="/activity/EndCallActivity";
public static final String ACTIVITY_BLACK_LIST = "/activity/AuthBloggerInletActivity";
/**
* 达人认证入口
@ -67,8 +68,8 @@ public class RouteManager {
/**
* 选择标签
*/
public static void forwardChooseActivity() {
ARouter.getInstance().build(ACTIVITY_CHOOSE_LABEL).navigation();
public static void forwardChooseLabelActivity(boolean isUserHome) {
ARouter.getInstance().build(ACTIVITY_CHOOSE_LABEL).withBoolean("isUserHome",isUserHome).navigation();
}
/**

17
OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
View File

@ -4,7 +4,6 @@ import com.shayu.onetoone.bean.AuthBean;
import com.shayu.onetoone.bean.AuthBloggerBean;
import com.shayu.onetoone.bean.AvatarBean;
import com.shayu.onetoone.bean.ExchangeModel;
import com.shayu.onetoone.bean.ExchangeRecordModel;
import com.shayu.onetoone.bean.FollowBean;
import com.shayu.onetoone.bean.FriendAppMoneyLogModel;
import com.shayu.onetoone.bean.FriendAppMoneySumModel;
@ -245,7 +244,6 @@ public interface OneToOneApi {
Observable<ResponseModel<List<ExchangeModel>>> getExchangeList(
@Query("type") String type
);
/**
* 设置基本信息
*/
@ -326,6 +324,21 @@ public interface OneToOneApi {
@Query("income") String income,
@Query("p") int page
);
/**
* 修改密码
* @param oldpass
* @param pass
* @param pass2
* @return
*/
@GET("/api/public/?service=User.updatePass")
Observable<ResponseModel<List<BaseModel>>> updaePass(
@Query("oldpass") String oldpass,
@Query("pass") String pass,
@Query("pass2") String pass2);
}

1
OneToOne/src/main/java/com/shayu/onetoone/utils/MainHttpUtil.java
View File

@ -360,6 +360,7 @@ public class MainHttpUtil {
public static void getBlackList(int p, HttpCallback callback) {
HttpClient.getInstance().get("User.getBlackList", "User.getBlackList")
.params("p", p)
.params("touid", "1")
.execute(callback);
}

19
OneToOne/src/main/res/layout/activity_edit_profile.xml
View File

@ -348,12 +348,18 @@
android:textColor="#FF5730"
android:textSize="9sp" />
<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="70dp"
android:orientation="horizontal"
android:layout_marginRight="25dp"
android:layout_height="wrap_content">
<TextView
android:id="@+id/auth_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
@ -361,6 +367,15 @@
android:textSize="14sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/img_auth_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/auth_status" />
</LinearLayout>
<ImageView
android:layout_width="16dp"
android:layout_height="18dp"

20
OneToOne/src/main/res/layout/activity_follow.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<include layout="@layout/view_title_custom"/>
<com.yunbao.common.custom.CommonRefreshView
android:id="@+id/refreshView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="1dp"
android:background="@color/white"
app:crv_itemCount="50"
/>
</LinearLayout>

136
OneToOne/src/main/res/layout/activity_modify_pwd.xml Normal file
View File

@ -0,0 +1,136 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/view_title_custom"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="@color/white"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_old"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
<EditText
android:id="@+id/edit_old"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:background="@null"
android:hint="@string/modify_pwd_old_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
</RelativeLayout>
<View
style="@style/line2"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_new"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
<EditText
android:id="@+id/edit_new"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginLeft="80dp"
android:background="@null"
android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
</RelativeLayout>
<View
style="@style/line2"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:orientation="horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/modify_pwd_confirm"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
<EditText
android:id="@+id/edit_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="80dp"
android:background="@null"
android:hint="@string/modify_pwd_confirm_1"
android:inputType="textPassword"
android:textColor="@color/textColor"
android:textColorHint="@color/gray3"
android:textSize="16sp"
/>
</RelativeLayout>
</LinearLayout>
<TextView
android:id="@+id/btn_confirm"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp"
android:background="@drawable/login_btn"
android:gravity="center"
android:text="@string/modify_pwd_confirm_2"
android:textColor="@color/white"
android:textSize="16sp"
/>
</LinearLayout>

1
OneToOne/src/main/res/layout/activity_setting.xml
View File

@ -98,6 +98,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/blacklist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"

108
OneToOne/src/main/res/layout/item_search.xml Normal file
View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="60dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
>
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:scaleType="centerCrop"
app:riv_oval="true"
/>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:layout_toRightOf="@id/avatar"
android:ellipsize="end"
android:maxWidth="130dp"
android:singleLine="true"
android:textColor="@color/textColor"
android:textSize="16sp"
/>
<TextView
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/name"
android:layout_marginRight="80dp"
android:layout_toRightOf="@id/avatar"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/gray3"
android:textSize="14sp"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/name"
android:layout_alignTop="@id/name"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/sex"
android:layout_width="18dp"
android:layout_height="15dp" />
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"/>
<ImageView
android:id="@+id/level"
android:layout_width="30dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"
/>
</LinearLayout>
<com.yunbao.common.custom.MyRadioButton
android:id="@+id/btn_follow"
android:layout_width="44dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/bg_btn_follow"
android:button="@null"
android:gravity="center"
android:textColor="@color/fg_btn_follow"
android:textSize="11sp"
android:visibility="gone"
/>
<pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:visibility="gone"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@mipmap/icon_user_home_living"/>
<View
style="@style/line2"
android:layout_alignParentBottom="true"
/>
</RelativeLayout>

28
OneToOne/src/main/res/layout/view_no_data_follow.xml Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:orientation="vertical"
android:layout_centerInParent="true"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/follow_no_follow"
android:textColor="@color/textColor"
android:textSize="14sp"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/follow_do_follow"
android:textColor="@color/gray1"
android:textSize="14sp"
/>
</LinearLayout>

11
OneToOne/src/main/res/layout/view_no_data_follow_2.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/follow_no_follow_2"
android:textColor="@color/textColor"
android:textSize="14sp"
android:layout_centerInParent="true"
/>

BIN
OneToOne/src/main/res/mipmap-xxhdpi/auth_status.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB