bug修复

OkGo/src/main/java/com/yuyife/okgo/OkGoUtil.java

@@ -45,7 +45,7 @@ public class OkGoUtil {
     final private static  String SP_KEY_USERINFO ="userinfo";
 
     public static  String getYkId(){
-        String ykid = "yk_"+ (int)((Math.random()*9+1)*100000);
+        String ykid = "uk_"+ (int)((Math.random()*9+1)*100000);
         return ykid;
     }
 

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 139
-        versionName "1.3.9"
+        versionCode 140
+        versionName "1.4.0"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvFrame/src/main/java/com/frame/rv/config/CommonApi.java

@@ -3,5 +3,5 @@ package com.frame.rv.config;
 public interface CommonApi extends RvFrameConfig{
 
     //行为记录保存
-    public static String RVENTHUSIAST_APP_UNAUTH_SAVE = RvFrameConfig.HOST + "/api/user/behavior/customerBehaviorNotes/app/unauth/save";
+    public static String RVENTHUSIAST_APP_UNAUTH_SAVE =RvFrameConfig.HOST + "/api/user/behavior/customerBehaviorNotes/app/unauth/save";
 }

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/presenter/CommonPresenter.java

@@ -46,7 +46,7 @@ public class CommonPresenter extends MvpPresenter {
             customerid = OkGoUtil.getYkId();
             customertype = "1";
         }
-        postBodyData(RvFrameConfig.HOST, 20, CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE, BaseBean.class, new SaveOnClick(customertype,customerid,type,typeid), headMap, false);
+        postBodyData2(RvFrameConfig.HOST, CommonApi.RVENTHUSIAST_APP_UNAUTH_SAVE, new SaveOnClick(customertype, customerid, type, typeid), headMap);
     }
 
 

RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java

@@ -111,8 +111,6 @@ public class RxRequestResult<T extends BaseBean, V extends BaseView<T>> extends
             Log.e("OnSuccessAndFaultSub", "error:" + e.getMessage());
             //            mOnSuccessAndFaultListener.onFault("error:" + e.getMessage());
 //            dismissProgressDialog();
-
-
         }
     }
 

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -3,8 +3,8 @@ package com.xxfc.discovery.api;
 import com.frame.rv.config.RvFrameConfig;
 
 public interface DiscoveryApi extends RvFrameConfig {
-    String IMA_BASEUSRL = "https://imapi.dfangche.com";
-//    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
+//    String IMA_BASEUSRL = "https://imapi.dfangche.com";
+    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
 
     //问题列表
     String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java

@@ -156,7 +156,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
         Map<String, Object> mapData = new LinkedHashMap<>();
         mapData.put("page", page);
         mapData.put("limit", 10);
-        mapData.put("multiStatus", "6,7");
+        mapData.put("multiStatus", "6,-1");
         mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, mapData, headMap, page == 1 ? true : false);
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java

@@ -177,7 +177,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 tvPickUpTheCar.setText(mActivity.getString(R.string.rv_return_car));
                 break;
             case 6:
-            case 7:
+            case -1:
                 if (dataBean.getType() == 3) {
                     tvCancelOrder.setVisibility(View.GONE);
                 }
@@ -281,7 +281,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 startActivity(PickUpTheCarQRCodeActivity.getIntent(mActivity, dataBean));
                 break;
             case 6:
-            case 7:
+            case -1:
                 startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
                 break;
         }
@@ -300,7 +300,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
                 startActivity(intent);
                 break;
             case 6:
-            case 7:
+            case -1:
                startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity,no));
                 break;
         }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/CompletedAdapter.java

@@ -45,7 +45,12 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean.getOrderRentVehicleDetail() !=null && dataBean.getOrderRentVehicleDetail().getStart_city_name()!=null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
-                helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
+                if (dataBean.getStatusX() ==6){
+                    helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
+                }else if (dataBean.getStatusX() ==-1){
+                    helper.setText(R.id.tv_order_state, "定损中");
+                }
+
                 String icon ="";
                 if (!TextUtils.isEmpty(dataBean.getCoverPic())){
                     icon = dataBean.getCoverPic();

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/adapter/OrderListAdapter.java

@@ -75,7 +75,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                  4–待出行
                  5–出行中（进行中）
                  6–已完成
-                 7 - 定损
+                 -1 - 定损
                  */
                 switch (dataBean.getStatusX()) {
                     case 0:
@@ -107,7 +107,7 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                         helper.setText(R.id.tv_process, mContext.getString(R.string.rv_to_evaluation));
                         helper.setVisible(R.id.tv_process, true);
                         break;
-                    case 7:
+                    case -1:
                         helper.setText(R.id.tv_order_state, "定损中");
                         helper.setVisible(R.id.tv_process, false);
                     default:

plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java

@@ -106,7 +106,7 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
 //        bodyMap.put("status", "3"); 4567
         bodyMap.put("hasMemberRight", 1);
         bodyMap.put("type", 1);
-        bodyMap.put("multiStatus", "4,5,6,7");
+        bodyMap.put("multiStatus", "4,5,6,-1");
         mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, bodyMap, headMap, mPage == 1 ? true : false);
     }
 

plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java

@@ -44,6 +44,8 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
                     helper.setText(R.id.tv_state, "出行中");
                 } else if (bean.getStatusX() == 6) {
                     helper.setText(R.id.tv_state, "已完成");
+                }else if (bean.getStatusX() == -1){
+                    helper.setText(R.id.tv_state, "定损中");
                 }
                 if (!TextUtils.isEmpty(bean.getName())) {
                     helper.setText(R.id.tv_car_type, bean.getName());