From dff84a30e42309f449dfe70800064669f44260ed Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 20 Oct 2023 15:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OneToOne/src/main/AndroidManifest.xml | 10 +- .../activity/DiamondExchangeActivity.java | 58 ++++ .../onetoone/activity/MyArnActivity.java | 90 ++++++ .../activity/fragments/MyFragment.java | 9 +- .../adapter/DiamondExchangeAdapter.java | 42 +++ .../shayu/onetoone/adapter/MyArnAdapter.java | 43 +++ .../shayu/onetoone/bean/ExchangeModel.java | 52 ++++ .../onetoone/bean/FriendAppMoneyLogModel.java | 140 +++++++++ .../onetoone/bean/FriendAppMoneySumModel.java | 30 ++ .../shayu/onetoone/manager/OTONetManager.java | 87 +++++- .../shayu/onetoone/manager/RouteManager.java | 2 + .../shayu/onetoone/network/OneToOneApi.java | 29 +- .../view/DiamondExchangeViewHolder.java | 28 ++ .../shayu/onetoone/view/MyArnViewHolder.java | 41 +++ .../background_diamond_exchange_select.png | Bin 0 -> 8154 bytes .../background_diamond_exchange_unselect.png | Bin 0 -> 12789 bytes .../res/drawable/bg_diamond_exchange_btn.xml | 5 + .../res/drawable/button_diamond_exchange.xml | 5 + .../res/drawable/button_my_arn_exchange.xml | 7 + .../res/drawable/button_my_arn_exchange2.xml | 5 + .../res/drawable/input_diamond_exchange.xml | 5 + .../res/layout/activity_diamond_exchange.xml | 152 ++++++++++ .../main/res/layout/activity_my_arnings.xml | 267 ++++++++++++++++++ .../view_diamond_exchange_item_holder.xml | 42 +++ .../res/layout/view_my_arn_item_holder.xml | 71 +++++ .../background_exchange_star_top.png | Bin 0 -> 65510 bytes .../mipmap-xxhdpi/background_my_arnings.png | Bin 0 -> 669201 bytes .../main/res/mipmap-xxhdpi/icon_arn_coin.png | Bin 0 -> 3746 bytes .../res/mipmap-xxhdpi/icon_my_arn_back.png | Bin 0 -> 1057 bytes .../iocn_exchange_star_toggle.png | Bin 0 -> 770 bytes OneToOne/src/main/res/values/strings.xml | 17 ++ 31 files changed, 1223 insertions(+), 14 deletions(-) create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/DiamondExchangeActivity.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/adapter/DiamondExchangeAdapter.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java create mode 100644 OneToOne/src/main/res/drawable/background_diamond_exchange_select.png create mode 100644 OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png create mode 100644 OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml create mode 100644 OneToOne/src/main/res/drawable/button_diamond_exchange.xml create mode 100644 OneToOne/src/main/res/drawable/button_my_arn_exchange.xml create mode 100644 OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml create mode 100644 OneToOne/src/main/res/drawable/input_diamond_exchange.xml create mode 100644 OneToOne/src/main/res/layout/activity_diamond_exchange.xml create mode 100644 OneToOne/src/main/res/layout/activity_my_arnings.xml create mode 100644 OneToOne/src/main/res/layout/view_diamond_exchange_item_holder.xml create mode 100644 OneToOne/src/main/res/layout/view_my_arn_item_holder.xml create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/background_exchange_star_top.png create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/background_my_arnings.png create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/icon_arn_coin.png create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/icon_my_arn_back.png create mode 100644 OneToOne/src/main/res/mipmap-xxhdpi/iocn_exchange_star_toggle.png diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml index 902225d5d..109d31630 100644 --- a/OneToOne/src/main/AndroidManifest.xml +++ b/OneToOne/src/main/AndroidManifest.xml @@ -141,6 +141,12 @@ + + @@ -149,10 +155,10 @@ android:windowSoftInputMode="stateHidden|adjustResize" /> + android:windowSoftInputMode="stateHidden|adjustResize" /> + android:windowSoftInputMode="stateHidden|adjustResize" /> >() { + @Override + public void onSuccess(List data) { + exchangeAdapter.addData(data); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java new file mode 100644 index 000000000..3f35eddb0 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java @@ -0,0 +1,90 @@ +package com.shayu.onetoone.activity; + + +import android.os.Bundle; +import android.widget.TextView; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.shayu.onetoone.R; +import com.shayu.onetoone.adapter.MyArnAdapter; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; +import com.shayu.onetoone.manager.OTONetManager; +import com.shayu.onetoone.manager.RouteManager; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +import java.util.List; + + +@Route(path = RouteManager.ACTIVITY_MY_ARN) +public class MyArnActivity extends AbsOTOActivity { + private TextView todayEarnings, cumulativeIncome; + + private MyArnAdapter myArnAdapter; + private RecyclerView myArnList; + + @Override + protected int getLayoutId() { + return R.layout.activity_my_arnings; + + } + + @Override + protected void main(Bundle savedInstanceState) { + initView(); + initData(); + } + + private void initView() { + todayEarnings = findViewById(R.id.today_earnings); + cumulativeIncome = findViewById(R.id.cumulative_income); + myArnList = findViewById(R.id.my_arn_list); + myArnList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); + myArnAdapter = new MyArnAdapter(); + myArnList.setAdapter(myArnAdapter); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.my_arn_back), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + finish(); + } + }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.diamond_star_coins), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + RouteManager.forwardActivity(RouteManager.ACTIVITY_DIAMOND_EXCHANGE); + } + }); + + } + + private void initData() { + OTONetManager.getInstance(mContext).getFriendAppMoneySum(new HttpCallback() { + @Override + public void onSuccess(FriendAppMoneySumModel data) { + todayEarnings.setText(data.getToday()); + cumulativeIncome.setText(data.getSum()); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + OTONetManager.getInstance(mContext).getFriendAppMoneyLogModel("3", "1", new HttpCallback>() { + @Override + public void onSuccess(List data) { + myArnAdapter.showData(data); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java index 6a37d68e6..28b258c61 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java @@ -3,7 +3,6 @@ package com.shayu.onetoone.activity.fragments; import android.content.ClipboardManager; import android.content.Context; -import android.content.Intent; import android.graphics.Outline; import android.os.Bundle; import android.text.TextUtils; @@ -39,7 +38,6 @@ import com.shayu.onetoone.view.CustomMyViewHolder; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppContext; import com.yunbao.common.Constants; -import com.yunbao.common.HtmlConfig; import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.GoogleBean; import com.yunbao.common.bean.LevelBean; @@ -446,8 +444,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener exchangeModels = new ArrayList<>(); + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View bodyView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_diamond_exchange_item_holder, parent, false); + return new DiamondExchangeViewHolder(bodyView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + DiamondExchangeViewHolder exchangeViewHolder = (DiamondExchangeViewHolder) holder; + exchangeViewHolder.showData(exchangeModels.get(position)); + } + + @Override + public int getItemCount() { + return exchangeModels.size(); + } + + public void addData(List mExchangeModels) { + exchangeModels.clear(); + exchangeModels.addAll(mExchangeModels); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java new file mode 100644 index 000000000..f11933518 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java @@ -0,0 +1,43 @@ +package com.shayu.onetoone.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.view.MyArnViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class MyArnAdapter extends RecyclerView.Adapter { + private List friendAppMoneyLogModels = new ArrayList<>(); + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View bodyView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_my_arn_item_holder, parent, false); + return new MyArnViewHolder(bodyView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + MyArnViewHolder arnViewHolder = (MyArnViewHolder) holder; + arnViewHolder.setData(friendAppMoneyLogModels.get(position)); + } + + @Override + public int getItemCount() { + return friendAppMoneyLogModels.size(); + } + + public void showData(List mFriendAppMoneyLogModels) { + friendAppMoneyLogModels.clear(); + friendAppMoneyLogModels.addAll(mFriendAppMoneyLogModels); + notifyDataSetChanged(); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java new file mode 100644 index 000000000..8fc31278a --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java @@ -0,0 +1,52 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class ExchangeModel extends BaseModel { + + @SerializedName("top") + private String top; + @SerializedName("name") + private String name; + @SerializedName("title") + private String title; + @SerializedName("num") + private int num; + + public String getTop() { + return top; + } + + public ExchangeModel setTop(String top) { + this.top = top; + return this; + } + + public String getName() { + return name; + } + + public ExchangeModel setName(String name) { + this.name = name; + return this; + } + + public String getTitle() { + return title; + } + + public ExchangeModel setTitle(String title) { + this.title = title; + return this; + } + + public int getNum() { + return num; + } + + public ExchangeModel setNum(int num) { + this.num = num; + return this; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java new file mode 100644 index 000000000..7626c2548 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java @@ -0,0 +1,140 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class FriendAppMoneyLogModel extends BaseModel { + + @SerializedName("id") + private String id; + @SerializedName("uid") + private String uid; + @SerializedName("income") + private String income; + @SerializedName("before_money") + private String beforeMoney; + @SerializedName("money") + private String money; + @SerializedName("after_money") + private String afterMoney; + @SerializedName("memo") + private String memo; + @SerializedName("type") + private String type; + @SerializedName("currency_type") + private String currencyType; + @SerializedName("service_id") + private String serviceId; + @SerializedName("create_time") + private String createTime; + @SerializedName("tuid") + private String tuid; + + public String getId() { + return id; + } + + public FriendAppMoneyLogModel setId(String id) { + this.id = id; + return this; + } + + public String getUid() { + return uid; + } + + public FriendAppMoneyLogModel setUid(String uid) { + this.uid = uid; + return this; + } + + public String getIncome() { + return income; + } + + public FriendAppMoneyLogModel setIncome(String income) { + this.income = income; + return this; + } + + public String getBeforeMoney() { + return beforeMoney; + } + + public FriendAppMoneyLogModel setBeforeMoney(String beforeMoney) { + this.beforeMoney = beforeMoney; + return this; + } + + public String getMoney() { + return money; + } + + public FriendAppMoneyLogModel setMoney(String money) { + this.money = money; + return this; + } + + public String getAfterMoney() { + return afterMoney; + } + + public FriendAppMoneyLogModel setAfterMoney(String afterMoney) { + this.afterMoney = afterMoney; + return this; + } + + public String getMemo() { + return memo; + } + + public FriendAppMoneyLogModel setMemo(String memo) { + this.memo = memo; + return this; + } + + public String getType() { + return type; + } + + public FriendAppMoneyLogModel setType(String type) { + this.type = type; + return this; + } + + public String getCurrencyType() { + return currencyType; + } + + public FriendAppMoneyLogModel setCurrencyType(String currencyType) { + this.currencyType = currencyType; + return this; + } + + public String getServiceId() { + return serviceId; + } + + public FriendAppMoneyLogModel setServiceId(String serviceId) { + this.serviceId = serviceId; + return this; + } + + public String getCreateTime() { + return createTime; + } + + public FriendAppMoneyLogModel setCreateTime(String createTime) { + this.createTime = createTime; + return this; + } + + public String getTuid() { + return tuid; + } + + public FriendAppMoneyLogModel setTuid(String tuid) { + this.tuid = tuid; + return this; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java new file mode 100644 index 000000000..1016cd6e6 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java @@ -0,0 +1,30 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class FriendAppMoneySumModel extends BaseModel { + + @SerializedName("today") + private String today; + @SerializedName("sum") + private String sum; + + public String getToday() { + return today; + } + + public FriendAppMoneySumModel setToday(String today) { + this.today = today; + return this; + } + + public String getSum() { + return sum; + } + + public FriendAppMoneySumModel setSum(String sum) { + this.sum = sum; + return this; + } +} 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 76f1f77a8..8c912cbcd 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java @@ -6,8 +6,10 @@ import android.util.Log; import com.alibaba.fastjson.JSONObject; import com.shayu.onetoone.bean.AvatarBean; -import com.shayu.onetoone.bean.CustomBean; +import com.shayu.onetoone.bean.ExchangeModel; import com.shayu.onetoone.bean.FollowBean; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; import com.shayu.onetoone.bean.GiftBean; import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.HomeItemBean; @@ -30,11 +32,8 @@ import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.MD5Util; -import com.yunbao.faceunity.entity.PropBean; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -45,7 +44,6 @@ import io.rong.imlib.model.UserInfo; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; -import retrofit2.http.Query; /** * 网络管理类 使用参考{@link com.yunbao.common.http.live.LiveNetManager} @@ -848,5 +846,84 @@ public class OTONetManager { }).isDisposed(); } + /** + * @param currencyType 1星币 2砖石 3社交新币种 + * @param income 1收入 2支出 + */ + public void getFriendAppMoneyLogModel(String currencyType, String income, HttpCallback> callback) { + API.get().otoApi(mContext). + getFriendAppMoneyLogModel(currencyType, income) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> listResponseModel) throws Exception { + if (listResponseModel.getData().getCode() == 0) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } else { + callback.onError(listResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + public void getFriendAppMoneySum(HttpCallback callback) { + API.get().otoApi(mContext). + getFriendAppMoneySum() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel friendAppMoneySumModelResponseModel) throws Exception { + if (friendAppMoneySumModelResponseModel.getData().getCode() == 0) { + callback.onSuccess(friendAppMoneySumModelResponseModel.getData().getInfo()); + } else { + callback.onError(friendAppMoneySumModelResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + /** + * + * @param type coin砖石 yuanbao 星币 + * @param callback + */ + public void getExchangeList(String type, HttpCallback> callback) { + API.get().otoApi(mContext). + getExchangeList(type) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> listResponseModel) throws Exception { + if (listResponseModel.getData().getCode() == 0) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } else { + callback.onError(listResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java index 965efb403..9bbddd3a9 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java @@ -15,6 +15,8 @@ public class RouteManager { public static final String ACTIVITY_LOGIN = "/activity/LoginActivity"; public static final String ACTIVITY_WEB_VIEW = "/activity/WebViewActivity"; public static final String ACTIVITY_HOME_RANK = "/activity/HomepageRankingActivity"; + public static final String ACTIVITY_MY_ARN = "/activity/MyAarningsActivity"; + public static final String ACTIVITY_DIAMOND_EXCHANGE = "/activity/DiamondExchangeActivity"; public static final String ACTIVITY_HOME_SEARCH = "/activity/HomeSearchActivity"; public static final String ACTIVITY_HOME_SCREEN = "/activity/HomeScreenActivity"; public static final String ACTIVITY_CALL_VIDEO = "/activity/CallVideoActivity"; 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 a540fa5d8..8e0354268 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java @@ -1,8 +1,10 @@ package com.shayu.onetoone.network; import com.shayu.onetoone.bean.AvatarBean; -import com.shayu.onetoone.bean.CustomBean; +import com.shayu.onetoone.bean.ExchangeModel; import com.shayu.onetoone.bean.FollowBean; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; import com.shayu.onetoone.bean.GiftBean; import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.HomeItemBean; @@ -16,7 +18,6 @@ import com.shayu.onetoone.bean.SystemMessageBean; import com.shayu.onetoone.bean.TargetUserInfoBean; import com.shayu.onetoone.bean.UserBean; import com.yunbao.common.bean.BaseModel; -import com.yunbao.common.bean.HttpCallbackModel; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.UserAvatarSelectBean; import com.yunbao.common.http.ResponseModel; @@ -212,6 +213,30 @@ public interface OneToOneApi { @Field("labels") String avatar ); + /** + * 获取记录 + */ + @GET("/api/public/?service=Friendappmoney.logs") + Observable>> getFriendAppMoneyLogModel( + @Query("currency_type") String currencyType, + @Query("income") String income + ); + + /** + * 获取记录 统计 + */ + @GET("/api/public/?service=Friendappmoney.sum") + Observable> getFriendAppMoneySum( + + ); + + /** + * 兑换表 + */ + @GET("/api/public/?service=Friendappmoney.exchangeList") + Observable>> getExchangeList( + @Query("type") String type + ); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java b/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java new file mode 100644 index 000000000..984ca3020 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java @@ -0,0 +1,28 @@ +package com.shayu.onetoone.view; + +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.ExchangeModel; + +public class DiamondExchangeViewHolder extends RecyclerView.ViewHolder { + private LinearLayout diamondExchangeBtn; + private TextView fullConversion, coins, goldCoin; + + public DiamondExchangeViewHolder(@NonNull View itemView) { + super(itemView); + diamondExchangeBtn = itemView.findViewById(R.id.diamond_exchange_btn); + fullConversion = itemView.findViewById(R.id.full_conversion); + coins = itemView.findViewById(R.id.coins); + goldCoin = itemView.findViewById(R.id.gold_coin); + } + + public void showData(ExchangeModel model) { + + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java b/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java new file mode 100644 index 000000000..6f8bf550b --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java @@ -0,0 +1,41 @@ +package com.shayu.onetoone.view; + +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class MyArnViewHolder extends RecyclerView.ViewHolder { + private TextView memoName, createTime, money; + + public MyArnViewHolder(@NonNull View itemView) { + super(itemView); + memoName = itemView.findViewById(R.id.memo_name); + createTime = itemView.findViewById(R.id.create_time); + money = itemView.findViewById(R.id.money); + } + + public void setData(FriendAppMoneyLogModel model) { + StringBuilder builder = new StringBuilder(); + builder.append("+") + .append(model.getMoney()); + memoName.setText(model.getMemo()); + money.setText(builder.toString()); + createTime.setText(getDateStr(new Date(Long.parseLong(model.getCreateTime())*1000), null)); + } + + public String getDateStr(Date date, String format) { + if (format == null || format.isEmpty()) { + format = "yyyy-MM-dd HH:mm"; + } + SimpleDateFormat formatter = new SimpleDateFormat(format); + return formatter.format(date); + } +} diff --git a/OneToOne/src/main/res/drawable/background_diamond_exchange_select.png b/OneToOne/src/main/res/drawable/background_diamond_exchange_select.png new file mode 100644 index 0000000000000000000000000000000000000000..82791712745d0fbadceca9b33bb4ee3e61ac8d39 GIT binary patch literal 8154 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 literal 0 HcmV?d00001 diff --git a/OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png b/OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png new file mode 100644 index 0000000000000000000000000000000000000000..42c03a7edf2a5f0ba2a46c89c8e0fa168564a78c GIT binary patch literal 12789 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 ZlWNk_$_?@i@P8aI(&F-va#6#8{}0TiZqon& literal 0 HcmV?d00001 diff --git a/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml b/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml new file mode 100644 index 000000000..a6041bb8f --- /dev/null +++ b/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_diamond_exchange.xml b/OneToOne/src/main/res/drawable/button_diamond_exchange.xml new file mode 100644 index 000000000..457c75588 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_diamond_exchange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml b/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml new file mode 100644 index 000000000..191d62ce4 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml b/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml new file mode 100644 index 000000000..2c7120916 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/input_diamond_exchange.xml b/OneToOne/src/main/res/drawable/input_diamond_exchange.xml new file mode 100644 index 000000000..f274c054c --- /dev/null +++ b/OneToOne/src/main/res/drawable/input_diamond_exchange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/layout/activity_diamond_exchange.xml b/OneToOne/src/main/res/layout/activity_diamond_exchange.xml new file mode 100644 index 000000000..8ad6e253d --- /dev/null +++ b/OneToOne/src/main/res/layout/activity_diamond_exchange.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +