Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

module_home/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="com.rv.home">
 
     <application>
+        <activity android:name=".rv.module.ui.main.home.order.ChargeDetailsActivity"></activity>
         <activity
             android:name=".rv.module.ui.main.home.order.DepositefundProgressDetailsActivity"
             android:screenOrientation="portrait" />

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -12,6 +12,7 @@ import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.other.TagAliasOperatorHelper;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
@@ -21,10 +22,10 @@ import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.LogUtil;
 import com.rv.home.R;
 import com.rv.home.rv.module.ApiConfig;
-import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.UMShareConfig;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.utils.SocializeUtils;
 import com.yuyife.okgo.OkGoUtil;
@@ -85,10 +86,19 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
     }
 
     public void umLogin(SHARE_MEDIA share_media) {
+        UMShareConfig config = new UMShareConfig();
+        config.isNeedAuthOnGetUserInfo(true);
+        UMShareAPI.get(mActivity).setShareConfig(config);
         UMShareAPI.get(mActivity).getPlatformInfo(mActivity, share_media, this);
     }
 
 
+    public void deleteAuthorize() {
+//        UMShareAPI.get(mActivity).deleteOauth(mActivity, SHARE_MEDIA.WEIXIN, this);
+//        UMShareAPI.get(mActivity).deleteOauth(mActivity, SHARE_MEDIA.QQ, this);
+    }
+
+
     public void setDataUser(BeanUserInfo data) {
         UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERINFO, JSON.toJSONString(data.getData())).commit();
         RxBus.post(new LoginUserInfoEvent());

module_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java

@@ -61,6 +61,7 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
     private String mUnionid;
     private Disposable mDisposable;
 
+
     public static Intent getIntent(Context context, String openid, String headImg, int isQQ, String name, String uId) {
         return new Intent(context, BingPhoneActivity.class)
                 .putExtra("openid", openid)
@@ -129,6 +130,7 @@ public class BingPhoneActivity extends BaseLoginActivity<CommonPresenter> {
     public void onDestroy() {
         super.onDestroy();
         stopCarousel();
+        deleteAuthorize();
     }
 
     @OnClick({R2.id.iv_clear_phone, R2.id.iv_clear_code, R2.id.tv_get_code, R2.id.tv_bind})

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

@@ -502,10 +502,10 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
 //            return;
 //        }
 
-        if (drivingListBean == null) {
-            showToast("请添加驾驶人！");
-            return;
-        }
+//        if (drivingListBean == null) {
+//            showToast("请添加驾驶人！");
+//            return;
+//        }
 
         if (tvPassengerKnow.isChecked() == false) {
             showToast("请同意预定须知");
@@ -586,6 +586,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         }
     }
 
+
     /**
      * 订单支付
      */
@@ -721,7 +722,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
             childrenBean2.setKey("车辆租赁费");
             childrenBean2.setDetail("¥" + dayPrice + "/天 *" + dayNum + "天");
-            childrenBean2.setVal("¥" + dayPrice * dayNum);
+            childrenBean2.setVal("¥" + new BigDecimal( dayPrice * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
             childrenBeanList.add(childrenBean2);
         } else {
             if (memberData != null) {
@@ -732,7 +733,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                     OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
                     childrenBean1.setKey("车辆租赁费");
                     childrenBean1.setDetail("¥" + dayPrice + "/天 *" + (dayNum - memberData.getRentFreeDays()) + "天");
-                    childrenBean1.setVal("¥" + dayPrice * (dayNum - memberData.getRentFreeDays()));
+                    childrenBean1.setVal("¥" + new BigDecimal( dayPrice * (dayNum - memberData.getRentFreeDays())).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
                     childrenBeanList.add(childrenBean1);
                 } else if (dayNum <= memberData.getRentFreeDays()) {
                     payMoney = priceBean.getData().getDeposit();
@@ -755,7 +756,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             OrderPriceDetailBean.ChildrenBean childrenBean4 = new OrderPriceDetailBean.ChildrenBean();
             childrenBean4.setKey("车损免赔费");
             childrenBean4.setDetail("¥" + priceBean.getData().getDamageSafePrice() + "/天 *" + dayNum + "天");
-            childrenBean4.setVal("¥" + priceBean.getData().getDamageSafePrice() * dayNum);
+            childrenBean4.setVal("¥" + new BigDecimal( priceBean.getData().getDamageSafePrice() * dayNum).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
             childrenBeanList.add(childrenBean4);
         }
 

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

+package com.rv.home.rv.module.ui.main.home.order;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
+import com.ruiwenliu.wrapper.base.BaseBean;
+import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
+import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
+import com.rv.home.R;
+import com.rv.home.R2;
+import com.rv.home.rv.module.ApiConfig;
+
+import butterknife.BindView;
+
+import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
+
+/**
+ * 费用明细
+ */
+public class ChargeDetailsActivity extends BaseStatusActivity<PickerPresenter> {
+
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
+    @BindView(R2.id.webView)
+    SafeWebView mWebView;
+    @BindView(R2.id.lay_web)
+    LinearLayout layWeb;
+
+    private String webUrl;
+    private String no;
+
+
+    public static Intent getIntent(Context context, String no) {
+        return new Intent(context, ChargeDetailsActivity.class)
+                .putExtra("no", no);
+    }
+
+    @Override
+    protected int setLayout() {
+        return R.layout.activity_charge_details;
+    }
+
+    @Override
+    protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
+        titleView.setTitle(mActivity.getString(R.string.rv_charge_details));
+        no = intent.getStringExtra("no");
+        webUrl = ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL;
+        initWeb();
+    }
+
+    @Override
+    public void onShowResult(int requestType, BaseBean result) {
+
+    }
+
+
+    private void initWeb() {
+        WebSettings webSettings = mWebView.getSettings();
+        if (webSettings == null) return;
+        // 支持 Js 使用
+        webSettings.setJavaScriptEnabled(true);
+        // 开启DOM缓存,默认状态下是不支持LocalStorage的
+        webSettings.setDomStorageEnabled(true);
+        // 开启数据库缓存
+        webSettings.setDatabaseEnabled(true);
+        // 支持自动加载图片
+        webSettings.setLoadsImagesAutomatically(hasKitkat());
+        // 设置 WebView 的缓存模式
+        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
+        // 支持启用缓存模式
+        webSettings.setAppCacheEnabled(true);
+        // 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
+//        webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
+        // Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
+        webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
+        // 数据库路径
+//        if (!hasKitkat()) {
+//            webSettings.setDatabasePath(getDatabasePath("html").getPath());
+//        }
+        // 关闭密码保存提醒功能
+//        webSettings.setSavePassword(false);
+        // 支持缩放
+        webSettings.setSupportZoom(true);
+        // 设置 UserAgent 属性
+        webSettings.setUserAgentString("");
+        // 允许加载本地 html 文件/false
+        webSettings.setAllowFileAccess(true);
+        // 允许通过 file url 加载的 Javascript 读取其他的本地文件,Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
+        webSettings.setAllowFileAccessFromFileURLs(true);
+        // 允许通过 file url 加载的 Javascript 可以访问其他的源，包括其他的文件和 http，https 等其他的源，
+        // Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
+        // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
+        webSettings.setAllowUniversalAccessFromFileURLs(true);
+        mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
+        mWebView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
+            }
+        });
+        mWebView.loadUrl(webUrl);
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress == 100) {
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                } else {
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
+    }
+
+    public class AndroidJs {
+        @JavascriptInterface
+        public void onClickWeb(int type) {
+            if (type == 1) {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                        .withString("title", "违约金说明")
+                        .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                        .withInt("type", 26)
+                        .navigation();
+            } else if (type == 2) {
+                //取消政策
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                        .withString("title", "取消政策")
+                        .withString("url", ApiConfig.HTTP_URL_CAR_TYPE_NOTICE)
+                        .withInt("type", 3)
+                        .navigation();
+            }
+        }
+
+
+        @JavascriptInterface
+        public void onClickDeposit() {
+            //退押金进度
+            startActivity(DepositefundProgressDetailsActivity.getIntent(mActivity, no));
+        }
+    }
+
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mWebView.onResume();// 生命周期onResume
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mWebView.onPause();//生命周期onPause
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mWebView.stopLoading();// 停止当前加载
+        mWebView.clearMatches();// 清除网页查找的高亮匹配字符。
+        mWebView.clearHistory();// 清除当前 WebView 访问的历史记录
+        mWebView.clearSslPreferences();//清除ssl信息
+        mWebView.clearCache(true);//清空网页访问留下的缓存数据。需要注意的时，由于缓存是全局的，所以只要是WebView用到的缓存都会被清空，即便其他地方也会使用到。该方法接受一个参数，从命名即可看出作用。若设为false，则只清空内存里的资源缓存，而不清空磁盘里的。
+        mWebView.loadUrl("about:blank");// 清空当前加载
+        mWebView.removeAllViews();// 清空子 View
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
+        }
+//        mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
+        mWebView.destroy();// 生命周期销毁
+
+    }
+
+}

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

@@ -569,7 +569,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         @JavascriptInterface
         public void onClick() {
             //费用明细
-            startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
+            startActivity(ChargeDetailsActivity.getIntent(mActivity, no));
         }
 
         @JavascriptInterface

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

@@ -534,7 +534,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         @JavascriptInterface
         public void onClick() {
             //费用明细
-            startActivity(WebActivity.getIntent(mActivity, mActivity.getString(R.string.rv_charge_details), ApiConfig.HTTP_URL_CAR_TYPE_COSTDETAIL));
+            startActivity(ChargeDetailsActivity.getIntent(mActivity, no));
         }
 
         @JavascriptInterface

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/lay_web"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
+        android:visibility="gone"></ProgressBar>
+
+    <com.ruiwenliu.wrapper.weight.webview.SafeWebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+</LinearLayout>

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -388,6 +388,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             return;
         }
         mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, mWXOpenid, mUnionid, mQQOpenid), getHeadMap(), true);
+//        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, "", "", ""), getHeadMap(), true);
     }
 
     private Map<String, Object> getHeadMap() {

plugin_video/src/main/java/com/dueeeke/videoplayer/player/VideoView.java

@@ -203,7 +203,7 @@ public class VideoView extends FrameLayout implements MediaPlayerControl, Player
         }
         VideoViewManager.instance().addVideoView(this);
 
-        if (checkNetwork()) return;
+//        if (checkNetwork()) return;
 
         //监听音频焦点改变
         if (mEnableAudioFocus) {