1。充值bug;

2.首页的适配
3.提现记录

moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java

@@ -53,7 +53,6 @@ import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.UtilConfig;
 import com.xscm.moduleutil.utils.config.EnvironmentEnum;
 import com.xscm.moduleutil.utils.config.EnvironmentPrefs;
-import com.xscm.moduleutil.utils.IMServiceManager;
 import com.xscm.moduleutil.widget.CommonAppConfig;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.DefaultRefreshFooterCreator;

moduleUtil/src/main/java/com/xscm/moduleutil/bean/WithdrawalBean.java

@@ -11,7 +11,11 @@ import lombok.Data;
 public class WithdrawalBean {
     private String name;
     private String money;
-    private String status;
+    private int status;
     private String status_str;
     private String createtime;
+    private String withdraw_fee;
+    private String surplus_money;
+    private String received_tax_amount;
+
 }

moduleUtil/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java

@@ -156,6 +156,9 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
             public void onInputBoxVisibilityChanged(boolean isVisible) {
                 // 根据 isVisible 的值来显示或隐藏输入框
                 mBinding.r4.setVisibility(isVisible ? View.VISIBLE : View.GONE);
+                if (isVisible){
+                    money="0";
+                }
             }
         });
         mBinding.rvComment.setLayoutManager(new GridLayoutManager(getContext(), 3));

moduleUtil/src/main/java/com/xscm/moduleutil/http/ApiServer.java

@@ -166,7 +166,7 @@ public interface ApiServer {
     Observable<BaseModel<PlaceholderBean>> guildRanking();
 
     @GET(Constants.GET_WITHDRAWAL_LIST)
-    Observable<BaseModel<List<WithdrawalBean>>> withdrawalList(@Query("page") String page, @Query("page_limit") String page_limit, @Query("search_stime") String search_stime, @Query("search_etime") String search_etime);
+    Call<BaseModel<List<WithdrawalBean>>> withdrawalList(@Query("page") String page, @Query("page_limit") String page_limit, @Query("search_stime") String search_stime, @Query("search_etime") String search_etime);
 
     @FormUrlEncoded
     @POST(Constants.POST_BIND_DETAIL)

moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -5,6 +5,7 @@ package com.xscm.moduleutil.http;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.util.Log;
 
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
@@ -526,7 +527,27 @@ public class RetrofitClient {
     }
 
     public void withdrawalList(String page, String page_limit, String search_stime, String search_etime, BaseObserver<List<WithdrawalBean>> observer) {
-        sApiServer.withdrawalList(page, page_limit, search_stime, search_etime).compose(new DefaultTransformer<>()).subscribe(observer);
+        sApiServer.withdrawalList(page,page_limit,search_stime,search_etime).enqueue(new Callback<BaseModel<List<WithdrawalBean>>>() {
+            @Override
+            public void onResponse(Call<BaseModel<List<WithdrawalBean>>> call, Response<BaseModel<List<WithdrawalBean>>> response) {
+                if (response.code() == 200){
+                    BaseModel<List<WithdrawalBean>> baseModel=response.body();
+                    if (baseModel.getCode()==1){
+                        Log.d("withdrawalList---", "onResponse: "+response.body().toString());
+
+                        observer.onNext(baseModel.getData());
+                    }else {
+                        observer.onNext(null);
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<List<WithdrawalBean>>> call, Throwable t) {
+
+            }
+        });
+//        sApiServer.withdrawalList(page, page_limit, search_stime, search_etime).compose(new DefaultTransformer<>()).subscribe(observer);
     }
 
     public void bindDetai(String userId, String type,BaseObserver<BindDetail> observer){

moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java

@@ -51,11 +51,11 @@ public class EnvironmentPrefs {
 //        }
         
         // 默认使用生产环境
-        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name());
+        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.TEST.name());
         try {
             return EnvironmentEnum.valueOf(envName);
         } catch (IllegalArgumentException e) {
-            return EnvironmentEnum.PRODUCTION; // 出错时默认返回生产环境
+            return EnvironmentEnum.TEST; // 出错时默认返回生产环境
         }
     }
 }

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

@@ -8,8 +8,10 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="color_0DFFB9">#0DFFB9</color>
+    <color name="color_2ADB88">#2ADB88</color>
     <color name="color_DADADA">#DADADA</color>
     <color name="color_BB8BE2">#BB8BE2</color>
+    <color name="color_999999">#999999</color>
 
     <color name="colorPrimaryDark">#FFFFBB00</color>
     <color name="colorAccent">#FFFFBB00</color>