bug修复

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

@@ -12,11 +12,11 @@ public interface RvFrameConstant {
     int HTTP_STATE_NOT_REGISTERED = 1003;//用户未注册
     int HTTP_STATE_USER_SP = 1002;//用户已存在
     int HTTP_STATE_SUCCESS = 200;//请求成功
-    int HTTP_STATE_DATA_ALREADY_EXISTS = 1001;
+    int HTTP_STATE_DATA_ALREADY_EXISTS = 1009;
     /**
      * 请求错误类型
      */
-    int ERROR_TYPE_NET = 1001;//网络已断开
+    int ERROR_TYPE_NET = 1009;//网络已断开
     int ERROR_TYPE_TIME_OUR = 1002;//请求超时
     int ERROR_TYPE_HOST = 1003;//未发现指定服务器
     int ERROR_TYPE_URL = 1004;//url错误

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java

@@ -105,8 +105,6 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
                     helper.setImageResource(R.id.iv_flag, imageId);
                 }
                 helper.setText(R.id.tv_tip, empty);
-
-
             }
         });
     }

RvWrapper/src/main/res/drawable/shape_dialog_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#AA000000" />
+    <solid android:color="#ffffff" />
     <corners android:radius="10px" />
 </shape>
\ No newline at end of file

RvWrapper/src/main/res/layout/dialog_loading_progressly.xml

@@ -6,20 +6,21 @@
     android:layout_gravity="center_horizontal"
     android:orientation="vertical">
     <!--android:background="@drawable/bg_loading_dialog"-->
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-       android:background="@drawable/shape_dialog_bg"
-        >
+    <!--<RelativeLayout-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+       <!--android:background="@drawable/shape_dialog_bg"-->
+        <!--&gt;-->
 
         <ProgressBar
            android:layout_centerInParent="true"
             android:id="@+id/pb_load"
             android:layout_width="40dp"
             android:layout_height="40dp"
+            android:layout_gravity="center"
             android:indeterminate="true"
             android:indeterminateDrawable="@drawable/bg_progressbar_loading" />
-    </RelativeLayout>
+    <!--</RelativeLayout>-->
 
     <TextView
         android:visibility="gone"

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -73,8 +73,6 @@ import com.yuyife.banner.Banner;
 import com.yuyife.banner.BannerConfig;
 import com.yuyife.banner.listener.OnBannerListener;
 import com.yuyife.banner.loader.ImageLoader;
-
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/SelectLocationActivity.java

@@ -440,6 +440,9 @@ public class SelectLocationActivity extends BaseStatusActivity<CommonPresenter>
         if (suggestionResult == null || suggestionResult.getAllSuggestions() == null) {
             return;
         }
+        if (nowCity ==null){
+            return;
+        }
 
         if (isFirstLoc == false && !nowCity.equals(selectCity)) {
             isFirstLoc = true;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ShareImageActivity.java

@@ -8,6 +8,8 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -86,7 +88,7 @@ public class ShareImageActivity extends SwipeBackActivity<CommonPresenter> {
         showTitle(false);
         GlideManager.getInstance(this).loadImage(icon, ivGoods);
         tvName.setText(name);
-        tvContent.setText(keyword);
+        tvContent.setText(Html.fromHtml(keyword));
         tvPrice.setText(String.format("%1$s%2$s", price, this.getString(R.string.rv_day)));
 
         //生成带中间图标的二维码

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

@@ -96,7 +96,7 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
                 tvGetTime.setText(TimeManager.stampToDate(String.valueOf(detail.getStart_time())));
                 tvOutAddress.setText(detail.getEnd_addr());
                 tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEnd_time())));
-                tvPrice.setText(String.format("￥%1$s", dataBean.getRealAmount()));
+                tvPrice.setText(String.format("¥%1$s", dataBean.getRealAmount()));
                 GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivGoods);
             }
         }

module_home/src/main/res/layout/activity_get_on_the_car_qrcode.xml

@@ -81,7 +81,6 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:text="草原大漠，6天5晚，穿越沙漠..."
                     android:textColor="@color/textMain"
                     android:textSize="@dimen/text_14" />
 
@@ -106,7 +105,6 @@
                         android:layout_marginLeft="@dimen/size_2"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="2019-06-12周三~2019-06-18周二"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_10" />
                 </LinearLayout>
@@ -132,7 +130,6 @@
                         android:layout_marginLeft="@dimen/size_2"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="欣新房车（松山湖）有限公司"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_10" />
                 </LinearLayout>
@@ -158,7 +155,6 @@
                         android:layout_marginLeft="@dimen/size_2"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="呼伦贝尔大草原"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_10" />
                 </LinearLayout>
@@ -181,6 +177,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/size_60"
             android:gravity="center_vertical"

module_home/src/main/res/layout/activity_pick_up_the_car_qrcode.xml

@@ -80,7 +80,6 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="1"
-                    android:text="222222222222222222222"
                     android:textColor="@color/textMain"
                     android:textSize="@dimen/text_16" />
 
@@ -110,7 +109,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/size_5"
-                        android:text="222222222222222"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_12" />
 
@@ -121,7 +119,6 @@
                         android:layout_marginLeft="@dimen/size_5"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="222222222"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_12" />
                 </LinearLayout>
@@ -152,7 +149,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/size_5"
-                        android:text="222222222"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_12" />
 
@@ -163,7 +159,6 @@
                         android:layout_marginLeft="@dimen/size_5"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:text="555555555"
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_12" />
                 </LinearLayout>
@@ -175,7 +170,6 @@
                     android:layout_below="@id/ll_out"
                     android:layout_marginTop="@dimen/size_5"
                     android:layout_weight="1"
-                    android:text="30000000"
                     android:textColor="@color/colorAuxiliaryRed"
                     android:textSize="@dimen/text_16" />
             </RelativeLayout>
@@ -196,6 +190,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/size_60"
             android:gravity="center_vertical"

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -288,6 +288,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     }
 
     private void popularBrigadeAll(BeanPopularBrigadeAll data) {
+        mAllPopularAdapter.getData().clear();
         mAllPopularAdapter.addData(data.getData().getData());
     }
 
@@ -309,6 +310,7 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
 
 
     private void popularBrigade(BeanPopularBrigade result) {
+        mPopularBrigadeAdapter.getData().clear();
         mPopularBrigadeAdapter.addData(result.getData());
     }
 

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -196,7 +196,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null) {
             headMap.put("Authorization", OkGoUtil.getToken());
-            mPresenter.postBodyData(RvFrameConfig.HOST, 2, TourismApi.COMMIT_COLLECT_REMOVE, BaseBean.class, new CancelCollection(mCollectId, "1"), headMap, false);
+            Log.i("TravelDetailsactivity", "cancelCollect: 1111111111111111111111111111");
+            mPresenter.postBodyData(RvFrameConfig.HOST, 2, TourismApi.COMMIT_COLLECT_REMOVE, BaseBean.class, new CancelCollection(mCollectId, "1"), headMap, true);
         }
     }
 
@@ -204,7 +205,8 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         Map<String, Object> headMap = new LinkedHashMap<>();
         if (OkGoUtil.getToken() != null) {
             headMap.put("Authorization", OkGoUtil.getToken());
-            mPresenter.postBodyData(RvFrameConfig.HOST, 1, TourismApi.COMMIT_COLLECT_ADD, BaseBean.class, new AddCollection(id, "2"), headMap, false);
+            Log.i("TravelDetail", "cancelCollect: 222222222222222222222222222");
+            mPresenter.postBodyData(RvFrameConfig.HOST, 1, TourismApi.COMMIT_COLLECT_ADD, BaseBean.class, new AddCollection(id, "2"), headMap, true);
         }
     }
 
@@ -247,6 +249,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         }
     }
 
+    @Override
+    public void onShowError(String errorMsg, int errorType) {
+        super.onShowError(errorMsg, errorType);
+        ivCollect.setEnabled(true);
+        isCollection = "1";
+    }
 
     /**
      * 查看是否已收藏
@@ -544,7 +552,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         if (myClipboard == null) {
             myClipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
         }
-        ClipData myClip = ClipData.newPlainText("text", webUrl);
+        ClipData myClip = ClipData.newPlainText("text", webUrl+"&shareType=app");
         myClipboard.setPrimaryClip(myClip);
         showToast("复制成功！");
     }

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -54,6 +54,7 @@ import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -149,7 +150,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             double childPrice = dataBean.getChildPrice();
             double adultPrice = dataBean.getPrice();
             price = Arith.mul(Double.valueOf(childNum), Double.valueOf(childPrice)) + Arith.mul(Double.valueOf(adultNum), Double.valueOf(adultPrice));
-            tvPaymentAmount.setText(String.format("¥%1$s", price));
+            tvPaymentAmount.setText(String.format("¥%1$s",new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
 
             for (int i = 0; i < Integer.valueOf(dataBean.getAdultNum()); i++) {
                 BeanVisitorInformation travelMember = new BeanVisitorInformation();
@@ -294,9 +295,9 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             childrenBean3.setVal("¥" + info.getData().getInsurePrice() * (adultNum + childNum) * day);
             childrenBeanList.add(childrenBean3);
 
-            tvPaymentAmount.setText(String.format("¥%1$s", price + (info.getData().getInsurePrice() * (adultNum + childNum) * day)));
+            tvPaymentAmount.setText(String.format("¥%1$s",  new BigDecimal(price + (info.getData().getInsurePrice() * (adultNum + childNum) * day)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         } else {
-            tvPaymentAmount.setText(String.format("¥%1$s", price));
+            tvPaymentAmount.setText(String.format("¥%1$s", new BigDecimal(price).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
         }
 
         orderPriceDetailBean = new OrderPriceDetailBean();

plugin_calendar/src/main/java/com/rv/plugin/calendar/CalendarActivity.java

@@ -167,13 +167,20 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
 
         if (timeList != null) {
             for (int i = 0; i < timeList.size(); i++) {
-                if (timeList.get(i).equals(begTime)){
+                if (timeList.get(i).equals(begTime)) {
                     wheelViewLeft.setSeletion(i);
                     s_begTime = begTime;
+                } else if (timeList.get(i).equals("08:00")) {
+                    wheelViewLeft.setSeletion(i);
+                    s_begTime = "08:00";
                 }
-                if (timeList.get(i).equals(endTime)){
+
+                if (timeList.get(i).equals(endTime)) {
                     wheelViewRight.setSeletion(i);
                     s_endTime = endTime;
+                } else if (timeList.get(i).equals("18:00")) {
+                    wheelViewRight.setSeletion(i);
+                    s_endTime = "18:00";
                 }
             }
         }
@@ -184,9 +191,9 @@ public class CalendarActivity extends BaseStatusActivity<CalendarPresenter> {
     @OnClick({R2.id.iv_close, R2.id.tv_ok})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.iv_close){
+        if (id == R.id.iv_close) {
             finish();
-        }else if (id == R.id.tv_ok) {
+        } else if (id == R.id.tv_ok) {
             if (TextUtils.isEmpty(s_begDate)) {
                 showToast("请选择租车日期！");
                 return;

plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java

@@ -149,7 +149,7 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
         map.put("page", page);
         map.put("limit", "10");
         map.put("distance", 10.0);
-        map.put("latitudel", latLatitude);
+        map.put("latitude", latLatitude);
         map.put("longitude", lonLongitude);
         mPresenter.getData(0, SearchApi.QUERY_RIM_LIST, BeanTravelSearch.class, map, true);
     }