Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

# Conflicts:
#	module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -4,21 +4,17 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
@@ -38,7 +34,6 @@ import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.HomeFragment;
 import com.rv.home.rv.module.ui.main.home.bean.EffectiveTimeBean;
 import com.rv.rvmine.MineFragment;
-import com.rv.share.WebViewActivity;
 import com.rv.share.view.PromotionDialog;
 import com.rv.tourism.R2;
 import com.rv.tourism.TourismFragment;
@@ -57,7 +52,6 @@ import butterknife.BindView;
 import butterknife.OnClick;
 
 
-
 public class MainActivity extends BaseActivity<CommonPresenter> {
 
     //    @BindView(R2.id.pager_view_fragment)
@@ -105,7 +99,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StatusBarUtil.setRootViewFitsSystemWindows(mActivity,false);
+        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
     }
 
     @Override
@@ -172,7 +166,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
                         public void onClick(View view) {
                             promotionDialog.dismiss();
                             postActivityPopup(act.getId());
-                            startActivity(WebViewActivity.getIntent(getApplicationContext(), act.getUrl(), act.getName()));
+
                         }
                     }).setData(act).create();
                     promotionDialog.show();

RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/ActBean.java

@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.bean;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
 
+import java.io.Serializable;
 import java.util.List;
 
 /*****
@@ -29,7 +30,7 @@ public class ActBean extends BaseBean {
         this.data = data;
     }
 
-    public static class Act {
+    public static class Act implements Serializable {
         private int id;
         private String name;
         private String descr;

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

@@ -75,7 +75,7 @@ public class CityListActivity extends BaseStatusActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(mActivity.getString(R.string.rv_city_list));
-        titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_white);
+        titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_dark);
         cityListAdapter = new CityListAdapter(new ArrayList<MultiItemBean>(), listener, mNowCity);
         recyclerView.setLayoutManager(new GridLayoutManager(this, 6));
         recyclerView.setAdapter(cityListAdapter);

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

@@ -97,7 +97,7 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
         } else if (shopType == 2) {
             titleView.setTitle("选择还车公司");
         }
-        titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_white);
+        titleView.setImageResource(R.id.iv_title_left, R.drawable.rv_common_icon_back_dark);
         Drawable drawable = getResources().getDrawable(R.drawable.icon_position);
         drawable.setBounds(0, 0, DisplayUtil.dip2px(this, 12), DisplayUtil.dip2px(this, 15));
         tvCurrentCity.setCompoundDrawables(drawable, null, null, null);

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

@@ -6,17 +6,16 @@
     android:background="@color/colorLine"
     android:orientation="vertical">
 
-    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <com.rv.component.utils.ObservableScrollView
             android:id="@+id/scrollview"
-            android:scrollbars="none"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:scrollbars="none">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -608,7 +607,8 @@
                             android:drawableRight="@drawable/common_icon_rig_black_gray"
                             android:drawablePadding="@dimen/size_5"
                             android:text="全部"
-                            android:textSize="@dimen/text_10" />
+                            android:textSize="@dimen/text_10"
+                            android:visibility="gone" />
                     </LinearLayout>
 
                     <android.support.v7.widget.RecyclerView
@@ -1021,109 +1021,109 @@
     </com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
 
     <com.ruiwenliu.wrapper.statusbar.StatusBarHeightView
+        android:id="@+id/ll_item_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/ll_item_title"
         android:orientation="vertical"
         app:use_type="use_padding_top">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/size_50"
-        android:gravity="center"
-        android:orientation="horizontal">
-
         <LinearLayout
-            android:id="@+id/travel_city_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/size_5"
-            android:clickable="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/size_50"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/travel_city_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="@dimen/ui_dimen_common_small"
-                android:textColor="@color/colorWrite"
-                android:textSize="@dimen/_ui_text_size_h6" />
-
-            <ImageView
-                android:id="@+id/iv_travel_city_text_hint"
+            <LinearLayout
+                android:id="@+id/travel_city_layout"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/rv_common_icon_up_arrow2" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_item_search"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_margin="@dimen/ui_dimen_common"
-            android:layout_weight="1"
-            android:background="@drawable/shape_rv_textview_home_translucent"
-            android:gravity="center"
-            android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/size_5"
+                android:clickable="true"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/travel_city_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/ui_dimen_common_small"
+                    android:textColor="@color/colorWrite"
+                    android:textSize="@dimen/_ui_text_size_h6" />
 
+                <ImageView
+                    android:id="@+id/iv_travel_city_text_hint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/rv_common_icon_up_arrow2" />
+            </LinearLayout>
 
-            <ImageView
-                android:id="@+id/iv_search_input_hint"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
-                android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
-                android:layout_marginRight="@dimen/ui_dimen_common_small"
-                android:src="@drawable/rv_common_icon_search2" />
-
-            <TextView
-                android:id="@+id/search_input"
+            <LinearLayout
+                android:id="@+id/ll_item_search"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
+                android:layout_margin="@dimen/ui_dimen_common"
                 android:layout_weight="1"
-                android:background="@null"
-                android:gravity="center_vertical"
-                android:hint="搜索目的地/旅游线"
-                android:paddingLeft="@dimen/ui_dimen_common"
-                android:paddingRight="@dimen/ui_dimen_padding_h1"
-                android:textColor="@color/colorTextH1"
-                android:textColorHint="@color/colorWrite"
-                android:textSize="@dimen/_ui_text_size_h7" />
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/travel_server_image"
-            android:layout_width="@dimen/size_30"
-            android:layout_height="@dimen/size_30"
-            android:layout_marginRight="@dimen/size_5"
-            android:padding="@dimen/size_5"
-            android:paddingRight="@dimen/ui_dimen_common"
-            android:scaleType="centerInside"
-            android:src="@drawable/rv_rentingcar_icon_service_white" />
-
-        <LinearLayout
-            android:id="@+id/ll_item_top"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingRight="@dimen/size_15"
-            android:visibility="gone">
+                android:background="@drawable/shape_rv_textview_home_translucent"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+
+                <ImageView
+                    android:id="@+id/iv_search_input_hint"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
+                    android:layout_marginRight="@dimen/ui_dimen_common_small"
+                    android:src="@drawable/rv_common_icon_search2" />
+
+                <TextView
+                    android:id="@+id/search_input"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="搜索目的地/旅游线"
+                    android:paddingLeft="@dimen/ui_dimen_common"
+                    android:paddingRight="@dimen/ui_dimen_padding_h1"
+                    android:textColor="@color/colorTextH1"
+                    android:textColorHint="@color/colorWrite"
+                    android:textSize="@dimen/_ui_text_size_h7" />
+            </LinearLayout>
 
             <ImageView
-                android:layout_width="@dimen/size_20"
-                android:layout_height="@dimen/size_20"
-                android:padding="@dimen/size_2"
-                android:src="@drawable/common_icon_stick" />
+                android:id="@+id/travel_server_image"
+                android:layout_width="@dimen/size_30"
+                android:layout_height="@dimen/size_30"
+                android:layout_marginRight="@dimen/size_5"
+                android:padding="@dimen/size_5"
+                android:paddingRight="@dimen/ui_dimen_common"
+                android:scaleType="centerInside"
+                android:src="@drawable/rv_rentingcar_icon_service_white" />
 
-            <TextView
+            <LinearLayout
+                android:id="@+id/ll_item_top"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="回顶部"
-                android:textColor="@color/gray_FFB74B"
-                android:textSize="@dimen/text_8" />
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                android:paddingRight="@dimen/size_15"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="@dimen/size_20"
+                    android:layout_height="@dimen/size_20"
+                    android:padding="@dimen/size_2"
+                    android:src="@drawable/common_icon_stick" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="回顶部"
+                    android:textColor="@color/gray_FFB74B"
+                    android:textSize="@dimen/text_8" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
     </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
 </RelativeLayout>
\ No newline at end of file

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

@@ -17,7 +17,6 @@
         android:layout_marginBottom="5dp"
         android:background="@drawable/shape_rv_textview_home_search"
         android:gravity="center"
-        android:hint="上海"
         android:orientation="horizontal"
         android:textColor="@color/colorMain"
         android:textColorHint="@color/colorMain"

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

@@ -361,12 +361,13 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements
                     @Override
                     public void OnBannerClick(int position) {
                         BeanTourismBanner.DataBean dataBean = banners.get(position);
-                        ComponentName componentName = new ComponentName(getActivity(), "com.rv.share.WebViewActivity");
-                        Intent intent = new Intent();
-                        intent.setComponent(componentName);
-                        intent.putExtra("url", dataBean.getUrl());
-                        intent.putExtra("title", dataBean.getTitle());
-                        startActivity(intent);
+                        mPresenter.toTarget(getActivity(),dataBean.getUrl(),dataBean.getTitle());
+//                        ComponentName componentName = new ComponentName(getActivity(), "com.rv.share.WebViewActivity");
+//                        Intent intent = new Intent();
+//                        intent.setComponent(componentName);
+//                        intent.putExtra("url", dataBean.getUrl());
+//                        intent.putExtra("title", dataBean.getTitle());
+//                        startActivity(intent);
 //                        BeanTourismBanner.DataBean dataBean = banners.get(position);
 //                        ARouter.getInstance()
 //                                .build(Constance.ACTIVITY_URL_TRAVELDETAILS)

module_tourism/src/main/java/com/rv/tourism/presenter/TourismPresenter.java

 package com.rv.tourism.presenter;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 
@@ -19,4 +24,45 @@ public class TourismPresenter extends MvpPresenter {
     public String getBaseUrl() {
         return RvFrameConfig.AUTH_POST;
     }
+
+    /******
+     * 打开目标页面
+     * @param context
+     * @param url
+     * @param title
+     */
+    public void toTarget(Context context, String url, String title) {
+        if (url.startsWith("http")) {
+            ComponentName componentName = new ComponentName(context, "com.rv.share.WebViewActivity");
+            Intent intent = new Intent();
+            intent.setComponent(componentName);
+            intent.putExtra("url", url);
+            intent.putExtra("title", title);
+            context.startActivity(intent);
+        } else if (url.startsWith("app:")) {
+            String target = null;
+            String[] params = null;
+            if (url.contains("?")) {
+                target = url.substring(url.indexOf(":") + 1, url.indexOf("?"));
+                String paramsString = url.substring(url.indexOf("?") + 1);
+                params = paramsString.split("&");
+            } else {
+                target = url.substring(url.indexOf(":") + 1);
+            }
+            if (!TextUtils.isEmpty(target)) {
+                ComponentName componentName = new ComponentName(context, target);
+                Intent intent = new Intent();
+                intent.setComponent(componentName);
+                if (params != null && params.length > 0) {
+                    for (String param : params) {
+                        String[] values = param.split("=");
+                        if (values.length == 2) {
+                            intent.putExtra(values[0], values[1]);
+                        }
+                    }
+                }
+                context.startActivity(intent);
+            }
+        }
+    }
 }

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

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

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

@@ -34,10 +34,11 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
         if (bean != null) {
             if (!TextUtils.isEmpty(bean.getCrtTime())) {
                 helper.setText(R.id.tv_consume_time, "下单时间: " + bean.getCrtTime());
-                if (bean.getStatusX() == 3) {
+                if(bean.getStatusX() == 2){
+                    helper.setText(R.id.tv_state, "已取消");
+                } else  if (bean.getStatusX() == 3) {
                     helper.setText(R.id.tv_state, "待支付");
-                }
-                if (bean.getStatusX() == 4) {
+                } else if (bean.getStatusX() == 4) {
                     helper.setText(R.id.tv_state, "待出行");
                 } else if (bean.getStatusX() == 5) {
                     helper.setText(R.id.tv_state, "出行中");

plugin_share/src/main/java/com/rv/share/view/PromotionDialog.java

@@ -82,7 +82,6 @@ public class PromotionDialog extends Dialog {
             return dialog;
         }
 
-
     }
 
 }

plugin_version/src/main/java/com/rv/version/VersionUpdateDialog.java

@@ -3,6 +3,7 @@ package com.rv.version;
 import android.app.Dialog;
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -86,7 +87,7 @@ public class VersionUpdateDialog extends Dialog {
 
             if (this.updateBean != null) {
                 if (!TextUtils.isEmpty(this.updateBean.getUpdateInfo())) {
-                    txtContent.setText(this.updateBean.getUpdateInfo());
+                    txtContent.setText(Html.fromHtml(this.updateBean.getUpdateInfo()));
                 }
 
                 if (!TextUtils.isEmpty(this.updateBean.getServerVersionName())) {

plugin_version/src/main/java/com/rv/version/bean/VersionCheckBean.java

@@ -33,7 +33,7 @@ public class VersionCheckBean extends BaseBean {
         private int downloadSwitch;
         private int isCompe ;
         private int weigh;
-        private int crtTime;
+        private long crtTime;
         private int isDel;
 
         public int getId() {
@@ -108,11 +108,11 @@ public class VersionCheckBean extends BaseBean {
             this.weigh = weigh;
         }
 
-        public int getCrtTime() {
+        public long getCrtTime() {
             return crtTime;
         }
 
-        public void setCrtTime(int crtTime) {
+        public void setCrtTime(long crtTime) {
             this.crtTime = crtTime;
         }
 

plugin_version/src/main/res/layout/dialog_update_view.xml

@@ -6,16 +6,17 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="300dp"
+        android:layout_width="@dimen/dialog_width"
         android:layout_height="wrap_content"
         android:background="@drawable/dialog_content_bg"
         android:gravity="center_horizontal"
-        android:minWidth="300dp"
+        android:minWidth="@dimen/dialog_width"
         android:orientation="vertical">
 
         <ImageView
-            android:layout_width="300dp"
-            android:layout_height="110dp"
+            android:scaleType="fitXY"
+            android:layout_width="@dimen/dialog_width"
+            android:layout_height="@dimen/dialog_img_height"
             android:src="@drawable/icon_dialog_top" />
 
         <TextView

plugin_version/src/main/res/values-hdpi/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialog_width">160dp</dimen>
+    <dimen name="dialog_img_height">55dp</dimen>
+</resources>

plugin_version/src/main/res/values-xhdpi/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialog_width">213.33dp</dimen>
+    <dimen name="dialog_img_height">73.33dp</dimen>
+</resources>

plugin_version/src/main/res/values-xxhdpi/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="dialog_width">320dp</dimen>
+    <dimen name="dialog_img_height">110dp</dimen>
+</resources>