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

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentMain.java

@@ -222,10 +222,7 @@ public class TravelFragmentMain extends BaseFragment {
                             @Override
                             public void OnBannerClick(int position) {
 
-//                                Bundle bundle = new Bundle();
-//                                bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
-//                                bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
-//                                IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
+//
 
                             }
                         })

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/dialog/TipsDialog.java → component_dialog/src/main/java/com/rv/component/dialog/TipsDialog.java

-package com.rv.home.rv.module.ui.main.home.dialog;
+package com.rv.component.dialog;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -6,7 +6,6 @@ import android.view.Gravity;
 import android.view.ViewGroup;
 
 import com.ruiwenliu.wrapper.dialog.BaseDialog;
-import com.rv.home.R;
 
 /**
  * 温馨提示

module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java

@@ -143,6 +143,8 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
             Map<String, Object> headMap = new LinkedHashMap<>();
             headMap.put("Authorization", OkGoUtil.getToken());
             mPresenter.postData(RvFrameConfig.HOST, 2, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class, headMap, headMap, true);
+        }else {
+            ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
         }
     }
 

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -22,10 +22,15 @@ import android.widget.ProgressBar;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.base.utils.tools.android.IntentUtil;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.DateUtils;
 import com.xxfc.discovery.R;
@@ -36,7 +41,9 @@ import com.xxfc.discovery.dialog.TrillCommentInputDialog;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 import com.yuyife.okgo.OkGoUtil;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
@@ -76,8 +83,6 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
         initWeb();
     }
 
-
-
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void initWeb() {
         WebSettings webSettings = mWebView.getSettings();
@@ -140,7 +145,7 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
     @OnClick({R2.id.ll_item_comment})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id ==R.id.ll_item_comment){
+        if (id == R.id.ll_item_comment) {
             //评论
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
@@ -152,8 +157,8 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
                     content = str;
                     if (OkGoUtil.getToken() != null) {
                         Map<String, Object> headMap = new LinkedHashMap<>();
-                            headMap.put("Authorization",OkGoUtil.getToken());
-                            mPresenter.postData(RvFrameConfig.HOST,0, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class,headMap, headMap,true);
+                        headMap.put("Authorization", OkGoUtil.getToken());
+                        mPresenter.postData(RvFrameConfig.HOST, 0, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class, headMap, headMap, true);
                     }
 
 //                        headMap.put("Authorization", OkGoUtil.getToken());
@@ -172,7 +177,7 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-        switch (requestType){
+        switch (requestType) {
             case 0:
                 DiscoveryIMTokenBean intokenBean = (DiscoveryIMTokenBean) result;
                 setData(intokenBean);
@@ -186,10 +191,10 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
 
     private void setData(DiscoveryIMTokenBean intokenBean) {
         Map<String, Object> map = new LinkedHashMap<>();
-        map.put("access_token",intokenBean.getData());
-        map.put("messageId",id);
+        map.put("access_token", intokenBean.getData());
+        map.put("messageId", id);
         map.put("body", content);
-        mPresenter.postData(1, DiscoveryApi.DISCOVERY_COMMENT_ADD, BaseBean.class, map,true);
+        mPresenter.postData(1, DiscoveryApi.DISCOVERY_COMMENT_ADD, BaseBean.class, map, true);
     }
 
     public class AndroidJs {
@@ -197,12 +202,33 @@ public class DetailPatActivity  extends BaseStatusActivity<DiscoveryPresenter> {
         public String getToken() {
             return OkGoUtil.getToken();
         }
+
+        @JavascriptInterface
+        public void showImage(String imageJson) {
+            if (!TextUtil.isEmpty(imageJson)) {
+                List<String> imagesList = new Gson().fromJson(imageJson,
+                        new TypeToken<List<String>>() {
+                        }.getType());
+                Bundle bundle = new Bundle();
+                bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
+                bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) imagesList);
+                IntentUtil.startActivity(mActivity, ActivityImageBrowseUrl.class, bundle);
+            }
+        }
+
+
+        @JavascriptInterface
+        public void isLike() {
+            showToast("点点");
+        }
     }
 
 
     @Override
     protected void onStart() {
         super.onStart();
+
+//
     }
 
     @Override

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

@@ -411,6 +411,12 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
      * 与h5交互
      */
     public class AndroidJs {
+        
+        @JavascriptInterface
+        public String getToken() {
+            return OkGoUtil.getToken();
+        }
+
         /**
          * 显示门店地图
          */

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

@@ -7,8 +7,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.widget.PopupWindowCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
@@ -63,6 +61,7 @@ import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderPayBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderPriceBean;
 import com.rv.home.rv.module.ui.main.home.bean.SelectItemBean;
+import com.rv.component.dialog.TipsDialog;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
 import com.rv.home.rv.module.ui.main.home.other.SelectItemActivity;
 import com.tencent.mm.opensdk.modelpay.PayReq;
@@ -74,7 +73,6 @@ import com.yuyife.okgo.OkGoUtil;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -514,7 +512,6 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         }
 
         payType = 1;
-
         new PaymentTypeSelection(mActivity) {
             @Override
             public void helper(final ViewHolder helper) {

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

@@ -8,7 +8,6 @@ import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -23,7 +22,7 @@ import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
-import com.rv.home.rv.module.ui.main.home.dialog.TipsDialog;
+import com.rv.component.dialog.TipsDialog;
 import com.rv.home.rv.module.ui.main.home.order.adapter.CancelTheTripAdapter;
 import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripBean;
 import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripDataBean;

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

@@ -440,7 +440,6 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
                     llItemBottom.setVisibility(View.GONE);
                 }
             });
-
         }
 
         @JavascriptInterface

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

@@ -42,6 +42,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.control.SwitchButton;
 import com.rv.component.dialog.OrderPriceDetailPw;
 import com.rv.component.dialog.PaymentTypeSelection;
+import com.rv.component.dialog.TipsDialog;
 import com.rv.component.dialog.bean.OrderPriceDetailBean;
 import com.rv.component.utils.Arith;
 import com.rv.component.utils.DateUtils;

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

@@ -5,23 +5,33 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.Html;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.ruiwenliu.wrapper.dialog.BaseDialog;
 import com.rv.version.bean.UpdateBean;
 
-public class VersionUpdateDialog extends Dialog {
+public class VersionUpdateDialog  extends BaseDialog {
 
     public VersionUpdateDialog(@NonNull Context context) {
         super(context);
+
     }
 
     public VersionUpdateDialog(Context context, int themeResId) {
         super(context, themeResId);
+        setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+    }
+
+    @Override
+    public int getViewLayout() {
+        return R.layout.dialog_update_view;
     }
 
     public static class Builder {

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

@@ -6,17 +6,18 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="@dimen/dialog_width"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/size_30"
+        android:layout_marginRight="@dimen/size_30"
         android:background="@drawable/dialog_content_bg"
         android:gravity="center_horizontal"
-        android:minWidth="@dimen/dialog_width"
         android:orientation="vertical">
 
         <ImageView
-            android:scaleType="fitXY"
-            android:layout_width="@dimen/dialog_width"
-            android:layout_height="@dimen/dialog_img_height"
+            android:scaleType="centerCrop"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:src="@drawable/icon_dialog_top" />
 
         <TextView

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

@@ -2,7 +2,6 @@ package com.xxrv.wallet.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
@@ -21,11 +20,6 @@ import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.dialog.VerifiedTipsDialog;
-import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.ui.main.home.ConfirmOrderActivity;
-import com.rv.home.rv.module.ui.main.home.dialog.TipsDialog;
-import com.rv.home.rv.module.ui.main.home.order.CancelTheTripActivity;
-import com.rv.home.rv.module.ui.main.home.order.bean.CancelTheTripBean;
 import com.xxrv.wallet.R;
 import com.xxrv.wallet.R2;
 import com.xxrv.wallet.api.WalletApi;