bug修复

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 110
-        versionName "1.1.0"
+        versionCode 111
+        versionName "1.1.1"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

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

@@ -8,9 +8,9 @@
         <clip>
             <shape>
                 <gradient
-                    android:centerColor="#aa47e29a"
-                    android:endColor="#47e29a"
-                    android:startColor="#9947e29a"/>
+                    android:centerColor="#aaFFB74B"
+                    android:endColor="#FFB74B"
+                    android:startColor="#99FFB74B"/>
             </shape>
         </clip>
     </item>

component_control/src/main/res/drawable/shape_rv_bg_yellow_progress_hint.xml

@@ -8,9 +8,9 @@
         <clip>
             <shape>
                 <gradient
-                    android:centerColor="#aa47e29a"
-                    android:endColor="#47e29a"
-                    android:startColor="#9947e29a"/>
+                    android:centerColor="#aaFFB74B"
+                    android:endColor="#FFB74B"
+                    android:startColor="#99FFB74B"/>
             </shape>
         </clip>
     </item>

component_utils/src/main/java/com/rv/component/utils/DateUtils.java

@@ -147,6 +147,17 @@ public class DateUtils {
         return tm;
     }
 
+    public static long StringToTimeMillis2(String time) {
+        long tm = 0;
+        try {
+            tm = sdf7.parse(time).getTime();
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return tm;
+    }
+
     /**
      * 将时间戳转换成yyyy-MM-dd HH:mm:ss字符串
      *
@@ -158,10 +169,10 @@ public class DateUtils {
     }
 
     /**
-     * 将时间戳转换成yyyy-MM-dd HH:mm:ss字符串
+     * 将时间戳转换成yyyy-MM-dd HH:mm字符串
      *
      * @param time 时间戳
-     * @return yyyy-MM-dd HH:mm:ss
+     * @return yyyy-MM-dd HH:mm
      */
     public static String timestampToString1(long time) {
         return sdf7.format(new Date(time));

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

@@ -507,9 +507,11 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
      * 支付价格计算
      */
     private void getPayMoney() {
-        if (priceBean != null && priceBean.getData() == null) {
+        if (priceBean == null || priceBean.getData() == null || dataBean ==null) {
             return;
         }
+
+
         ArrayList<OrderPriceDetailBean.ChildrenBean> childrenBeanList = new ArrayList<>(); //费用明细
         double payMoney = 0.00;
         double dayPrice = mCarBean.getVehicleModel().getSum();

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

@@ -4,6 +4,7 @@ import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -184,7 +185,8 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
     }
 
 
-    @OnClick({R2.id.travel_city_layout, R2.id.ll_item_search, R2.id.travel_server_image, R2.id.ll_item_popular_brigade_many, R2.id.travel_hot_more_close, R2.id.iv_popular_brigade_many})
+    @OnClick({R2.id.travel_city_layout, R2.id.ll_item_search, R2.id.travel_server_image, R2.id.ll_item_popular_brigade_many,
+            R2.id.travel_hot_more_close, R2.id.iv_popular_brigade_many})
     public void onViewClicked(View view) {
         int id = view.getId();
         if (id == R.id.travel_city_layout) {
@@ -203,7 +205,10 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements B
                     .withDouble("lonLongitude", lonLongitude)
                     .navigation();
         } else if (id == R.id.travel_server_image) {
-            showToast("亲，该功能还在开发中。。。");
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + "4000369369");
+            intent.setData(uri);
+            startActivity(intent);
         } else if (id == R.id.ll_item_popular_brigade_many || id == R.id.iv_popular_brigade_many) {
             //查看热门更多
             llLayoutPopularMore.setVisibility(View.VISIBLE);

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

@@ -5,6 +5,7 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -157,22 +158,28 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
             }
 
         } else if (id == R.id.tv_customer_service) {
-            //联系客户
+            //联系客服
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + "4000369369");
+            intent.setData(uri);
+            startActivity(intent);
 
         } else if (id == R.id.tv_appointment) {
             //预订
+            //登录
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
                 return;
             }
 
-            BeanUserInfo.UserInfo userInfo = getUserInfo();
-            if (userInfo !=null){
-                if (userInfo.getCertificationStatus() ==0){
-                    ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
-                    return;
-                }
-            }
+            //实名认证
+//            BeanUserInfo.UserInfo userInfo = getUserInfo();
+//            if (userInfo !=null){
+//                if (userInfo.getCertificationStatus() ==0){
+//                    ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
+//                    return;
+//                }
+//            }
 
             mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
             llItemBottom.setVisibility(View.GONE);

module_tourism/src/main/res/layout/activity_tourism.xml

@@ -86,9 +86,9 @@
 
                     <ImageView
                         android:id="@+id/travel_server_image"
-                        android:layout_width="@dimen/size_35"
+                        android:layout_width="@dimen/size_50"
                         android:layout_height="@dimen/size_35"
-                        android:layout_marginLeft="@dimen/size_15"
+                        android:paddingLeft="@dimen/size_15"
                         android:paddingRight="@dimen/size_15"
                         android:scaleType="centerInside"
                         android:src="@drawable/common_journey_service_gray" />

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

@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
+import com.rv.home.rv.module.ui.main.home.order.MemberOrderDetailsActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderDetailActivity;
 import com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity;
 import com.rv.home.rv.module.ui.main.home.order.adapter.CompletedAdapter;
@@ -59,7 +60,7 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                startActivity(OrderDetailActivity.getIntent(PurchaseRecordActivity.this, dataBean));
+                startActivity(MemberOrderDetailsActivity.getIntent(PurchaseRecordActivity.this, dataBean));
             }
         });
     }