2024-2-7 代码备份

提交订单页面增加红积分逻辑
我的团队页面数据对接
养老金页面弹窗逻辑调整
粉丝详情页面开发，数据对接

app/src/main/AndroidManifest.xml

@@ -78,10 +78,14 @@
         tools:replace="android:theme"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.mine.MyTeamActivity"
-            android:label="我的团队"
+            android:name=".presentation.mine.FansDetailActivity"
+            android:label="粉丝详情"
             android:exported="false" />
         <activity
+            android:name=".presentation.mine.MyTeamActivity"
+            android:exported="false"
+            android:label="我的团队" />
+        <activity
             android:name=".presentation.mine.TiXianRecordActivity"
             android:exported="false"
             android:label="提现记录" />

app/src/main/java/com/yihucha/hbyhc/network/request_bean/CreateOrderRequest.java

@@ -15,8 +15,17 @@ public class CreateOrderRequest {
     private List<String> cart_id;//购物车id
     private Map<String, Object> mark;//备注
     private String dacang_id;//大仓id
-    private String pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
+    private String pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分 6：红积分支付
     private String mer_id;//商户id
+    private String phone;//开通账号
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 
     public String getPay_type() {
         return pay_type == null ? "" : pay_type;

app/src/main/java/com/yihucha/hbyhc/network/service/UserService.java

@@ -35,6 +35,7 @@ import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalServiceBean;
 import com.yihucha.hbyhc.presentation.mine.model.AddressListBean;
 import com.yihucha.hbyhc.presentation.mine.model.BangfuBean;
 import com.yihucha.hbyhc.presentation.mine.model.BindingStateBean;
+import com.yihucha.hbyhc.presentation.mine.model.FansDetailBean;
 import com.yihucha.hbyhc.presentation.mine.model.JiangjinBean;
 import com.yihucha.hbyhc.presentation.mine.model.MyEvaluateBean;
 import com.yihucha.hbyhc.presentation.mine.model.MyFavoriteBean;
@@ -45,6 +46,7 @@ import com.yihucha.hbyhc.presentation.mine.model.RewardsocrBean;
 import com.yihucha.hbyhc.presentation.mine.model.RulesBean;
 import com.yihucha.hbyhc.presentation.mine.model.SignInBean;
 import com.yihucha.hbyhc.presentation.mine.model.SignInInfoBean;
+import com.yihucha.hbyhc.presentation.mine.model.TeamBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserAnnuityInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
 import com.yihucha.hbyhc.presentation.mine.model.UserVipInfoBean;
@@ -75,7 +77,7 @@ public interface UserService {
      * 养老金列表
      */
     @GET("/api/user/yanglaolog")
-    Observable<DataResponse<AnnuityRecordsBean>> getYanglaoList(@QueryMap Map<String,Object> map);
+    Observable<DataResponse<AnnuityRecordsBean>> getYanglaoList(@QueryMap Map<String, Object> map);
 
     /**
      * 我的页面信息  spread——info
@@ -83,6 +85,14 @@ public interface UserService {
     @GET("/api/user/spread_info_yhc")
     Observable<DataResponse<MineSpreadInfo>> getSpreadInfoYhc();
 
+    /**
+     * 团队列表
+     */
+    @GET("/api/user/team_list")
+    Observable<DataResponse<TeamBean>> getTeamList(@Query("page") int page, @Query("limit") int limit, @Query("type") int type);
+
+    @GET("/api/user/team_details")
+    Observable<DataResponse<FansDetailBean>> getFansDetail(@Query("uid") String uid);
 
     @GET("api/user/bill")
     Call<JiangjinBean> getJiangjin(@Query("page") int page, @Query("limit") int limit, @Query("is_red") boolean is_red);
@@ -91,22 +101,27 @@ public interface UserService {
     Call<BangfuBean> requestBangfu();
 
     @GET("api/notice/detail/{id}")
-    Call<RulesBean> getRules(@Path("id")int id);
+    Call<RulesBean> getRules(@Path("id") int id);
+
     /**
      * 红积分列表
+     *
      * @return
      */
     @GET("api/user/bill")
     Call<RedIntegralBean2> getRedIntegralList(
             @Query("page") int page
-            ,@Query("limit") int limit
-            ,@Query(value = "is_red") boolean is_red);
+            , @Query("limit") int limit
+            , @Query(value = "is_red") boolean is_red);
+
     @GET("api/user/red_log")
     Call<RedIntegralBean> getRedIntegralList2(
             @Query("page") int page
-            ,@Query("limit") int limit);
+            , @Query("limit") int limit);
+
     /**
      * 个人资料
+     *
      * @param
      * @return
      */
@@ -115,6 +130,7 @@ public interface UserService {
 
     /**
      * 会员资料
+     *
      * @param
      * @return
      */
@@ -123,13 +139,16 @@ public interface UserService {
 
     /**
      * 地址列表
+     *
      * @param
      * @return
      */
     @GET("api/user/address/lst")
     Observable<DataResponse<AddressListBean>> addresslist();
+
     /**
      * 省市区街道地址列表
+     *
      * @param
      * @return
      */
@@ -138,20 +157,25 @@ public interface UserService {
 
     /**
      * 地址添加或者修改
+     *
      * @param
      * @return
      */
     @POST("api/user/address/new_create")
     Observable<DataResponse> addressNewCreate(@QueryMap Map<String, Object> request);
+
     /**
      * 删除地址
+     *
      * @param
      * @return
      */
     @POST("api/user/address/delete/{id}")
     Observable<DataResponse> deleteAddress(@Path("id") String id);
+
     /**
      * 购物车列表
+     *
      * @param
      * @return
      */
@@ -160,6 +184,7 @@ public interface UserService {
 
     /**
      * 购物车删除
+     *
      * @param
      * @return
      */
@@ -168,6 +193,7 @@ public interface UserService {
 
     /**
      * 养老金
+     *
      * @param
      * @return
      */
@@ -176,6 +202,7 @@ public interface UserService {
 
     /**
      * 养老金信息
+     *
      * @param
      * @return
      */
@@ -184,6 +211,7 @@ public interface UserService {
 
     /**
      * 我的邀请
+     *
      * @param
      * @return
      */
@@ -192,6 +220,7 @@ public interface UserService {
 
     /**
      * 个人资料编辑
+     *
      * @param
      * @return
      */
@@ -200,20 +229,25 @@ public interface UserService {
 
     /**
      * 实名认证
+     *
      * @param
      * @return
      */
     @GET("api/user/add_certification")
     Observable<DataResponse> getAutonym(@QueryMap Map<String, Object> request);
+
     /**
      * 实名认证信息
+     *
      * @param
      * @return
      */
     @GET("api/user/add_certification")
     Observable<DataResponse<AutonymRequest>> getAutonymInfo(@QueryMap Map<String, Object> request);
+
     /**
      * 第三方账号绑定状态
+     *
      * @param
      * @return
      */
@@ -222,6 +256,7 @@ public interface UserService {
 
     /**
      * 关注/收藏
+     *
      * @param
      * @return
      */
@@ -230,6 +265,7 @@ public interface UserService {
 
     /**
      * 批量收藏
+     *
      * @param
      * @return
      */
@@ -238,6 +274,7 @@ public interface UserService {
 
     /**
      * 取消关注
+     *
      * @param
      * @return
      */
@@ -246,6 +283,7 @@ public interface UserService {
 
     /**
      * 我的收藏
+     *
      * @param
      * @return
      */
@@ -254,6 +292,7 @@ public interface UserService {
 
     /**
      * 我的关注
+     *
      * @param
      * @return
      */
@@ -262,13 +301,16 @@ public interface UserService {
 
     /**
      * 评论列表
+     *
      * @param
      * @return
      */
     @POST("api/reply/list")
     Observable<DataResponse<MyEvaluateBean>> getMyEvaluate(@QueryMap Map<String, Object> request);
+
     /**
      * 删除评论
+     *
      * @param
      * @return
      */
@@ -277,6 +319,7 @@ public interface UserService {
 
     /**
      * java 我的邀请
+     *
      * @param
      * @return
      */
@@ -285,6 +328,7 @@ public interface UserService {
 
     /**
      * php 我的邀请
+     *
      * @param
      * @return
      */
@@ -293,6 +337,7 @@ public interface UserService {
 
     /**
      * java 邀请商户+伙伴个数 列表
+     *
      * @param
      * @return
      */
@@ -301,6 +346,7 @@ public interface UserService {
 
     /**
      * 分享收益
+     *
      * @param
      * @return
      */
@@ -309,6 +355,7 @@ public interface UserService {
 
     /**
      * java 用户分享产品列表
+     *
      * @param
      * @return
      */
@@ -317,6 +364,7 @@ public interface UserService {
 
     /**
      * Java 累计收益列表
+     *
      * @param
      * @return
      */
@@ -325,6 +373,7 @@ public interface UserService {
 
     /**
      * 佣金信息
+     *
      * @param
      * @return
      */
@@ -333,6 +382,7 @@ public interface UserService {
 
     /**
      * 提现配置
+     *
      * @param
      * @return
      */
@@ -341,6 +391,7 @@ public interface UserService {
 
     /**
      * 提现检测是否绑定提交账户接口
+     *
      * @param
      * @return
      */
@@ -357,6 +408,7 @@ public interface UserService {
 
     /**
      * 提现服务费计算接口
+     *
      * @param
      * @return
      */
@@ -365,6 +417,7 @@ public interface UserService {
 
     /**
      * 提现申请
+     *
      * @param
      * @return
      */
@@ -373,6 +426,7 @@ public interface UserService {
 
     /**
      * 提现记录
+     *
      * @param
      * @return
      */
@@ -381,6 +435,7 @@ public interface UserService {
 
     /**
      * 实体店养老金明细线下
+     *
      * @param
      * @return
      */
@@ -389,6 +444,7 @@ public interface UserService {
 
     /**
      * 实体店养老金明细线上
+     *
      * @param
      * @return
      */
@@ -396,7 +452,8 @@ public interface UserService {
     Observable<DataResponse<YanglaojinLogXSBean>> getYanglaojinLogXS(@QueryMap Map<String, Object> request);
 
     /**
-     *新签到信息
+     * 新签到信息
+     *
      * @param
      * @return
      */
@@ -404,7 +461,8 @@ public interface UserService {
     Observable<DataResponse<SignInInfoBean>> getSignInInfo();
 
     /**
-     *签到
+     * 签到
+     *
      * @param
      * @return
      */
@@ -412,7 +470,8 @@ public interface UserService {
     Observable<DataResponse<SignInBean>> getSignIn();
 
     /**
-     *签到
+     * 签到
+     *
      * @param
      * @return
      */
@@ -421,6 +480,7 @@ public interface UserService {
 
     /**
      * 积分记录
+     *
      * @param
      * @return
      */
@@ -428,7 +488,8 @@ public interface UserService {
     Observable<DataResponse<IntegralListBean>> getIntegralList(@QueryMap Map<String, Object> request);
 
     /**
-     *邀请码绑定接口
+     * 邀请码绑定接口
+     *
      * @param
      * @return
      */
@@ -437,6 +498,7 @@ public interface UserService {
 
     /**
      * 分享二维码图片
+     *
      * @param
      * @return
      */
@@ -445,6 +507,7 @@ public interface UserService {
 
     /**
      * 公证处养老金余额
+     *
      * @param
      * @return
      */
@@ -452,7 +515,8 @@ public interface UserService {
     Observable<DataResponse<AmountFromGzcBean>> getAmountFromGzc();
 
     /**
-     *邀请好友分享图片分类接口
+     * 邀请好友分享图片分类接口
+     *
      * @param
      * @return
      */
@@ -460,7 +524,8 @@ public interface UserService {
     Observable<DataResponse<InviteFriendsClassifyBean>> getClassifyList();
 
     /**
-     *邀请好友图片列表
+     * 邀请好友图片列表
+     *
      * @param
      * @return
      */
@@ -468,7 +533,8 @@ public interface UserService {
     Observable<DataResponse<InviteFriendsPicBean>> getClassifyImgesList(@Body ClassifyImgesListRequest request);
 
     /**
-     *生成图片
+     * 生成图片
+     *
      * @param
      * @return
      */

app/src/main/java/com/yihucha/hbyhc/presentation/annuity/AnnuityRecordsActivity.kt

@@ -27,20 +27,21 @@ import com.yihucha.hbyhc.presentation.annuity.model.AnnuityRecordsBean
 import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel
 import com.yihucha.hbyhc.utils.*
 import com.yihucha.hbyhc.view.PopAnnuitySelector
+import com.yihucha.hbyhc.view.PopAnnuitySelector.OnSelectListener
 import java.util.*
 
 class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBinding>(),
     View.OnClickListener {
     private lateinit var mMineViewModel: MineViewModel
     private var mPage = 1
-    private var source = "0"
-    private var status = 0
+    private var source:String? = "-1"
+    private var status:String? = "1"
     private lateinit var month: String
     private lateinit var birthday: String
     private lateinit var adapter: AnnuityRecordsAdapter
     private var listDatas = mutableListOf<AnnuityRecordsBean.ListDTO>()
     private lateinit var pvTime: TimePickerView
-    private lateinit var popWindow:PopAnnuitySelector
+    private lateinit var popWindow: PopAnnuitySelector
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -61,6 +62,7 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
             "${calendar.get(Calendar.YEAR)}-${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}"
         birthday =
             "${calendar.get(Calendar.YEAR)}年${StringUtils.formatNumber(calendar.get(Calendar.MONTH) + 1)}月"
+        mViewBinding.tvDate.text = birthday
         var manager = LinearLayoutManager(this)
         mViewBinding.rvAnnuityRecords.layoutManager = manager
         adapter = AnnuityRecordsAdapter(this, listDatas)
@@ -109,12 +111,19 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
                 if (EmptyCheckUtils.isEmpty(listDatas)) {
                     mViewBinding.layoutNoData.visibility = View.VISIBLE
                     mViewBinding.rvAnnuityRecords.visibility = View.GONE
-                    return@observe
                 } else {
                     mViewBinding.layoutNoData.visibility = View.GONE
                     mViewBinding.rvAnnuityRecords.visibility = View.VISIBLE
                 }
                 adapter.setData(listDatas)
+            }?:{
+                if (EmptyCheckUtils.isEmpty(listDatas)) {
+                    mViewBinding.layoutNoData.visibility = View.VISIBLE
+                    mViewBinding.rvAnnuityRecords.visibility = View.GONE
+                } else {
+                    mViewBinding.layoutNoData.visibility = View.GONE
+                    mViewBinding.rvAnnuityRecords.visibility = View.VISIBLE
+                }
             }
 
         }
@@ -146,11 +155,19 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
     /**
      * 条件选择器
      */
-    private fun initSelector(){
+    private fun initSelector() {
         popWindow = PopAnnuitySelector(this)
         popWindow.setOnDismissListener {
             mViewBinding.viewBg.visibility = View.GONE
         }
+        popWindow.setOnSelectListener { checkedSoource, checkedStatus ->
+            run {
+                source = checkedSoource
+                status = checkedStatus
+                mPage = 1
+                loadYanglaoList()
+            }
+        }
     }
 
     /**
@@ -167,6 +184,7 @@ class AnnuityRecordsActivity : ViewBindingBaseActivity<ActivityAnnuityRecordsBin
             birthday = DateUtil.getYearMonth(date.time)
             mViewBinding.tvDate.text = birthday
             month = birthday.replace("年", "-").replace("月", "")
+            mPage=1
             loadYanglaoList()
         }
             .setTimeSelectChangeListener { Log.i("pvTime", "onTimeSelectChanged") }

app/src/main/java/com/yihucha/hbyhc/presentation/home/adapter/SearchProductListAdapter.java

@@ -51,7 +51,6 @@ public class SearchProductListAdapter extends RecyclerView.Adapter<SearchProduct
      * @param goodsPageBeans
      */
     public void updateData(List<SearchProductListBeans.PageInfo.ProductList> goodsPageBeans) {
-        // TODO Auto-generated method stub
         setList(goodsPageBeans);
         notifyDataSetChanged();
     }

app/src/main/java/com/yihucha/hbyhc/presentation/home/adapter/SearchShopAdapter.java

@@ -44,7 +44,6 @@ public class SearchShopAdapter extends RecyclerView.Adapter<SearchShopAdapter.Vi
      * @param goodsPageBeans
      */
     public void updateData(List<SearchStoreBean.PageInfo.PageInfoList> goodsPageBeans) {
-        // TODO Auto-generated method stub
         setList(goodsPageBeans);
         notifyDataSetChanged();
     }

app/src/main/java/com/yihucha/hbyhc/presentation/integral/MyIntegralActivity.java

@@ -307,7 +307,6 @@ public class MyIntegralActivity extends ViewBindingTitleBaseActivity<ActivityMyI
     @Override
     public void onRightClick() {
         super.onRightClick();
-        //todo::没有定义积分规则
         WebViewTitleBaseActivity.launch(context, getString(R.string.integration_rule),
                 Constants.PROTOCOL + Constants.INTEGRAL_RULES);
     }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/FansDetailActivity.kt

@@ -0,0 +1,83 @@
+package com.yihucha.hbyhc.presentation.mine
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
+import com.yihucha.hbyhc.databinding.ActivityFansDetailBinding
+import com.yihucha.hbyhc.presentation.mine.model.TeamBean
+import com.yihucha.hbyhc.presentation.mine.model.TeamViewModel
+
+class FansDetailActivity : ViewBindingTitleBaseActivity<ActivityFansDetailBinding>() {
+    private val teamViewModel by lazy {
+        ViewModelProvider(this)[TeamViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initData()
+    }
+
+    private fun initData() {
+        intent?.apply {
+            teamViewModel.requestFansDetails(getStringExtra("uid")!!)
+        }
+        teamViewModel.fansDetailBean.observe(this) {
+            mViewBinding.tvAccount.text = it.phone
+            mViewBinding.tvNickname.text = it.nickname
+            mViewBinding.tvYanglaojin.text = it.ylj
+            mViewBinding.tvRegistTime.text = it.createTime
+            mViewBinding.tvInvitateName.text = it.pNickname
+            mViewBinding.tvInvitatedAccount.text = it.pPhone
+            var memeber = ""
+            when (it.identity) {
+                "0" -> {
+                    //普通用户
+                    memeber = "普通用户"
+                }
+                "100" -> {
+                    //合伙人
+                    memeber = "合伙人"
+                }
+                "101" -> {
+                    //主任
+                    memeber = "主任"
+                }
+                "102" -> {
+                    //经理
+                    memeber = "经理"
+                }
+                "103" -> {
+                    //总监
+                    memeber = "总监"
+                }
+                "104" -> {
+                    //合伙商户
+                    memeber = "合伙商户"
+                }
+                "105" -> {
+                    //合伙公司
+                    memeber = "合伙公司"
+                }
+                else -> {
+                    //合伙董事  （猜的）
+                    memeber = "合伙董事"
+                }
+            }
+
+            mViewBinding.tvIdentify.text = memeber
+        }
+
+    }
+
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity, uid: String) {
+            var intent = Intent(activity, FansDetailActivity::class.java)
+            intent.putExtra("uid", uid)
+            activity.startActivity(intent)
+        }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MineFragment.java

@@ -236,6 +236,7 @@ public class MineFragment extends BaseFragment implements View.OnClickListener {
     public void onClick(View view) {
         if (view == binding.tvMineTd) {
             //我的团队
+            MyTeamActivity.launch(getActivity());
         } else if (view == binding.llAddress) {
             //我的地址
             MyAddressActivity.launch(getActivity());

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyQRCodeActivity.java

@@ -149,7 +149,6 @@ public class MyQRCodeActivity extends ViewBindingTitleBaseActivity<ActivityMyQrC
 //                public void run() {
 //                    setTitileVisibility(false);
 //                    mViewBinding.llAnniu.setVisibility(View.GONE);
-//                    // TODO
 
 //                    view_bitmap = View2BitmapUtil.getBitmap(context, false);
 //                    saveBitmapToAlbum(view_bitmap);
@@ -163,7 +162,6 @@ public class MyQRCodeActivity extends ViewBindingTitleBaseActivity<ActivityMyQrC
         }
     }
 
-    // todo 分享图片
 //    private void fun_handleShare(int scene, Bitmap bm) {
 //        if (WeChatShareUtils.isSupportWX()) {
 //            Bitmap bitmap = Bitmap.createScaledBitmap(bm, 200, 400, true);

app/src/main/java/com/yihucha/hbyhc/presentation/mine/MyTeamActivity.kt

@@ -1,14 +1,101 @@
 package com.yihucha.hbyhc.presentation.mine
 
+import android.app.Activity
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.lcodecore.tkrefreshlayout.RefreshListenerAdapter
+import com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
 import com.yihucha.hbyhc.databinding.ActivityMyTeamBinding
+import com.yihucha.hbyhc.presentation.mine.adapter.TeamListAdapter
+import com.yihucha.hbyhc.presentation.mine.model.TeamBean
+import com.yihucha.hbyhc.presentation.mine.model.TeamViewModel
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
 
 class MyTeamActivity : ViewBindingTitleBaseActivity<ActivityMyTeamBinding>() {
-
+    private val teamViewModel by lazy {
+        ViewModelProvider(this)[TeamViewModel::class.java]
+    }
+    private var datas = mutableListOf<TeamBean.TeamListDTO.DataDTO>()
+    var page = 1
+    var limit = 10
+    var type = 0
+    private lateinit var adapter: TeamListAdapter
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        initView()
+        initData()
+        initListener()
+    }
+
+    private fun initView() {
+        adapter = TeamListAdapter(datas, this)
+        mViewBinding.rvTeamList.layoutManager = LinearLayoutManager(this)
+        mViewBinding.rvTeamList.adapter = adapter
+    }
+
+    private fun initData() {
+        teamViewModel.requestTeamList(page)
+        teamViewModel.teamBean.observe(this) {
+            println(it.toString())
+            mViewBinding.refreshLayout?.apply {
+                finishRefreshing()
+                finishLoadmore()
+            }
+            mViewBinding.tvFansCount.text = "${it.fansNum}"
+            mViewBinding.tvFansYouxiao.text = "${it.effectiveFansNum}"
+            mViewBinding.tvFansZhishu.text = "${it.directFansNum}"
+            if (page == 1) {
+                datas.clear()
+            }
+            it.teamList?.apply {
+                if (EmptyCheckUtils.isNotEmpty(data)) {
+                    datas.addAll(data)
+                } else {
+                    if (page > 1) page--
+                }
+            } ?: page--
+            if (EmptyCheckUtils.isNotEmpty(datas)) {
+                mViewBinding.llNoSearch.llNotFound.visibility = View.GONE
+                mViewBinding.rvTeamList.visibility = View.VISIBLE
+            } else {
+                mViewBinding.llNoSearch.llNotFound.visibility = View.VISIBLE
+                mViewBinding.rvTeamList.visibility = View.INVISIBLE
+            }
+            adapter.setDatas(datas)
+        }
+        teamViewModel.failed.observe(this) {
+            mViewBinding.refreshLayout?.apply {
+                finishRefreshing()
+                finishLoadmore()
+            }
+        }
+    }
+
+    private fun initListener() {
+        mViewBinding.refreshLayout.setEnableRefresh(true)
+        mViewBinding.refreshLayout.setEnableLoadmore(true)
+        mViewBinding.refreshLayout.setOnRefreshListener(object : RefreshListenerAdapter() {
+            override fun onRefresh(refreshLayout: TwinklingRefreshLayout?) {
+                page = 1
+                teamViewModel.requestTeamList(page)
+            }
+
+            override fun onLoadMore(refreshLayout: TwinklingRefreshLayout?) {
+                page++
+                teamViewModel.requestTeamList(page)
+            }
+        })
+    }
 
+    companion object {
+        @JvmStatic
+        fun launch(activity: Activity) {
+            activity.startActivity(Intent(activity, MyTeamActivity::class.java))
+        }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/TiXianRecordActivity.kt

@@ -4,15 +4,22 @@ import android.app.Activity
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
 import com.yihucha.hbyhc.base.ViewBindingChangeTitleColorTitleBaseActivity
 import com.yihucha.hbyhc.base.ViewBindingTitleBaseActivity
 import com.yihucha.hbyhc.databinding.ActivityTiXianRecordBinding
+import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean
+import com.yihucha.hbyhc.presentation.invitation.view_model.InviteViewModel
 import com.yihucha.hbyhc.presentation.mine.adapter.TixianRecordAdapter
 
 class TiXianRecordActivity :
     ViewBindingTitleBaseActivity<ActivityTiXianRecordBinding>() {
-    private val datas = mutableListOf<String>()
+    private val datas = mutableListOf<WithdrawalBean>()
     private lateinit var adapter: TixianRecordAdapter
+    private val inviteViewModel by lazy {
+        ViewModelProvider(this)[InviteViewModel::class.java]
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         initView()
@@ -20,10 +27,12 @@ class TiXianRecordActivity :
     }
 
     private fun initData() {
-        for (i in 1..100) {
-            datas.add("$i")
+        inviteViewModel.getWithdrawal()
+        inviteViewModel.mWithdrawalData.observe(this) {
+            datas.addAll(it)
+            adapter.setDatas(datas)
         }
-        adapter.setDatas(datas)
+
     }
 
     private fun initView() {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/adapter/TeamListAdapter.kt

@@ -0,0 +1,135 @@
+package com.yihucha.hbyhc.presentation.mine.adapter
+
+import android.app.Activity
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.bumptech.glide.Glide
+import com.yihucha.hbyhc.R
+import com.yihucha.hbyhc.databinding.ItemTeamListBinding
+import com.yihucha.hbyhc.presentation.mine.FansDetailActivity
+import com.yihucha.hbyhc.presentation.mine.model.TeamBean
+import com.yihucha.hbyhc.utils.EmptyCheckUtils
+
+/**
+ *  author : zhangbing
+ *  time   : 2024/2/6 9:53
+ *  com.yihucha.hbyhc.presentation.mine.adapter
+ */
+class TeamListAdapter(var teamDatas: List<TeamBean.TeamListDTO.DataDTO>, var context: Context) :
+    RecyclerView.Adapter<TeamListAdapter.TeamHolder>() {
+
+    fun setDatas(teamDatas: List<TeamBean.TeamListDTO.DataDTO>) {
+        this.teamDatas = teamDatas
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TeamHolder {
+        return TeamHolder(
+            LayoutInflater.from(context).inflate(R.layout.item_team_list, parent, false)
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return if (EmptyCheckUtils.isEmpty(teamDatas)) 0 else teamDatas.size
+    }
+
+    override fun onBindViewHolder(holder: TeamHolder, position: Int) {
+        teamDatas[position].apply {
+            Glide.with(context).load(avatar).into(holder.binding.imgvHead)
+            holder.binding.tvName.text = nickname
+            holder.binding.tvPhone.text = phone
+            holder.binding.tvDate.text = createTime
+            var member = identity
+            var areaManageType = level
+            var stockholder = partnership
+            when (areaManageType) {
+                "101" -> {
+                    //社区服务中心
+                    holder.binding.ivMemberDaili.visibility = View.VISIBLE
+                    holder.binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_shequ)
+                }
+                "102" -> {
+                    //乡镇服务中心
+                    holder.binding.ivMemberDaili.visibility = View.VISIBLE
+                    holder.binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_xiang)
+                }
+                "103" -> {
+                    //区县服务中心
+                    holder.binding.ivMemberDaili.visibility = View.VISIBLE
+                    holder.binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_qu)
+                }
+                "104" -> {
+                    //市级运营中心
+                    holder.binding.ivMemberDaili.visibility = View.VISIBLE
+                    holder.binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_shi)
+                }
+                "105" -> {
+                    //省级分公司
+                    holder.binding.ivMemberDaili.visibility = View.VISIBLE
+                    holder.binding.ivMemberDaili.setImageResource(R.mipmap.icon_daili_sheng)
+                }
+                else -> {
+                    holder.binding.ivMemberDaili.visibility = View.GONE
+                }
+            }
+            when (member) {
+                "0" -> {
+                    //普通用户
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_yonghu)
+                }
+                "100" -> {
+                    //合伙人
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.hehuoren)
+                }
+                "101" -> {
+                    //主任
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_zhuren)
+                }
+                "102" -> {
+                    //经理
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_jingli)
+                }
+                "103" -> {
+                    //总监
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_zongjian)
+                }
+                "104" -> {
+                    //合伙商户
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_shanghu)
+                }
+                "105" -> {
+                    //合伙公司
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_gongsi)
+                }
+                else -> {
+                    //合伙董事  （猜的）
+                    holder.binding.imgvIdentity.setImageResource(R.mipmap.icon_member_dongshi)
+                }
+            }
+
+            if ("1" == stockholder) {
+                holder.binding.ivMemberLhcsr.visibility = View.VISIBLE
+                holder.binding.ivMemberLhcsr.setImageResource(R.mipmap.icon_qiye)
+            } else {
+                holder.binding.ivMemberLhcsr.visibility = View.GONE
+            }
+            holder.binding.itemLayout.setOnClickListener {
+                FansDetailActivity.launch(context as Activity,uid)
+            }
+
+        }
+
+        if (position == teamDatas.size - 1) {
+            holder.binding.viewLine.visibility = View.GONE
+        }
+
+    }
+
+    inner class TeamHolder(itemView: View) : ViewHolder(itemView) {
+        val binding by lazy { ItemTeamListBinding.bind(itemView) }
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/adapter/TixianRecordAdapter.java

@@ -5,9 +5,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
 
 import com.yihucha.hbyhc.R;
 import com.yihucha.hbyhc.databinding.ItemTixianRecordsBinding;
+import com.yihucha.hbyhc.presentation.invitation.model.WithdrawalBean;
 import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 
 import java.util.List;
@@ -19,14 +23,14 @@ import java.util.List;
  */
 public class TixianRecordAdapter extends BaseAdapter {
     private Context context;
-    private List<String> datas;
+    private List<WithdrawalBean> datas;
 
-    public TixianRecordAdapter(Context context, List<String> datas) {
+    public TixianRecordAdapter(Context context, List<WithdrawalBean> datas) {
         this.context = context;
         this.datas = datas;
     }
 
-    public void setDatas(List<String> datas) {
+    public void setDatas(List<WithdrawalBean> datas) {
         this.datas = datas;
         notifyDataSetChanged();
     }
@@ -37,7 +41,7 @@ public class TixianRecordAdapter extends BaseAdapter {
     }
 
     @Override
-    public String getItem(int position) {
+    public WithdrawalBean getItem(int position) {
         return datas.get(position);
     }
 
@@ -48,24 +52,47 @@ public class TixianRecordAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        TXRecordHolder holder=null;
-        if (convertView==null) {
-            convertView = LayoutInflater.from(context).inflate(R.layout.item_tixian_records,parent,false);
+        TXRecordHolder holder = null;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(context).inflate(R.layout.item_tixian_records, parent, false);
             holder = new TXRecordHolder(convertView);
             convertView.setTag(holder);
-        }else {
+        } else {
             holder = (TXRecordHolder) convertView.getTag();
         }
         //此处设置数据
+        WithdrawalBean item = getItem(position);
+        holder.tvName.setText(item.getTitle());
+        holder.tvTime.setText(item.getCreate_time());
+        holder.tvMoney.setText(item.getExtract_price());
+        TextView tvStatus = holder.tvStatus;
+        if ("-1".equals(item.getStatus())) {
+            //未通过
+            tvStatus.setText("提现失败");
+            tvStatus.setTextColor(ContextCompat.getColor(context, R.color.red_fe0032));
+        } else if ("0".equals(item.getStatus())) {
+            //审核中
+            tvStatus.setText("提现中");
+            tvStatus.setTextColor(ContextCompat.getColor(context, R.color.org_f88726));
+        } else if ("1".equals(item.getStatus())) {
+            //已提现
+            tvStatus.setText("已完成");
+            tvStatus.setTextColor(ContextCompat.getColor(context, R.color.black_333333));
+        }
         return convertView;
     }
 
 
     static class TXRecordHolder {
-        public ItemTixianRecordsBinding binding;
-
+        public TextView tvName;
+        public TextView tvTime;
+        public TextView tvMoney;
+        public TextView tvStatus;
         public TXRecordHolder(View itemView) {
-            ItemTixianRecordsBinding.bind(itemView);
+            tvName = itemView.findViewById(R.id.tv_name);
+            tvTime = itemView.findViewById(R.id.tv_time);
+            tvMoney = itemView.findViewById(R.id.tv_money);
+            tvStatus = itemView.findViewById(R.id.tv_status);
         }
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/FansDetailBean.java

@@ -0,0 +1,132 @@
+package com.yihucha.hbyhc.presentation.mine.model;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * author : zhangbing
+ * time   : 2024/2/6 11:16
+ * com.yihucha.hbyhc.presentation.mine.model
+ */
+public class FansDetailBean {
+
+    @SerializedName("uid")
+    private String uid;
+    @SerializedName("nickname")
+    private String nickname;
+    @SerializedName("phone")
+    private String phone;
+    @SerializedName("avatar")
+    private String avatar;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("identity")
+    private String identity;
+    @SerializedName("level")
+    private String level;
+    @SerializedName("partnership")
+    private String partnership;
+    @SerializedName("puid")
+    private String puid;
+    @SerializedName("p_nickname")
+    private String pNickname;
+    @SerializedName("p_phone")
+    private String pPhone;
+    @SerializedName("ylj")
+    private String ylj;
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getPartnership() {
+        return partnership;
+    }
+
+    public void setPartnership(String partnership) {
+        this.partnership = partnership;
+    }
+
+    public String getPuid() {
+        return puid;
+    }
+
+    public void setPuid(String puid) {
+        this.puid = puid;
+    }
+
+    public String getPNickname() {
+        return pNickname;
+    }
+
+    public void setPNickname(String pNickname) {
+        this.pNickname = pNickname;
+    }
+
+    public String getPPhone() {
+        return pPhone;
+    }
+
+    public void setPPhone(String pPhone) {
+        this.pPhone = pPhone;
+    }
+
+    public String getYlj() {
+        return ylj;
+    }
+
+    public void setYlj(String ylj) {
+        this.ylj = ylj;
+    }
+}

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/TeamBean.java

@@ -1,7 +1,6 @@
 package com.yihucha.hbyhc.presentation.mine.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
 
@@ -10,16 +9,16 @@ import java.util.List;
  * time   : 2024/2/5 16:51
  * com.yihucha.hbyhc.presentation.mine.model
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class TeamBean {
 
-    @JsonProperty("direct_fans_num")
+
+    @SerializedName("direct_fans_num")
     private Integer directFansNum;
-    @JsonProperty("fans_num")
+    @SerializedName("fans_num")
     private Integer fansNum;
-    @JsonProperty("team_list")
+    @SerializedName("team_list")
     private TeamListDTO teamList;
-    @JsonProperty("effective_fans_num")
+    @SerializedName("effective_fans_num")
     private Integer effectiveFansNum;
 
     public Integer getDirectFansNum() {
@@ -54,17 +53,16 @@ public class TeamBean {
         this.effectiveFansNum = effectiveFansNum;
     }
 
-    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class TeamListDTO {
-        @JsonProperty("total")
+        @SerializedName("total")
         private Integer total;
-        @JsonProperty("per_page")
+        @SerializedName("per_page")
         private Integer perPage;
-        @JsonProperty("current_page")
+        @SerializedName("current_page")
         private Integer currentPage;
-        @JsonProperty("last_page")
+        @SerializedName("last_page")
         private Integer lastPage;
-        @JsonProperty("data")
+        @SerializedName("data")
         private List<DataDTO> data;
 
         public Integer getTotal() {
@@ -107,23 +105,22 @@ public class TeamBean {
             this.data = data;
         }
 
-        @JsonIgnoreProperties(ignoreUnknown = true)
         public static class DataDTO {
-            @JsonProperty("uid")
+            @SerializedName("uid")
             private String uid;
-            @JsonProperty("nickname")
+            @SerializedName("nickname")
             private String nickname;
-            @JsonProperty("phone")
+            @SerializedName("phone")
             private String phone;
-            @JsonProperty("avatar")
+            @SerializedName("avatar")
             private String avatar;
-            @JsonProperty("create_time")
+            @SerializedName("create_time")
             private String createTime;
-            @JsonProperty("identity")
+            @SerializedName("identity")
             private String identity;
-            @JsonProperty("level")
+            @SerializedName("level")
             private String level;
-            @JsonProperty("partnership")
+            @SerializedName("partnership")
             private String partnership;
 
             public String getUid() {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/model/TeamViewModel.kt

@@ -1,21 +1,68 @@
 package com.yihucha.hbyhc.presentation.mine.model
 
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.yihucha.hbyhc.base.BaseViewModel
+import com.yihucha.hbyhc.network.BaseObserver
+import com.yihucha.hbyhc.network.DataResponse
+import com.yihucha.hbyhc.network.NetworkApi
+import com.yihucha.hbyhc.network.service.UserService
 
 /**
  *  author : zhangbing
  *  time   : 2024/2/5 17:30
  *  com.yihucha.hbyhc.presentation.mine.model
  */
-class TeamViewModel : ViewModel() {
+class TeamViewModel : BaseViewModel() {
+    var teamBean = MutableLiveData<TeamBean>()
+    var fansDetailBean = MutableLiveData<FansDetailBean>()
 
+    /**
+     * 请求团队列表
+     */
+    @SuppressWarnings("CheckResult")
+    fun requestTeamList(page: Int, limit: Int = 10, type: Int = 0) {
+        NetworkApi.createService(UserService::class.java)
+            .getTeamList(page, limit, type)
+            .compose(NetworkApi.applySchedulers(object : BaseObserver<DataResponse<TeamBean>>() {
+                override fun onSuccess(t: DataResponse<TeamBean>) {
+                    if (t.responseCode != 200) {
+                        failed.postValue(t.responseError)
+                        return
+                    }
+                    t.data?.apply {
+                        teamBean.postValue(this)
+                    } ?: failed.postValue(t.responseError)
+                }
 
+                override fun onFailure(e: Throwable) {
+                    failed.postValue(e.message)
+                }
+            }))
+
+    }
 
     /**
-     * 请求团队列表
+     * 粉丝详情
      */
-    fun requestTeamList(){
+    @SuppressWarnings("checkResult")
+    fun requestFansDetails(uid: String) {
+        NetworkApi.createService(UserService::class.java).getFansDetail(uid)
+            .compose(NetworkApi.applySchedulers(object :
+                BaseObserver<DataResponse<FansDetailBean>>() {
+                override fun onSuccess(t: DataResponse<FansDetailBean>?) {
+                    t?.apply {
+                        if (responseCode == 200) {
+                            data?.apply {
+                                fansDetailBean.postValue(data)
+                            }
+                        }
+                    }
+                }
 
+                override fun onFailure(e: Throwable?) {
+                }
 
+            }))
     }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineSpreadInfo.java

@@ -1,43 +1,41 @@
 package com.yihucha.hbyhc.presentation.mine.view_model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * author : zhangbing
  * time   : 2024/2/5 14:51
  * com.yihucha.hbyhc.presentation.mine.view_model
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class MineSpreadInfo {
 
-    @JsonProperty("current_balance")
+    @SerializedName("current_balance")
     private String currentBalance;
-    @JsonProperty("unsettled_balance")
+    @SerializedName("unsettled_balance")
     private Integer unsettledBalance;
-    @JsonProperty("withdrawn_balance")
+    @SerializedName("withdrawn_balance")
     private String withdrawnBalance;
-    @JsonProperty("total_balance")
+    @SerializedName("total_balance")
     private String totalBalance;
-    @JsonProperty("identity")
+    @SerializedName("identity")
     private String identity;
-    @JsonProperty("level")
+    @SerializedName("level")
     private String level;
-    @JsonProperty("partnership")
+    @SerializedName("partnership")
     private String partnership;
-    @JsonProperty("green_integral")
+    @SerializedName("green_integral")
     private String greenIntegral;
-    @JsonProperty("green_integral_is")
+    @SerializedName("green_integral_is")
     private String greenIntegralIs;
-    @JsonProperty("nickname")
+    @SerializedName("nickname")
     private String nickname;
-    @JsonProperty("avatar")
+    @SerializedName("avatar")
     private String avatar;
-    @JsonProperty("fans_num")
+    @SerializedName("fans_num")
     private Integer fansNum;
-    @JsonProperty("ylj")
+    @SerializedName("ylj")
     private String ylj;
-    @JsonProperty("yhc_withdrawal_money")
+    @SerializedName("yhc_withdrawal_money")
     private Integer yhcWithdrawalMoney;
 
     public String getCurrentBalance() {

app/src/main/java/com/yihucha/hbyhc/presentation/mine/view_model/MineViewModel.java

@@ -35,6 +35,7 @@ import com.yihucha.hbyhc.presentation.mine.model.UserVipInfoBean;
 import com.yihucha.hbyhc.presentation.mine.model.YanglaojinBean;
 import com.yihucha.hbyhc.presentation.mine.repository.UserRepository;
 import com.yihucha.hbyhc.presentation.order.model.ThirdOrderBean;
+import com.yihucha.hbyhc.utils.EmptyCheckUtils;
 import com.yihucha.hbyhc.utils.LogUtil;
 import com.yihucha.hbyhc.utils.MVUtils;
 
@@ -42,6 +43,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.crypto.spec.PSource;
+
 import io.reactivex.Observer;
 
 /**
@@ -165,13 +168,17 @@ public class MineViewModel extends BaseViewModel {
      * 养老金列表
      */
     @SuppressLint("CheckResult")
-    public void getYanglaoList(int page, String sorce, String month, int status) {
+    public void getYanglaoList(int page, String sorce, String month, String status) {
         Map<String, Object> map = new HashMap<>();
         map.put("page", page);
         map.put("limit", 10);
-        map.put("sorce", sorce);
+        if (EmptyCheckUtils.isNotEmpty(sorce)) {
+            map.put("sorce", sorce);
+        }
         map.put("month", month);
-        map.put("status", status);
+        if (EmptyCheckUtils.isNotEmpty(status)) {
+            map.put("status", status);
+        }
         UserService service = NetworkApi.createService(UserService.class);
         service.getYanglaoList(map).compose(NetworkApi.applySchedulers(new BaseObserver<DataResponse<AnnuityRecordsBean>>() {
             @Override

app/src/main/java/com/yihucha/hbyhc/presentation/order/LogisticsActivity.java

@@ -41,7 +41,6 @@ import java.util.List;
  * @author qmzh
  * @date 2022/7/6
  * note:物流
- * TODO 没有做完，从退货列表进入该页面，数据没有调通
  */
 public class LogisticsActivity extends ViewBindingTitleBaseActivity<ActivityLogisticsBinding> implements View.OnClickListener {
     public static final String INTENT_ORDER_BEAN = "intentOrderBean";

app/src/main/java/com/yihucha/hbyhc/presentation/order/SubmitOrderActivity.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -22,6 +23,8 @@ import com.yihucha.hbyhc.presentation.big_storehouse.model.DcListBean;
 import com.yihucha.hbyhc.presentation.mine.MyAddressActivity;
 import com.yihucha.hbyhc.presentation.mine.model.AddressListBean;
 import com.yihucha.hbyhc.presentation.mine.model.UserInfoModel;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineSpreadInfo;
+import com.yihucha.hbyhc.presentation.mine.view_model.MineViewModel;
 import com.yihucha.hbyhc.presentation.order.adapter.OrderShopAdapter;
 import com.yihucha.hbyhc.presentation.order.model.OrderCheckBean;
 import com.yihucha.hbyhc.presentation.order.model.OrderCreateBean;
@@ -42,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.locks.Lock;
 
 /**
  * @author qmzh
@@ -55,6 +59,7 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
     private ArrayList mCartId;//购物车id
     private String flag;
     public static OrderViewModel orderViewModel;
+    public static MineViewModel mineViewModel;
     //订单数据
     private OrderShopAdapter orderShopAdapter;
     private List<OrderCheckBean.DataDTO.OrderDTOX> orderDataList = new ArrayList<>();
@@ -63,7 +68,6 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
     private List<AddressListBean.AddressList> addressListData = new ArrayList<>();
 
     private RemarkDialog remarkDialog;
-
     //大仓列表
     private List<DcListBean> mDcListData = new ArrayList<>();
     private String mMerId;//商户id
@@ -76,6 +80,11 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
     private String special_type;
     private String special_merchant;
 
+    private boolean isChecked;
+    private String account;
+
+    private String totalPrices;
+
     @Subscribe
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -87,6 +96,8 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
 //        seckill = getIntent().getStringExtra(INTENT_SECKILL);
         orderViewModel =
                 new ViewModelProvider(this).get(OrderViewModel.class);
+        mineViewModel =
+                new ViewModelProvider(this).get(MineViewModel.class);
 
         //注册EventBus
         EventBus.getDefault().register(this);
@@ -123,21 +134,6 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
             @Override
             public void onItemlChooseABigWarehouseClick(int position) {
                 //选择大仓
-            /*    DcListDialog mDcListDialog = new DcListDialog(context, orderDataList.get(position).getList(),
-                        new DcListDialog.PriorityListener() {
-                    @Override
-                    public void refreshPriorityUI(int state) {
-                        for (int i = 0; i < orderDataList.get(position).getList().size(); i++) {
-                            orderDataList.get(position).getList().get(i).setThe_selected(false);
-                        }
-                        orderDataList.get(position).getDcList().get(state).setThe_selected(true);
-                        LogUtil.LogInfo("orderDataList", JSON.toJSONString(orderDataList.get(position).getDcList()));
-                        orderShopAdapter.notifyDataSetChanged();
-                    }
-                });
-                //显示窗口
-                mDcListDialog.showAtLocation(SubmitOrderActivity.this.findViewById(R.id.main),
-                        Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0); //设置layout在PopupWindow中显示的位置*/
             }
 
             @Override
@@ -145,6 +141,23 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
                 CustomDialog.getGreenIntegralDialog(SubmitOrderActivity.this);
             }
         });
+        orderShopAdapter.setOnClickListener(new OrderShopAdapter.OnRedIntegralAction() {
+            @Override
+            public void onCheckChanged(boolean isC) {
+                if (isC) {
+                    totalPrices = mViewBinding.tvTotalPrice.getText().toString();
+                    mViewBinding.tvTotalPrice.setText("0");
+                } else {
+                    mViewBinding.tvTotalPrice.setText(totalPrices + "");
+                }
+                isChecked = isC;
+            }
+
+            @Override
+            public void onHhrChanged(String acc) {
+                account = acc;
+            }
+        });
         mViewBinding.tvSubmitOrder.setOnClickListener(this);
         mViewBinding.llNoAddress.setOnClickListener(this);
         mViewBinding.llAddress.setOnClickListener(this);
@@ -152,17 +165,6 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
 
     private void getTotalprices() {
         double totalPrice = 0;
-/*        for (int i = 0; i < orderDataList.size(); i++) {
-            for (int j = 0; j < orderDataList.get(i).getList().size(); j++) {
-                //当前商品购买数量
-                int num = Integer.parseInt(orderDataList.get(i).getList().get(j).getCartNum());
-                Double   price = DoubleFormatTool.strToDouble(orderDataList.get(i).getList()
-                        .get(j).getProductAttr().getPrice());
-
-                totalPrice += DoubleFormatTool.multiply(num, price);
-            }
-            totalPrice += Double.parseDouble(orderDataList.get(i).getOrder().getPostagePrice());
-        }*/
         totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
         mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(DoubleFormatTool.getRoundHalfUpDouble(totalPrice) + "") + "");
     }
@@ -172,154 +174,123 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
         orderViewModel.getUserInfo();
         orderViewModel.userModel.observe(this, uesrInfoModel -> is_da_cang_vip = uesrInfoModel.getIs_da_cang_vip());
 
+//        mineViewModel.getSpreadInfoYhc();
+        mineViewModel.spreadInfo.observe(this, mineSpreadInfo -> {
+            //2 、如果identity == 0 ,toast 提示需要您升级为合伙人
+            String identity = mineSpreadInfo.getIdentity();
+            //1 、greenIntegralIs >= 2才能使用红积分，否则提示不满足使用条件
+            String greenIntegralIs = mineSpreadInfo.getGreenIntegralIs();
+            //红积分数量
+            String greenIntegral = mineSpreadInfo.getGreenIntegral();
+            System.out.println("identity : " + identity);
+            System.out.println("greenIntegralIs : " + greenIntegralIs);
+            System.out.println("greenIntegralIs : " + greenIntegralIs);
+            orderShopAdapter.setNotify(orderBean.getProduct_type(),
+                    greenIntegralIs, identity, greenIntegral, mViewBinding.tvTotalPrice.getText().toString());
+        });
+
+
         //如果是大仓进入,请求大仓列表
         if (flag.equals("2")) {
             orderViewModel.getDcList();
-            orderViewModel.dcListBeanMutableLiveData.observe(this, new Observer<List<DcListBean>>() {
-                @Override
-                public void onChanged(List<DcListBean> dcListBeans) {
-                    mDcListData.addAll(dcListBeans);
-                }
-            });
+            orderViewModel.dcListBeanMutableLiveData.observe(this, dcListBeans -> mDcListData.addAll(dcListBeans));
         }
-        orderViewModel.addressListData.observe(this, new Observer<List<AddressListBean.AddressList>>() {
-            @Override
-            public void onChanged(List<AddressListBean.AddressList> addressLists) {
-                addressListData = addressLists;
-                orderDataList.clear();
-                if (addressLists.size() <= 0) {
-                    //没有地址
-                    CartIdRequest cartIdRequest = new CartIdRequest();
-                    cartIdRequest.setCart_id(mCartId);
-                    orderViewModel.getCheckOrder(cartIdRequest);
-
-                    mViewBinding.llNoAddress.setVisibility(View.VISIBLE);
-                    mViewBinding.llAddress.setVisibility(View.GONE);
-                } else {
-                    CartIdRequest cartIdRequest = new CartIdRequest();
-                    cartIdRequest.setCart_id(mCartId);
-                    cartIdRequest.setAddress_id(addressLists.get(0).getAddress_id());
-                    orderViewModel.getCheckOrder(cartIdRequest);
-
-                    mViewBinding.llNoAddress.setVisibility(View.GONE);
-                    mViewBinding.llAddress.setVisibility(View.VISIBLE);
-                    String dizhi = addressLists.get(0).getProvince() +
-                            addressLists.get(0).getCity() + addressLists.get(0).getDistrict() +
-                            addressLists.get(0).getDetail();
-                    mViewBinding.tvAddressDetails.setText(dizhi);
-                    mViewBinding.tvName.setText(addressLists.get(0).getReal_name());
-                    mViewBinding.tvPhone.setText(StringsUtil.encodeTel(addressLists.get(0).getPhone()));
-                }
+        orderViewModel.addressListData.observe(this, addressLists -> {
+            addressListData = addressLists;
+            orderDataList.clear();
+            if (addressLists.size() <= 0) {
+                //没有地址
+                CartIdRequest cartIdRequest = new CartIdRequest();
+                cartIdRequest.setCart_id(mCartId);
+                orderViewModel.getCheckOrder(cartIdRequest);
+
+                mViewBinding.llNoAddress.setVisibility(View.VISIBLE);
+                mViewBinding.llAddress.setVisibility(View.GONE);
+            } else {
+                CartIdRequest cartIdRequest = new CartIdRequest();
+                cartIdRequest.setCart_id(mCartId);
+                cartIdRequest.setAddress_id(addressLists.get(0).getAddress_id());
+                orderViewModel.getCheckOrder(cartIdRequest);
+
+                mViewBinding.llNoAddress.setVisibility(View.GONE);
+                mViewBinding.llAddress.setVisibility(View.VISIBLE);
+                String dizhi = addressLists.get(0).getProvince() +
+                        addressLists.get(0).getCity() + addressLists.get(0).getDistrict() +
+                        addressLists.get(0).getDetail();
+                mViewBinding.tvAddressDetails.setText(dizhi);
+                mViewBinding.tvName.setText(addressLists.get(0).getReal_name());
+                mViewBinding.tvPhone.setText(StringsUtil.encodeTel(addressLists.get(0).getPhone()));
             }
         });
         //订单数据
-        orderViewModel.orderData.observe(this, new Observer<OrderCheckBean.DataDTO>() {
-            @Override
-            public void onChanged(OrderCheckBean.DataDTO orderData) {
-                orderDataList = orderData.getOrder();
-                orderBean = orderData;
-                //默认第一条大仓为选中
-                /*if (flag.equals("2")) {
-                    mDcListData.get(0).setThe_selected(true);
-                    for (int i = 0; i < orderDataList.size(); i++) {
-                        orderDataList.get(i).setDcList(mDcListData);
-                    }
-                }*/
-                orderShopAdapter.replaceData(orderDataList);
-                orderShopAdapter.isDcMember(!is_da_cang_vip.equals("0") && !flag.equals("2"));
-                orderShopAdapter.notifyDataSetChanged();
-
-                mMerId = orderDataList.get(0).getMerId();
-                if ("148".equals(mMerId)) {
-                    //积分商品
-                    mViewBinding.tvAmountPayable.setText("应付积分");
-                    mViewBinding.tvFuhao.setVisibility(View.GONE);
-                    mViewBinding.tvJifen.setVisibility(View.VISIBLE);
-                    double totalPrice = 0;
-/*                    for (int i = 0; i < orderDataList.size(); i++) {
-                        for (int j = 0; j < orderDataList.get(i).getList().size(); j++) {
-                            //当前商品购买数量
-                            int num = Integer.parseInt(orderDataList.get(i).getList().get(j).getCartNum());
-                            //当前商品单价
-                            Double price = DoubleFormatTool.strToDouble(orderDataList.get(i).getList().get(j).getProductAttr().getPrice());
-                            totalPrice += DoubleFormatTool.multiply(num, price);
-                        }
-                        totalPrice += Double.parseDouble(orderDataList.get(i).getOrder().getPostagePrice());
-                    }
-                   */
-                    totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
-                    //积分兑换金额==商品金额*30
-                    mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(NumberUtil.multiply(totalPrice + "", "30")));
-                } else if ("7".equals(special_type) && "beishengtang".equals(special_merchant)) {
-                    mViewBinding.tvAmountPayable.setVisibility(View.GONE);
-                    mViewBinding.tvJifen.setVisibility(View.VISIBLE);
-                    double totalPrice = 0;
-/*                    for (int i = 0; i < orderDataList.size(); i++) {
-                        for (int j = 0; j < orderDataList.get(i).getList().size(); j++) {
-                            //当前商品购买数量
-                            int num = Integer.parseInt(orderDataList.get(i).getList().get(j).getCartNum());
-                            //当前商品单价
-                            Double price = DoubleFormatTool.strToDouble(orderDataList.get(i).getList().get(j).getProductAttr().getPrice());
-                            totalPrice += DoubleFormatTool.multiply(num, price);
-                        }
-                        totalPrice += Double.parseDouble(orderDataList.get(i).getOrder().getPostagePrice());
-                    }*/
-                    totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
-                    mViewBinding.tvTotalPrice.setText(DoubleFormatTool.getRoundHalfUpDouble(totalPrice) + "");
-                } else {
-                    getTotalprices();
-                }
-
+        orderViewModel.orderData.observe(this, orderData -> {
+            orderDataList = orderData.getOrder();
+            orderBean = orderData;
+            mMerId = orderDataList.get(0).getMerId();
+            if ("148".equals(mMerId)) {
+                //积分商品
+                mViewBinding.tvAmountPayable.setText("应付积分");
+                mViewBinding.tvFuhao.setVisibility(View.GONE);
+                mViewBinding.tvJifen.setVisibility(View.VISIBLE);
+                double totalPrice = 0;
+                totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
+                //积分兑换金额==商品金额*30
+                mViewBinding.tvTotalPrice.setText(StringsUtil.getNumber(NumberUtil.multiply(totalPrice + "", "30")));
+            } else if ("7".equals(special_type) && "beishengtang".equals(special_merchant)) {
+                mViewBinding.tvAmountPayable.setVisibility(View.GONE);
+                mViewBinding.tvJifen.setVisibility(View.VISIBLE);
+                double totalPrice = 0;
+                totalPrice += Double.parseDouble(orderBean == null ? "0.00" : orderBean.getOrderPrice());
+                mViewBinding.tvTotalPrice.setText(DoubleFormatTool.getRoundHalfUpDouble(totalPrice) + "");
+            } else {
+                getTotalprices();
             }
+            if ("17".equals(orderData.getProduct_type())) {
+                mineViewModel.getSpreadInfoYhc();
+            }
+
+            //默认第一条大仓为选中
+            orderShopAdapter.setDatas(orderDataList);
+            orderShopAdapter.isDcMember(!is_da_cang_vip.equals("0") && !flag.equals("2"));
+            orderShopAdapter.notifyDataSetChanged();
         });
         //加减法成功
-        orderViewModel.numStatus.observe(this, new Observer<Integer>() {
-            @Override
-            public void onChanged(Integer i) {
+        orderViewModel.numStatus.observe(this, i -> {
 //                getTotalprices();
-                if (addressListData == null || addressListData.size() <= 0) {
-                    //没有地址
-                    CartIdRequest cartIdRequest = new CartIdRequest();
-                    cartIdRequest.setCart_id(mCartId);
-                    orderViewModel.getCheckOrder(cartIdRequest);
-
-                    mViewBinding.llNoAddress.setVisibility(View.VISIBLE);
-                    mViewBinding.llAddress.setVisibility(View.GONE);
-                } else {
-                    CartIdRequest cartIdRequest = new CartIdRequest();
-                    cartIdRequest.setCart_id(mCartId);
-                    cartIdRequest.setAddress_id(addressListData.get(0).getAddress_id());
-                    orderViewModel.getCheckOrder(cartIdRequest);
-
-                    mViewBinding.llNoAddress.setVisibility(View.GONE);
-                    mViewBinding.llAddress.setVisibility(View.VISIBLE);
-                    String dizhi = addressListData.get(0).getProvince() +
-                            addressListData.get(0).getCity() + addressListData.get(0).getDistrict() +
-                            addressListData.get(0).getDetail();
-                    mViewBinding.tvAddressDetails.setText(dizhi);
-                    mViewBinding.tvName.setText(addressListData.get(0).getReal_name());
-                    mViewBinding.tvPhone.setText(StringsUtil.encodeTel(addressListData.get(0).getPhone()));
-                }
+            if (addressListData == null || addressListData.size() <= 0) {
+                //没有地址
+                CartIdRequest cartIdRequest = new CartIdRequest();
+                cartIdRequest.setCart_id(mCartId);
+                orderViewModel.getCheckOrder(cartIdRequest);
+
+                mViewBinding.llNoAddress.setVisibility(View.VISIBLE);
+                mViewBinding.llAddress.setVisibility(View.GONE);
+            } else {
+                CartIdRequest cartIdRequest = new CartIdRequest();
+                cartIdRequest.setCart_id(mCartId);
+                cartIdRequest.setAddress_id(addressListData.get(0).getAddress_id());
+                orderViewModel.getCheckOrder(cartIdRequest);
+
+                mViewBinding.llNoAddress.setVisibility(View.GONE);
+                mViewBinding.llAddress.setVisibility(View.VISIBLE);
+                String dizhi = addressListData.get(0).getProvince() +
+                        addressListData.get(0).getCity() + addressListData.get(0).getDistrict() +
+                        addressListData.get(0).getDetail();
+                mViewBinding.tvAddressDetails.setText(dizhi);
+                mViewBinding.tvName.setText(addressListData.get(0).getReal_name());
+                mViewBinding.tvPhone.setText(StringsUtil.encodeTel(addressListData.get(0).getPhone()));
             }
         });
         //网络问题
-        orderViewModel.failed.observe(this, new Observer<String>() {
-            @Override
-            public void onChanged(String s) {
-                ToastUtils.showLong(s);
-            }
-        });
+        orderViewModel.failed.observe(this, s -> ToastUtils.showLong(s));
         //订单创建成功
-        orderViewModel.orderCreateData.observe(this, new Observer<OrderCreateBean>() {
-            @Override
-            public void onChanged(OrderCreateBean orderCreateBean) {
+        orderViewModel.orderCreateData.observe(this, orderCreateBean -> {
 
-                LogUtil.LogInfo("groupOrder", JSON.toJSONString(orderCreateBean));
+            LogUtil.LogInfo("groupOrder", JSON.toJSONString(orderCreateBean));
 //                ToastUtils.showLong("订单创建成功");
-                finish();
-                PayActivity.launch(context, "1", JSON.toJSONString(orderCreateBean.getGroupOrder()),
-                        orderCreateBean.getOrder_id(), mViewBinding.tvTotalPrice.getText().toString(), 1);
-            }
+            finish();
+            PayActivity.launch(context, "1", JSON.toJSONString(orderCreateBean.getGroupOrder()),
+                    orderCreateBean.getOrder_id(), mViewBinding.tvTotalPrice.getText().toString(), 1);
         });
 
     }
@@ -345,30 +316,34 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
             if (StringsUtil.isEmpty(mMerId)) {
                 return;
             }
+            CreateOrderRequest createOrderRequest = new CreateOrderRequest();
+            createOrderRequest.setPay_type("1");
+            if (isChecked) {
+                if (!StringsUtil.isTel(account)) {
+                    Toast.makeText(context, "请正确输入开通账号", Toast.LENGTH_SHORT).show();
+                    return;
+                } else {
+                    createOrderRequest.setPay_type("6");
+                    createOrderRequest.setPhone(account);
+                }
+            }
+
             List<String> cartId = new ArrayList<>();
             for (int i = 0; i < orderDataList.size(); i++) {
                 for (int j = 0; j < orderDataList.get(i).getList().size(); j++) {
                     cartId.add(orderDataList.get(i).getList().get(j).getCartId());
                 }
             }
-            CreateOrderRequest createOrderRequest = new CreateOrderRequest();
             createOrderRequest.setAddress_id(addressListData.get(0).getAddress_id());
             createOrderRequest.setDistribution_mode("1");
             createOrderRequest.setCart_id(cartId);
-            createOrderRequest.setPay_type("1");
+
             Map<String, Object> markMap = new HashMap<>();
             for (int i = 0; i < orderDataList.size(); i++) {
                 markMap.put(orderDataList.get(i).getMerId(), orderDataList.get(i).getRemark());
 
             }
             createOrderRequest.setMark(markMap);
-/*            if (flag.equals("2")) {
-                for (int i = 0; i < orderDataList.get(0).getDcList().size(); i++) {
-                    if (orderDataList.get(0).getDcList().get(i).isThe_selected()) {
-                        createOrderRequest.setDacang_id(orderDataList.get(0).getDcList().get(i).getId());
-                    }
-                }
-            }*/
             if (mMerId.equals("148")) {
                 createOrderRequest.setMer_id(mMerId);
                 createOrderRequest.setPay_type("5");
@@ -379,6 +354,7 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
             }
             //提交订单
             orderViewModel.getCreateOrder(context, createOrderRequest, special_type, special_merchant);
+
         } else if (v == mViewBinding.llNoAddress) {
             MyAddressActivity.launch(context, "1");
         } else if (v == mViewBinding.llAddress) {
@@ -390,20 +366,6 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
     //接收消息
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void Event(AddressListBean.AddressList addressList) {
-//        orderDataList.clear();
-//        CartIdRequest cartIdRequest = new CartIdRequest();
-//        cartIdRequest.setCart_id(mCartId);
-//        cartIdRequest.setAddress_id(addressListData.getAddress_id());
-//        orderViewModel.getCheckOrder(cartIdRequest);
-//
-//        mViewBinding.llNoAddress.setVisibility(View.GONE);
-//        mViewBinding.llAddress.setVisibility(View.VISIBLE);
-//        String dizhi = addressListData.getProvince() +
-//                addressListData.getCity() + addressListData.getDistrict() +
-//                addressListData.getDetail();
-//        mViewBinding.tvAddressDetails.setText(dizhi);
-//        mViewBinding.tvName.setText(addressListData.getReal_name());
-//        mViewBinding.tvPhone.setText(StringsUtil.encodeTel(addressListData.getPhone()));
         addressListData.get(0).setAddress_id(addressList.getAddress_id());
         orderDataList.clear();
         CartIdRequest cartIdRequest = new CartIdRequest();
@@ -424,15 +386,11 @@ public class SubmitOrderActivity extends ViewBindingTitleBaseActivity<ActivitySu
 
     @SuppressLint("ResourceAsColor")
     private void showDialogs(int position) {
-//        StatusBarCompat.setStatusBarColor(context,R.color.black_737373);
         //弹窗
-        remarkDialog = new RemarkDialog(this, new RemarkDialog.PriorityListener() {
-            @Override
-            public void refreshPriorityUI(String string) {
-                //刷新备注数据
-                orderDataList.get(position).setRemark(string);
-                orderShopAdapter.notifyDataSetChanged();
-            }
+        remarkDialog = new RemarkDialog(this, string -> {
+            //刷新备注数据
+            orderDataList.get(position).setRemark(string);
+            orderShopAdapter.notifyDataSetChanged();
         });
         //显示窗口
         remarkDialog.showAtLocation(SubmitOrderActivity.this.findViewById(R.id.main), Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, 0); //设置layout在PopupWindow中显示的位置

app/src/main/java/com/yihucha/hbyhc/presentation/order/adapter/OrderShopAdapter.java

@@ -2,8 +2,13 @@ package com.yihucha.hbyhc.presentation.order.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -13,6 +18,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.yihucha.hbyhc.R;
@@ -25,11 +31,19 @@ import java.util.List;
 public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.OrderDTOX, BaseViewHolder> {
     private Context mContext;
     private OnClickListener mClickListener;
+    private OnRedIntegralAction redIntegralAction;
     private String flag;
     private boolean isMember;
     private String special_type;
     private String special_merchant;
 
+    private String productType;
+    private int greenIntegralIs;
+    private double greenIntegral;
+//    TODO: 2024/2/7 这里使用totalPrice感觉不对，等测试反馈
+    private double totalPrice;
+    private String identity;
+
     public OrderShopAdapter(Context context, int layoutResId, @Nullable List<OrderCheckBean.DataDTO.OrderDTOX> data,
                             String flag, String special_type, String special_merchant) {
         super(layoutResId, data);
@@ -39,6 +53,26 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         this.special_merchant = special_merchant;
     }
 
+    public void setNotify(String productType, String greenIntegralIs,
+                          String identity, String greenIntegral, String totalPrice) {
+        this.productType = productType;
+        this.identity = identity;
+        try {
+            this.greenIntegralIs = Integer.parseInt(greenIntegralIs);
+            this.greenIntegral = Double.parseDouble(greenIntegral);
+            this.totalPrice = Double.parseDouble(totalPrice);
+        } catch (Exception e) {
+
+        }
+        System.out.println("productType = " + productType + ", greenIntegralIs = " + greenIntegralIs + ", identity = " + identity + ", greenIntegral = " + greenIntegral + ", totalPrice = " + totalPrice);
+        notifyDataSetChanged();
+    }
+
+    public void setDatas(List<OrderCheckBean.DataDTO.OrderDTOX> datas) {
+        this.mData = datas;
+        notifyDataSetChanged();
+    }
+
     public void isDcMember(boolean isMember) {
         this.isMember = isMember;
     }
@@ -57,23 +91,13 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         OrderGoodsAdapter orderShopAdapter = new OrderGoodsAdapter(mContext, R.layout.item_order_goods, orderData.getList(), flag, orderData.getMerId(), isMember, special_type, special_merchant);
         //给RecyclerView设置适配器
         rvGoods.setAdapter(orderShopAdapter);
-        orderShopAdapter.setOnClickListener(new OrderGoodsAdapter.OnClickListener() {
-            @Override
-            public void onItemClick(int position) {
-                mClickListener.onItemClick(holder.getLayoutPosition(), position);
-            }
-        });
+        orderShopAdapter.setOnClickListener(position -> mClickListener.onItemClick(holder.getLayoutPosition(), position));
 
         TextView tvRemark = holder.getView(R.id.tv_remark);
         if (!TextUtils.isEmpty(orderData.getRemark())) {
             tvRemark.setText(orderData.getRemark());
         }
-        tvRemark.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mClickListener.onItemRemarkClick(holder.getLayoutPosition());
-            }
-        });
+        tvRemark.setOnClickListener(view -> mClickListener.onItemRemarkClick(holder.getLayoutPosition()));
         LinearLayout layoutYhq = holder.getView(R.id.layout_yhq);
         if ("148".equals(orderData.getMerId())) {
             layoutYhq.setVisibility(View.GONE);
@@ -90,6 +114,49 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         TextView tvSjj = holder.getView(R.id.tv_sjj);
         //TODO 不知道从哪里获取参数来赋值(绿积分数据)
         TextView tvHjf = holder.getView(R.id.tv_hjf);
+        LinearLayout layoutHjf = holder.getView(R.id.layout_hjf);
+        LinearLayout layoutHhr = holder.getView(R.id.layout_hhr);
+        LinearLayout layoutSjj = holder.getView(R.id.layout_sjj);
+        CheckBox checkBox = holder.getView(R.id.cb_red_integral);
+        if (greenIntegral < totalPrice) {
+            checkBox.setChecked(false);
+            checkBox.setButtonDrawable(R.mipmap.icon_unuse);
+            checkBox.setEnabled(false);
+            checkBox.setClickable(false);
+            tvHjf.setText("共" + greenIntegral + "个，红积分不足");
+        } else {
+            tvHjf.setText("共" + greenIntegral + "个");
+        }
+        if ("17".equals(productType)) {
+            layoutHjf.setVisibility(View.VISIBLE);
+        } else {
+            layoutHjf.setVisibility(View.GONE);
+        }
+        checkBox.setOnClickListener(v -> {
+            boolean isBoolean = checkBox.isChecked();
+            if (greenIntegralIs < 2 && isBoolean) {
+                ToastUtils.showLong("不满足使用条件");
+                checkBox.setChecked(false);
+                isBoolean = false;
+            } else {
+                if ("0".equals(identity) && isBoolean) {
+                    ToastUtils.showLong("需要您升级为合伙人");
+                    checkBox.setChecked(false);
+                    isBoolean = false;
+                }
+            }
+            if (checkBox.isChecked() && isBoolean) {
+                //显示填写邀请人UI，更新提示语
+                layoutHhr.setVisibility(View.VISIBLE);
+                layoutSjj.setVisibility(View.GONE);
+                tvHjf.setText("共" + greenIntegral + "个，本次扣除" + (int) totalPrice + "个");
+            } else {
+                //隐藏填写邀请人UI
+                layoutHhr.setVisibility(View.GONE);
+                layoutSjj.setVisibility(View.VISIBLE);
+                tvHjf.setText("共" + greenIntegral + "个");
+            }
+        });
         //绿积分使用说明
         holder.getView(R.id.imgv_wh).setOnClickListener(v -> {
             if (mClickListener != null) {
@@ -107,10 +174,32 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         TextView tvYf = holder.getView(R.id.tv_yf);
         String postagePrice = orderData.getOrder().getPostagePrice();
         if (Double.parseDouble(postagePrice) > 0) {
-            tvYf.setText("￥"+Double.parseDouble(postagePrice));
+            tvYf.setText("￥" + Double.parseDouble(postagePrice));
         } else {
             tvYf.setText("包邮");
         }
+        checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (redIntegralAction != null) redIntegralAction.onCheckChanged(isChecked);
+            }
+        });
+        ((EditText)holder.getView(R.id.edt_ktzh)).addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (redIntegralAction != null) redIntegralAction.onHhrChanged(s.toString());
+            }
+        });
     }
 
     //点击回调
@@ -124,12 +213,28 @@ public class OrderShopAdapter extends BaseQuickAdapter<OrderCheckBean.DataDTO.Or
         //选择大仓
         void onItemlChooseABigWarehouseClick(int position);
 
-        default void onWenHaoClick(){
+        default void onWenHaoClick() {
 
         }
     }
 
+    public interface OnRedIntegralAction {
+        /**
+         * @param isChecked 是否选中红积分
+         */
+        void onCheckChanged(boolean isChecked);
+
+        /**
+         * @param account 合伙人账号
+         */
+        void onHhrChanged(String account);
+    }
+
     public void setOnClickListener(OnClickListener listener) {
         mClickListener = listener;
     }
+
+    public void setOnClickListener(OnRedIntegralAction listener) {
+        redIntegralAction = listener;
+    }
 }

app/src/main/java/com/yihucha/hbyhc/presentation/order/model/OrderCheckBean.java

@@ -55,9 +55,18 @@ public class OrderCheckBean {
         private String status;
         @JsonProperty("is_dacang_vip_product")
         private Integer isDacangVipProduct;
+        private String product_type;
         @JsonProperty("order")
         private List<OrderDTOX> order;
 
+        public String getProduct_type() {
+            return product_type;
+        }
+
+        public void setProduct_type(String product_type) {
+            this.product_type = product_type;
+        }
+
         public String getYouHuiPrice() {
             return youHuiPrice;
         }

app/src/main/java/com/yihucha/hbyhc/presentation/order/view_model/OrderViewModel.java

@@ -163,7 +163,8 @@ public class OrderViewModel extends BaseViewModel {
      * @param createOrderRequest
      */
     @SuppressLint("CheckResult")
-    public void getCreateOrder(Context context, CreateOrderRequest createOrderRequest, String special_type, String special_merchant) {
+    public void getCreateOrder(Context context, CreateOrderRequest createOrderRequest, String special_type,
+                               String special_merchant) {
         ShowLoadingDialog.showLoadingDialog(context);
         if (createOrderRequest.getMer_id().equals("148")) {
             //积分兑换

app/src/main/java/com/yihucha/hbyhc/view/PopAnnuitySelector.java

@@ -67,14 +67,14 @@ public class PopAnnuitySelector extends PopupWindow implements View.OnClickListe
     }
 
     private void initView() {
-        sourceBeans.add(new SelectorBean("全部", null, true));
+        sourceBeans.add(new SelectorBean("全部", "-1", true));
         sourceBeans.add(new SelectorBean("线上订单", "0", false));
         sourceBeans.add(new SelectorBean("线下实体订单", "1", false));
 
-        statusBeans.add(new SelectorBean("全部状态", null, true));
-        statusBeans.add(new SelectorBean("已结算", "0", false));
-        statusBeans.add(new SelectorBean("未结算", "1", false));
-        statusBeans.add(new SelectorBean("已取消", "2", false));
+        statusBeans.add(new SelectorBean("全部状态", "1", true));
+        statusBeans.add(new SelectorBean("已结算", "2", false));
+        statusBeans.add(new SelectorBean("未结算", "3", false));
+        statusBeans.add(new SelectorBean("已取消", "4", false));
 
         GridLayoutManager sourceManager = new GridLayoutManager(context, 3);
         GridLayoutManager statusManager = new GridLayoutManager(context, 3);
@@ -111,10 +111,10 @@ public class PopAnnuitySelector extends PopupWindow implements View.OnClickListe
             sourcePos = sourcePosL;
             statusPos = statusPosL;
             if (EmptyCheckUtils.isNotEmpty(onSelectListener)) {
-                onSelectListener.onSelect(sourcePos, statusPos);
+                onSelectListener.onSelect(sourceBeans.get(sourcePos).getKey(), statusBeans.get(statusPos).getKey());
             }
             dismiss();
-        } else if (view == binding.viewBg){
+        } else if (view == binding.viewBg) {
             dismiss();
         }
     }
@@ -126,6 +126,6 @@ public class PopAnnuitySelector extends PopupWindow implements View.OnClickListe
     }
 
     public interface OnSelectListener {
-        void onSelect(int sourcePos, int statusPos);
+        void onSelect(String sourcePos, String statusPos);
     }
 }

app/src/main/java/com/yihucha/hbyhc/view/UserInvitationCodeDialog.java

@@ -69,7 +69,6 @@ public class UserInvitationCodeDialog extends PopupWindow {
         this.setFocusable(true);
         //设置SelectPicPopupWindow弹出窗体动画效果
 //        this.setAnimationStyle(R.style.InputDialogStyle);
-        //todo:全屏
 
         //实例化一个ColorDrawable颜色为半透明
         ColorDrawable dw = new ColorDrawable(0x00000000);

app/src/main/res/drawable/slector_red_integral.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/icon_checked" android:state_checked="true" />
+    <item android:drawable="@mipmap/icon_uncheck" android:state_checked="false" />
+</selector>

app/src/main/res/layout/activity_fans_detail.xml

@@ -0,0 +1,199 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white_f8f8f8"
+    android:orientation="vertical"
+    tools:context=".presentation.mine.FansDetailActivity">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="昵称"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_nickname"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="账号"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="当前身份"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_identify"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="累计自购预估养老金"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_yanglaojin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="注册时间"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_regist_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="邀请人"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_invitate_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingTop="8dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="邀请人账号"
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_invitated_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:textColor="@color/black_333333"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+
+</LinearLayout>

app/src/main/res/layout/activity_my_commission.xml

@@ -27,7 +27,7 @@
         android:id="@+id/imgv_head_commission"
         android:layout_width="43dp"
         android:layout_height="43dp"
-        android:layout_marginLeft="28dp"
+        android:layout_marginLeft="25dp"
         android:layout_marginTop="5dp"
         android:src="@mipmap/ic_launcher"
         app:layout_constraintLeft_toLeftOf="@+id/view_bg2"

app/src/main/res/layout/activity_my_team.xml

@@ -84,46 +84,50 @@
 
     <TextView
         android:id="@+id/tv_fans_zhishu_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="直属粉丝"
         android:textColor="@color/white"
         android:textSize="13sp"
+        android:gravity="center_horizontal"
         app:layout_constraintLeft_toLeftOf="@+id/view_bg_bottom"
         app:layout_constraintRight_toLeftOf="@+id/tv_fans_youxiao_title"
         app:layout_constraintTop_toTopOf="@+id/view_bg_bottom" />
 
     <TextView
         android:id="@+id/tv_fans_youxiao_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="有效粉丝"
         android:textColor="@color/white"
         android:textSize="13sp"
+        android:gravity="center_horizontal"
         app:layout_constraintLeft_toRightOf="@+id/tv_fans_zhishu_title"
         app:layout_constraintRight_toRightOf="@+id/view_bg_bottom"
         app:layout_constraintTop_toTopOf="@+id/tv_fans_zhishu_title" />
 
     <TextView
         android:id="@+id/tv_fans_zhishu"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:text="3432"
         android:textColor="@color/white"
         android:textSize="13sp"
+        android:gravity="center_horizontal"
         app:layout_constraintBottom_toBottomOf="@+id/view_bg_bottom"
         app:layout_constraintLeft_toLeftOf="@+id/view_bg_bottom"
         app:layout_constraintRight_toLeftOf="@+id/tv_fans_youxiao" />
 
     <TextView
         android:id="@+id/tv_fans_youxiao"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="2344"
         android:textColor="@color/white"
         android:textSize="13sp"
+        android:gravity="center_horizontal"
         app:layout_constraintLeft_toRightOf="@+id/tv_fans_zhishu"
         app:layout_constraintRight_toRightOf="@+id/view_bg_bottom"
         app:layout_constraintTop_toTopOf="@+id/tv_fans_zhishu" />
@@ -153,13 +157,20 @@
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@+id/imgv_team_bg" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_team_list"
+    <com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout
+        android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_team_list_title" />
+        app:layout_constraintTop_toBottomOf="@+id/tv_team_list_title">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_team_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </com.lcodecore.tkrefreshlayout.TwinklingRefreshLayout>
+
 
     <include
         android:id="@+id/ll_no_search"
@@ -169,5 +180,5 @@
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@id/rv_team_list" />
+        app:layout_constraintTop_toTopOf="@id/refresh_layout" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_ti_xian_record.xml

@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white_f8f8f8"
     tools:context=".presentation.mine.TiXianRecordActivity">
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+    <ListView
+        android:id="@+id/rv_tixian_records"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-        <ListView
-            android:id="@+id/rv_tixian_records"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            />
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:scrollbars="none"
+        />
+</FrameLayout>

app/src/main/res/layout/item_order_shop.xml

@@ -241,14 +241,55 @@
                     android:textColor="@color/gray_999999"
                     android:textSize="14sp" />
 
-                <ImageView
+                <CheckBox
+                    android:id="@+id/cb_red_integral"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="4dp"
-                    android:src="@mipmap/icon_jh"
+                    android:background="@null"
                     android:layout_gravity="center_vertical"
+                    android:button="@drawable/slector_red_integral"
+                    android:checked="false"
                     />
             </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/layout_hhr"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="25dp"
+                android:visibility="gone"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="开通账号"
+                    android:textColor="@color/black_333333"
+                    android:textSize="14sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="*"
+                    android:textColor="@color/red_fe0032"
+                    />
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_weight="1"
+                    />
+                <EditText
+                    android:id="@+id/edt_ktzh"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:hint="请输入需要开通合伙人的手机号"
+                    android:textColor="@color/gray_999999"
+                    android:textSize="14sp"
+                    android:background="@null"
+                    />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/layout/item_team_list.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    android:id="@+id/item_layout"
+    android:paddingLeft="16dp"
+    android:paddingTop="8dp"
+    android:paddingRight="16dp">
+
+    <com.yihucha.hbyhc.view.ClipPathCircleImage
+        android:id="@+id/imgv_head"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@mipmap/ic_launcher" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_toRightOf="@+id/imgv_head"
+        android:text="放羊的星星"
+        android:textColor="@color/black_333333"
+        android:textSize="14sp" />
+    <LinearLayout
+        android:id="@+id/layout_member"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_alignTop="@+id/tv_name"
+        android:layout_alignBottom="@+id/tv_name"
+        android:layout_marginLeft="5dp"
+        android:layout_toRightOf="@+id/tv_name">
+
+        <ImageView
+            android:id="@+id/imgv_identity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp"
+            android:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/iv_member_daili"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="3dp"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/iv_member_lhcsr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_name"
+        android:layout_alignLeft="@+id/tv_name"
+        android:text="手机号：188****3333"
+        android:textColor="@color/gray_666666"
+        android:textSize="11sp" />
+
+    <TextView
+        android:id="@+id/tv_date"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_phone"
+        android:layout_alignLeft="@+id/tv_name"
+        android:layout_alignBottom="@+id/imgv_head"
+        android:text="2023-12-12 16:22:22"
+        android:textColor="@color/gray_666666"
+        android:textSize="11sp" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/imgv_head"
+        android:layout_alignBottom="@+id/imgv_head"
+        android:layout_alignParentRight="true"
+        android:src="@mipmap/goin_220619" />
+
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="8dp"
+        android:layout_toRightOf="@+id/imgv_head"
+        android:background="@color/gray_e5e5e5" />
+</RelativeLayout>

app/src/main/res/layout/item_tixian_records.xml

@@ -3,7 +3,10 @@
     android:layout_width="match_parent"
     android:layout_height="80dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/white">
+    android:background="@color/white"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    >
     <TextView
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
@@ -26,7 +29,7 @@
         android:text="2023-08-26 18:30:30"
         android:textSize="12sp"
         android:textColor="@color/gray_999999"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
         />
     <TextView
         android:id="@+id/tv_money"
@@ -34,10 +37,21 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="@+id/tv_name"
         app:layout_constraintBottom_toBottomOf="@+id/tv_name"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/imgv_jiantou"
         android:text="$200.00"
         android:textSize="15sp"
         android:textColor="@color/black_333333"
+        android:layout_marginRight="5dp"
+        />
+    <ImageView
+        android:id="@+id/imgv_jiantou"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/goin_220619"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_name"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+        android:scaleType="centerInside"
         />
     <TextView
         android:id="@+id/tv_status"
@@ -47,7 +61,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/tv_time"
         app:layout_constraintRight_toRightOf="parent"
         android:text="提现中"
-        android:textSize="15sp"
+        android:textSize="12sp"
         android:textColor="@color/black_333333"
         />
 

app/src/main/res/values/colors.xml

@@ -17,6 +17,7 @@
     <color name="black_737373">#737373</color>
     <color name="white">#FFFFFFFF</color>
     <color name="white_f8f8f8">#F8F8F8</color>
+    <color name="org_f88726">#f88726</color>
 
     <color name="translate">#00000000</color>
 

easyPhotos/src/main/java/com/huantansheng/easyphotos/utils/file/FileUtils.java

@@ -39,7 +39,7 @@ public class FileUtils {
     static final String TAG = "FileUtils";
     private static final boolean DEBUG = false; // Set to true to enable logging
     /**
-     * File and folder comparator. TODO Expose sorting option method
+     * File and folder comparator.
      */
 
     /**