Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -89,6 +89,8 @@ public class ApiConfig {
 
     public static String HTTP_URL_INCOME_RECORD = RvFrameConfig.HOST + "/api/admin/sellingwater/page";
 
+    public static String HTTP_URL_INCOME_RECORDA = RvFrameConfig.HOST + "/api/admin/sellingwater/pagea";
+
     public static String HTTP_URL_INVITE_LIST = RvFrameConfig.HOST + "/api/admin/relation/pages";
 
     public static String HTTP_URL_CONSUME_LIST = RvFrameConfig.HOST + "/api/admin/walletDetail/page";

plugin_wallet/src/main/java/com/xxrv/wallet/activity/CommissionDetailActivity.java

@@ -109,6 +109,7 @@ public class CommissionDetailActivity extends BaseStatusActivity<CommonPresenter
         viewpager.setCurrentItem(menuPosition);
     }
 
+
     private List<BaseFragment> getListFragment() {
         List<BaseFragment> list = new ArrayList<>();
         list.add(CommisionAllFragment.getInstance());

plugin_wallet/src/main/java/com/xxrv/wallet/adapter/commissionListAdapter.java

@@ -34,24 +34,31 @@ public class commissionListAdapter extends BaseQuickAdapter<IncomeRecordsBean.In
         helper.setText(R.id.tv_consume_name, buffer.toString());
         helper.setText(R.id.tv_income_time, DateUtils.timestampToString1(item.getCrtTime()));
 
-        if (item.getWaiting() == 0) {//是否入账：0-未入账；1-已入账
-            helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_not);
-            helper.setText(R.id.tv_status,"未到账");
-        } else if (item.getWaiting() == 1) {
-            helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_has);
-            helper.setText(R.id.tv_status,"已到账");
-        }
 
-        if (item.getStatus() == 0) {
+        if (item.isShow()) {
+            helper.setText(R.id.tv_amount, "取消订单");
+            helper.setTextColor(R.id.tv_amount, mContext.getResources().getColor(R.color.colorGray));
+        } else {
             StringBuilder builder = new StringBuilder();
             builder.append("+").append(item.getCommission()).append("元");
             helper.setText(R.id.tv_amount, builder.toString());
-            helper.setTextColor(R.id.tv_amount,mContext.getResources().getColor(R.color.textGray));
-        } else if (item.getStatus() == 1) {
-            helper.setText(R.id.tv_amount, "取消订单");
-            helper.setTextColor(R.id.tv_amount,mContext.getResources().getColor(R.color.colorGray));
+            helper.setTextColor(R.id.tv_amount, mContext.getResources().getColor(R.color.textGray));
+        }
+
+        if (TextUtils.isEmpty(item.getSellerStatus())) {
+            helper.setGone(R.id.tv_status, false);
+        } else {
+            helper.setGone(R.id.tv_status, true);
+            if ("0".equals(item.getSellerStatus())) {   //0未入账 1 已入账 2：取消
+                helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_not);
+                helper.setText(R.id.tv_status, item.getStatusText());
+            } else if ("1".equals(item.getSellerStatus())) {
+                helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_has);
+                helper.setText(R.id.tv_status, item.getStatusText());
+            } else if ("2".equals(item.getSellerStatus())) {
                 helper.setBackgroundRes(R.id.tv_status, R.drawable.shape_rv_bg_income_cancel);
-            helper.setText(R.id.tv_status,"取消");
+                helper.setText(R.id.tv_status, item.getStatusText());
+            }
         }
     }
 

plugin_wallet/src/main/java/com/xxrv/wallet/bean/IncomeRecordsBean.java

@@ -95,6 +95,10 @@ public class IncomeRecordsBean extends BaseBean {
         private long updTime;
         private String username;
         private int waiting;
+        private String sellerStatus;// 0未入账 1 已入账 2：取消
+        private String statusText;
+        private boolean isShow;
+
 
         public BigDecimal getCommission() {
             return commission;
@@ -191,5 +195,29 @@ public class IncomeRecordsBean extends BaseBean {
         public void setWaiting(int waiting) {
             this.waiting = waiting;
         }
+
+        public String getSellerStatus() {
+            return sellerStatus;
+        }
+
+        public void setSellerStatus(String sellerStatus) {
+            this.sellerStatus = sellerStatus;
+        }
+
+        public String getStatusText() {
+            return statusText;
+        }
+
+        public void setStatusText(String statusText) {
+            this.statusText = statusText;
+        }
+
+        public boolean isShow() {
+            return isShow;
+        }
+
+        public void setShow(boolean show) {
+            isShow = show;
+        }
     }
 }

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionAllFragment.java

@@ -89,6 +89,7 @@ public class CommisionAllFragment extends BaseFragment<CommonPresenter> implemen
         }
     }
 
+
     @Override
     public void onLoadMoreRequested() {
         if (currentPage >= pageTotal) {
@@ -113,7 +114,7 @@ public class CommisionAllFragment extends BaseFragment<CommonPresenter> implemen
             Map<String, Object> map = new HashMap<>();
             map.put("pageNo", currentPage);
             map.put("pageSize", pageSize);
-            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORDA, IncomeRecordsBean.class, map, header, true);
         }
     }
 }

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionFinishFragment.java

@@ -111,7 +111,7 @@ public class CommisionFinishFragment extends BaseFragment<CommonPresenter> imple
             map.put("pageNo", currentPage);
             map.put("pageSize", pageSize);
             map.put("type", 1);
-            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORDA, IncomeRecordsBean.class, map, header, true);
         }
     }
 }

plugin_wallet/src/main/java/com/xxrv/wallet/fragment/CommisionUnFinishFragment.java

@@ -111,7 +111,7 @@ public class CommisionUnFinishFragment extends BaseFragment<CommonPresenter> imp
             map.put("pageNo", currentPage);
             map.put("pageSize", pageSize);
             map.put("type", 0);
-            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORD, IncomeRecordsBean.class, map, header, true);
+            mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.HTTP_URL_INCOME_RECORDA, IncomeRecordsBean.class, map, header, true);
         }
     }
 }

plugin_wallet/src/main/res/layout/item_commission.xml

@@ -4,8 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginLeft="@dimen/dp_10"
-    android:layout_marginRight="@dimen/dp_10"
     android:layout_marginTop="@dimen/size_10"
+    android:layout_marginRight="@dimen/dp_10"
     android:orientation="vertical">
 
     <LinearLayout
@@ -16,10 +16,14 @@
 
         <TextView
             android:id="@+id/tv_status"
-            android:layout_width="@dimen/size_60"
-            android:layout_height="@dimen/size_20"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:background="@drawable/shape_rv_bg_income_not"
             android:gravity="center"
+            android:paddingLeft="@dimen/size_8"
+            android:paddingTop="@dimen/size_3"
+            android:paddingRight="@dimen/size_8"
+            android:paddingBottom="@dimen/size_3"
             android:text=""
             android:textColor="@color/colorWrite"
             android:textSize="@dimen/text_10" />