From e4cd95951cd8a98f8f8bf2ace91385a345f7c6f1 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sat, 7 Oct 2023 18:29:49 +0800 Subject: [PATCH] update --- .../message/MsgMoreConfigActivity.java | 159 +++++++++++++- .../adapter/MsgGreetConfigAdapter.java | 41 ++-- .../com/shayu/onetoone/bean/AvatarBean.java | 27 +++ .../com/shayu/onetoone/bean/GreetBean.java | 81 ++++++++ .../onetoone/bean/MsgGreetConfigBean.java | 42 ---- .../shayu/onetoone/manager/OTONetManager.java | 194 ++++++++++++++++++ .../shayu/onetoone/network/OneToOneApi.java | 87 +++----- .../main/res/layout/item_msg_greet_config.xml | 10 + 8 files changed, 519 insertions(+), 122 deletions(-) create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/AvatarBean.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/GreetBean.java delete mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/MsgGreetConfigBean.java diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java index 8d12b7931..e264cc92b 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreConfigActivity.java @@ -1,9 +1,11 @@ package com.shayu.onetoone.activity.message; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; import android.view.View; import android.widget.Button; -import android.widget.CompoundButton; +import android.widget.ImageView; import androidx.appcompat.widget.SwitchCompat; import androidx.recyclerview.widget.LinearLayoutManager; @@ -13,15 +15,28 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.shayu.onetoone.R; import com.shayu.onetoone.activity.AbsOTOActivity; import com.shayu.onetoone.adapter.MsgGreetConfigAdapter; -import com.shayu.onetoone.bean.MsgGreetConfigBean; +import com.shayu.onetoone.bean.AvatarBean; +import com.shayu.onetoone.bean.GreetBean; +import com.shayu.onetoone.manager.OTONetManager; import com.shayu.onetoone.manager.RouteManager; -import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.bean.HttpCallbackModel; +import com.yunbao.common.glide.ImgLoader; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.interfaces.ImageResultCallback; +import com.yunbao.common.utils.ProcessImageUtil; +import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.ToastUtil; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; /** * 打招呼设置界面 */ @Route(path = RouteManager.ACTIVITY_MSG_MORE_CONFIG_ACTIVITY) public class MsgMoreConfigActivity extends AbsOTOActivity { + List deleteList = new ArrayList<>(); RecyclerView recyclerView; MsgGreetConfigAdapter adapter; SwitchCompat msgSwitch; @@ -29,6 +44,8 @@ public class MsgMoreConfigActivity extends AbsOTOActivity { View editLayout; Button cancel, apply; + ProcessImageUtil imageUtil; + @Override protected int getLayoutId() { return R.layout.activity_msg_config; @@ -37,6 +54,7 @@ public class MsgMoreConfigActivity extends AbsOTOActivity { @Override protected void main(Bundle savedInstanceState) { setTitle("打招呼設置"); + imageUtil = new ProcessImageUtil(this); recyclerView = findViewById(R.id.msg_recyclerView); msgSwitch = findViewById(R.id.msg_switch); add = findViewById(R.id.add_msg); @@ -47,21 +65,148 @@ public class MsgMoreConfigActivity extends AbsOTOActivity { adapter = new MsgGreetConfigAdapter(this); recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); recyclerView.setAdapter(adapter); - adapter.setDeleteListener((size, position) -> { - if (size >= 10) { + adapter.setDeleteListener((bean, position) -> { + if (position >= 10) { add.setVisibility(View.GONE); } else { add.setVisibility(View.VISIBLE); } + if (!StringUtil.isEmpty(bean.getId())) { + deleteList.add(bean); + } }); add.setOnClickListener(v -> { - adapter.addItem(new MsgGreetConfigBean()); + adapter.addItem(new GreetBean()); if (adapter.getItemCount() >= 10) { add.setVisibility(View.GONE); } }); - msgSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> editLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE)); + msgSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { + editLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE); + OTONetManager.getInstance(mContext) + .setGreetConfigGreet(isChecked, null); + }); + apply.setOnClickListener(v -> { + adapter.notifyDataSetChanged(); + new Handler(Looper.getMainLooper()).postDelayed(this::save,100); + }); + cancel.setOnClickListener(v -> clearGreet()); + recyclerView.setOnClickListener(v -> adapter.notifyDataSetChanged()); + findViewById(R.id.upload_img).setOnClickListener(v -> { + imageUtil.getImageByAlumb(); + }); + initData(); + imageUtil.setImageResultCallback(new ImageResultCallback() { + @Override + public void beforeCamera() { + + } + + @Override + public void onSuccess(File file) { + OTONetManager.getInstance(mContext) + .updateFile(file, new HttpCallback() { + @Override + public void onSuccess(AvatarBean data) { + System.out.println("头像地址:" + data); + OTONetManager.getInstance(mContext) + .addMessageMoreGreetConfig(data.getAvatar(), "2", new HttpCallback() { + @Override + public void onSuccess(HttpCallbackModel upload) { + if (upload.getCode() == 0) { + ImgLoader.display(mContext, data.getAvatar(), (ImageView) findViewById(R.id.imageView5)); + } + } + + @Override + public void onError(String error) { + + } + }); + } + + @Override + public void onError(String error) { + + } + }); + } + + @Override + public void onFailure() { + + } + }); + } + + private void clearGreet() { + OTONetManager.getInstance(mContext) + .cleanMoreGreetConfig(new HttpCallback() { + @Override + public void onSuccess(HttpCallbackModel data) { + ToastUtil.show(data.getMsg()); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } + + private void save() { + if (!msgSwitch.isChecked()) { + finish(); + return; + } + for (GreetBean bean : adapter.getNotEmptyList()) { + if (StringUtil.isEmpty(bean.getId())) { + addGreet(bean); + } else if (bean.isEdit()) { + editGreet(bean); + } + } + for (GreetBean bean : deleteList) { + OTONetManager.getInstance(mContext).removeMoreGreetConfig(bean.getId(), null); + } + finish(); + } + + private void addGreet(GreetBean bean) { + OTONetManager.getInstance(mContext) + .addMessageMoreGreetConfig(bean.getContent(), bean.getType() + "", null); + } + + private void editGreet(GreetBean bean) { + OTONetManager.getInstance(mContext) + .setMoreGreetConfig(bean.getId(), bean.getContent(), bean.getType() + "", null); + } + private void initData() { + OTONetManager.getInstance(mContext) + .getMessageMoreGreetConfig(new HttpCallback>() { + @Override + public void onSuccess(List data) { + adapter.setList(data); + } + + @Override + public void onError(String error) { + + } + }); + OTONetManager.getInstance(mContext) + .getGreetConfigStatus(new HttpCallback() { + @Override + public void onSuccess(Boolean data) { + msgSwitch.setChecked(data); + } + + @Override + public void onError(String error) { + + } + }); } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java index f617bb03a..2bf1b9571 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgGreetConfigAdapter.java @@ -4,17 +4,20 @@ import android.content.Context; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.shayu.onetoone.R; -import com.shayu.onetoone.bean.MsgGreetConfigBean; +import com.shayu.onetoone.bean.GreetBean; import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.StringUtil; import java.util.ArrayList; import java.util.List; @@ -23,34 +26,38 @@ import java.util.List; * 打招呼设置适配器 */ public class MsgGreetConfigAdapter extends RecyclerView.Adapter { - List mList; + List mList; Context mContext; - OnItemClickListener deleteListener; + OnItemClickListener deleteListener; public MsgGreetConfigAdapter(Context mContext) { this.mContext = mContext; this.mList = new ArrayList<>(); } - public void setList(List mList) { + public void setList(List mList) { this.mList = mList; notifyDataSetChanged(); } - public void setDeleteListener(OnItemClickListener deleteListener) { + public void setDeleteListener(OnItemClickListener deleteListener) { this.deleteListener = deleteListener; } - public List getNotEmptyList() { - List tmp = new ArrayList<>(); - for (MsgGreetConfigBean bean : mList) { - if (bean.getContent() != null) { + public List getNotEmptyList() { + List tmp = new ArrayList<>(); + for (GreetBean bean : mList) { + if (!StringUtil.isEmpty(bean.getContent())) { tmp.add(bean); } } return tmp; } + public List getmList() { + return mList; + } + @NonNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { @@ -60,6 +67,7 @@ public class MsgGreetConfigAdapter extends RecyclerView.Adapter notifyDataSetChanged()); } - public void setData(MsgGreetConfigBean bean, int position) { + public void setData(GreetBean bean, int position) { del.setOnClickListener(v -> { + mList.get(position).setContent(editText.getText().toString()); + editText.setEnabled(false); mList.remove(position); if (deleteListener != null) { - deleteListener.onItemClick(mList.size(), position); + deleteListener.onItemClick(bean, mList.size()); } notifyDataSetChanged(); }); edit.setOnClickListener(v -> { + mList.get(position).setEdit(true); editText.setEnabled(true); editText.requestFocus(); }); @@ -108,7 +120,6 @@ public class MsgGreetConfigAdapter extends RecyclerView.Adapter 0) { mList.get(position).setContent(editText.getText().toString()); editText.setEnabled(false); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/AvatarBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/AvatarBean.java new file mode 100644 index 000000000..d283ed0e8 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/AvatarBean.java @@ -0,0 +1,27 @@ +package com.shayu.onetoone.bean; + +import com.yunbao.common.bean.BaseModel; + +public class AvatarBean extends BaseModel { + private String avatar; + private String avatarThumb; + + public AvatarBean() { + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getAvatarThumb() { + return avatarThumb; + } + + public void setAvatarThumb(String avatarThumb) { + this.avatarThumb = avatarThumb; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/GreetBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/GreetBean.java new file mode 100644 index 000000000..ade2a27fb --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/GreetBean.java @@ -0,0 +1,81 @@ +package com.shayu.onetoone.bean; + +import com.yunbao.common.bean.BaseModel; + +public class GreetBean extends BaseModel { + private String id; + private int uid; + private String content; + private int type; + private long createTime; + private long updateTime; + private int status; + private boolean isEdit; + + public GreetBean() { + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getUid() { + return uid; + } + + public void setUid(int uid) { + this.uid = uid; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public long getCreateTime() { + return createTime; + } + + public void setCreateTime(long createTime) { + this.createTime = createTime; + } + + public long getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(long updateTime) { + this.updateTime = updateTime; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public boolean isEdit() { + return isEdit; + } + + public void setEdit(boolean edit) { + isEdit = edit; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/MsgGreetConfigBean.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/MsgGreetConfigBean.java deleted file mode 100644 index 19c6e93a1..000000000 --- a/OneToOne/src/main/java/com/shayu/onetoone/bean/MsgGreetConfigBean.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.shayu.onetoone.bean; - -import com.yunbao.common.bean.BaseModel; - -/** - * 打招呼设置 - */ -public class MsgGreetConfigBean extends BaseModel { - private int id; - private String content; - - public MsgGreetConfigBean(String content) { - this.content = content; - } - - public MsgGreetConfigBean() { - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public String toString() { - return "MsgGreetConfigBean{" + - "id=" + id + - ", content='" + content + '\'' + - '}'; - } -} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java index 1475745d6..e71416f0c 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java @@ -3,6 +3,8 @@ package com.shayu.onetoone.manager; import android.content.Context; import android.util.Log; +import com.shayu.onetoone.bean.AvatarBean; +import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.JoinAnchorBean; import com.shayu.onetoone.bean.UserBean; import com.shayu.onetoone.network.API; @@ -14,11 +16,15 @@ import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.utils.MD5Util; +import java.io.File; import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; +import okhttp3.MediaType; +import okhttp3.MultipartBody; +import okhttp3.RequestBody; /** * 网络管理类 使用参考{@link com.yunbao.common.http.live.LiveNetManager} @@ -177,5 +183,193 @@ public class OTONetManager { }).isDisposed(); } + public void getMessageMoreGreetConfig(HttpCallback> callback) { + API.get().otoApi(mContext) + .getMessageMoreGreetConfig() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> liveGiftBeanResponseModel) throws Exception { + if (callback != null) { + callback.onSuccess(liveGiftBeanResponseModel.getData().getInfo()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + public void addMessageMoreGreetConfig(String content, String type, HttpCallback callback) { + API.get().otoApi(mContext) + .addMoreGreetConfig("1", content, type) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(new HttpCallbackModel(model.getData().getCode(), model.getData().getMsg())); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void setMoreGreetConfig(String id, String content, String type, HttpCallback callback) { + API.get().otoApi(mContext) + .setMoreGreetConfig(id, "1", content, type) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(new HttpCallbackModel(model.getData().getCode(), model.getData().getMsg())); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void removeMoreGreetConfig(String id, HttpCallback callback) { + API.get().otoApi(mContext) + .removeMoreGreetConfig(id) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(new HttpCallbackModel(model.getData().getCode(), model.getData().getMsg())); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void cleanMoreGreetConfig(HttpCallback callback) { + API.get().otoApi(mContext) + .cleanMoreGreetConfig() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(new HttpCallbackModel(model.getData().getCode(), model.getData().getMsg())); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void getGreetConfigStatus(HttpCallback callback) { + API.get().otoApi(mContext) + .getGreetConfigStatus() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(model.getData().getInfo() == 2); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void setGreetConfigGreet(boolean status, HttpCallback callback) { + API.get().otoApi(mContext) + .setGreetConfigGreet("1", status ? "2" : "1") + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(new HttpCallbackModel(model.getData().getCode(), model.getData().getMsg())); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + public void updateFile(File file, HttpCallback callback) { + MultipartBody.Part uploadFile = createUploadFile(file); + API.get().otoApi(mContext) + .updateFile(uploadFile) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel model) throws Exception { + if (callback != null) { + callback.onSuccess(model.getData().getInfo()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + Log.e(TAG, "accept: ", throwable); + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + private MultipartBody.Part createUploadFile(File file) { + RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file); + return MultipartBody.Part.createFormData("file", file.getName(), requestBody); + } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java index 0e480bdd9..fab8c220c 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java @@ -1,77 +1,24 @@ package com.shayu.onetoone.network; -import com.alibaba.fastjson.JSONObject; +import com.shayu.onetoone.bean.AvatarBean; +import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.JoinAnchorBean; import com.shayu.onetoone.bean.UserBean; -import com.yunbao.common.bean.ActiveModel; -import com.yunbao.common.bean.AnchorRecommendItemModel; -import com.yunbao.common.bean.AnchorRecommendModel; import com.yunbao.common.bean.BaseModel; -import com.yunbao.common.bean.BlindBoxInfoModel; -import com.yunbao.common.bean.CheckLiveModel; -import com.yunbao.common.bean.ContributeModel; -import com.yunbao.common.bean.CustomSidebarInfoModel; -import com.yunbao.common.bean.DiscountsModel; -import com.yunbao.common.bean.EnterRoomNewModel; -import com.yunbao.common.bean.FaceBookUpModel; -import com.yunbao.common.bean.FansCheckRed; -import com.yunbao.common.bean.FansGroupGiftPack; -import com.yunbao.common.bean.FansGroupGiftPackInfo; -import com.yunbao.common.bean.GiftAlreadyWallModel; -import com.yunbao.common.bean.GiftGuideModel; -import com.yunbao.common.bean.GiftNamingInfoModel; -import com.yunbao.common.bean.GiftWallGiftDetail; -import com.yunbao.common.bean.GiftWallModel; -import com.yunbao.common.bean.HourRank; -import com.yunbao.common.bean.HttpCallbackModel; import com.yunbao.common.bean.IMLoginModel; -import com.yunbao.common.bean.LinkMicUserBeanV2; -import com.yunbao.common.bean.ListInfoMessageModel; -import com.yunbao.common.bean.LiveAiRobotBean; -import com.yunbao.common.bean.LiveAnchorCallMeModel; -import com.yunbao.common.bean.LiveAnchorSayModel; -import com.yunbao.common.bean.LiveDataInfoModel; -import com.yunbao.common.bean.LiveInfoModel; -import com.yunbao.common.bean.LiveRoomActivityBanner; -import com.yunbao.common.bean.LiveRoomVoteModel; -import com.yunbao.common.bean.LiveStetUpStatusModel; -import com.yunbao.common.bean.LiveTaskModel; -import com.yunbao.common.bean.LiveUserMailBoxModel; -import com.yunbao.common.bean.MedalAchievementModel; -import com.yunbao.common.bean.MsgSwitchDetailModel; -import com.yunbao.common.bean.NewPeopleInfo; -import com.yunbao.common.bean.NobleRankHideUserListModel; -import com.yunbao.common.bean.NobleTrumpetModel; -import com.yunbao.common.bean.PkRankBean; -import com.yunbao.common.bean.PrankGiftBean; -import com.yunbao.common.bean.PrankHttpTurntableBean; -import com.yunbao.common.bean.RandomPkUserBean; -import com.yunbao.common.bean.RankPkInfoBean; -import com.yunbao.common.bean.RedPacketDetailsBean; -import com.yunbao.common.bean.RedPacketGiftModel; -import com.yunbao.common.bean.RedPacketInfoModel; -import com.yunbao.common.bean.RedPacketListBean; -import com.yunbao.common.bean.SearchModel; -import com.yunbao.common.bean.SetAttentsModel; -import com.yunbao.common.bean.SlideInBannerModel; -import com.yunbao.common.bean.StarChallengeStatusModel; -import com.yunbao.common.bean.UserAreaBean; -import com.yunbao.common.bean.UserAvatarSelectBean; -import com.yunbao.common.bean.VipModel; -import com.yunbao.common.bean.WishListGiftConfModel; -import com.yunbao.common.bean.WishListModel; import com.yunbao.common.http.ResponseModel; import java.util.List; -import java.util.Map; import io.reactivex.Observable; +import okhttp3.MultipartBody; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; +import retrofit2.http.Multipart; import retrofit2.http.POST; +import retrofit2.http.Part; import retrofit2.http.Query; -import retrofit2.http.QueryMap; /** * 1v1网络接口访问 参考 {@link com.yunbao.common.http.PDLiveApi} @@ -115,6 +62,30 @@ public interface OneToOneApi { @Query("type") String type, @Query("pushid")String pushid ); + + @GET("/api/public/?service=Friendappinfos.getText") + Observable>> getMessageMoreGreetConfig(); + @GET("/api/public/?service=Friendappinfos.addText") + Observable> addMoreGreetConfig( @Query("status")String status, + @Query("content")String content, + @Query("type")String type); + @GET("/api/public/?service=Friendappinfos.editText") + Observable> setMoreGreetConfig( @Query("id")String id, + @Query("status")String status, + @Query("content")String content, + @Query("type")String type); + @GET("/api/public/?service=Friendappinfos.delText") + Observable> removeMoreGreetConfig( @Query("id")String id); + @GET("/api/public/?service=Friendappinfos.cleanText") + Observable> cleanMoreGreetConfig(); + @GET("/api/public/?service=Friendappinfos.isHolle") + Observable> getGreetConfigStatus(); + @GET("/api/public/?service=Friendappinfos.setTextStatus") + Observable> setGreetConfigGreet( @Query("id")String id, @Query("status")String status); + + @POST("/api/public/?service=Friendappinfos.updateAvatar") + @Multipart + Observable> updateFile(@Part MultipartBody.Part file); } diff --git a/OneToOne/src/main/res/layout/item_msg_greet_config.xml b/OneToOne/src/main/res/layout/item_msg_greet_config.xml index 9f1e58b07..15ec24de9 100644 --- a/OneToOne/src/main/res/layout/item_msg_greet_config.xml +++ b/OneToOne/src/main/res/layout/item_msg_greet_config.xml @@ -44,4 +44,14 @@ app:layout_constraintEnd_toStartOf="@+id/del" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@mipmap/ic_msg_more_config_edit" /> + \ No newline at end of file