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

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

@@ -134,6 +134,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
                     Cooker.save(getApplicationContext(), "actRent", bean.getData().getActRent());
                     Cooker.save(getApplicationContext(), "actTour", bean.getData().getActTour());
                     Cooker.save(getApplicationContext(), "insurePrice", bean.getData().getInsurePrice());
+                    Cooker.save(getApplicationContext(), "actMember", bean.getData().getActMember());
                 }
                 break;
             default:
@@ -228,6 +229,13 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
         if (intent != null && "use_member".equals(intent.getStringExtra("from"))) {
             setCurrent(TYPE_HOME_PAGE);
         }
+        if (intent != null && "traveldetail".equals(intent.getStringExtra("from"))) {
+            setCurrent(TYPE_TRAVEL);
+        }
+
+        if (intent != null && "orderdetail".equals(intent.getStringExtra("from"))) {
+            setCurrent(TYPE_HOME_PAGE);
+        }
     }
 
     /****

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/EffectiveTimeBean.java

@@ -26,6 +26,7 @@ public class EffectiveTimeBean extends BaseBean {
         private float insurePrice;
         private long actRent;
         private long actTour;
+        private long actMember;
 
         public float getInsurePrice() {
             return insurePrice;
@@ -50,5 +51,13 @@ public class EffectiveTimeBean extends BaseBean {
         public void setActTour(long actTour) {
             this.actTour = actTour;
         }
+
+        public long getActMember() {
+            return actMember;
+        }
+
+        public void setActMember(long actMember) {
+            this.actMember = actMember;
+        }
     }
 }

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

 package com.rv.home.rv.module.ui.main.home.order;
 
 import android.annotation.SuppressLint;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -437,6 +438,12 @@ public class MemberOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         @JavascriptInterface
         public void showMore() {
 
+            ComponentName cmn = new ComponentName(getApplicationContext(), "com.rv.member.MemberCenterActivity");
+            Intent intent = new Intent();
+            intent.setComponent(cmn);
+            startActivity(intent);
+            finish();
+
         }
     }
 }

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

@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ClipboardManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -475,7 +476,12 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
 
         @JavascriptInterface
         public void showMore() {
-//            ARouter.getInstance().build().navigation();
+            ComponentName cmn = new ComponentName(getApplicationContext(), "com.xxfc.rv.MainActivity");
+            Intent intent = new Intent();
+            intent.putExtra("from", "orderdetail");
+            intent.setComponent(cmn);
+            startActivity(intent);
+            finish();
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.rv.home.rv.module.ui.main.home.order;
 
 import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -126,13 +127,13 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
         initRxBus();
-         api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
-         dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
-         if (dataBean !=null) {
-             status = dataBean.getStatusX();
-             no = dataBean.getNo();
-             orderAmount = dataBean.getOrderAmount();
-         }
+        api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
+        dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
+        if (dataBean != null) {
+            status = dataBean.getStatusX();
+            no = dataBean.getNo();
+            orderAmount = dataBean.getOrderAmount();
+        }
         /**
          *
          (query)
@@ -240,12 +241,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
                 payShowSelect(no, orderAmount);
                 break;
             case 4:
-                startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity,dataBean));
+                startActivity(GetOnTheCarQRCodeActivity.getIntent(mActivity, dataBean));
                 break;
             case 5:
                 break;
             case 6:
-                startActivityForResult(EvaluationActivity.getIntent(mActivity,dataBean), TYPE_REQUEST_EVALUATION);
+                startActivityForResult(EvaluationActivity.getIntent(mActivity, dataBean), TYPE_REQUEST_EVALUATION);
                 break;
         }
     }
@@ -408,10 +409,9 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
             public void onProgressChanged(WebView view, int newProgress) {
-                if(newProgress==100){
+                if (newProgress == 100) {
                     pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
-                }
-                else{
+                } else {
                     pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
                     pbProgress.setProgress(newProgress);//设置进度值
                 }
@@ -444,7 +444,12 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
 
         @JavascriptInterface
         public void showMore() {
-
+            ComponentName cmn = new ComponentName(getApplicationContext(), "com.xxfc.rv.MainActivity");
+            Intent intent = new Intent();
+            intent.putExtra("from", "traveldetail");
+            intent.setComponent(cmn);
+            startActivity(intent);
+            finish();
         }
     }
 }

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

@@ -94,7 +94,7 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 if (dataBean.getOrderMemberDetail() == null) {
                     return;
                 }
-
+                setTimes(Cooker.getLongValue(mContext, "actMember"), helper, (OrderListBean.DataBeanX.DataBean) item);
                 helper.setText(R.id.tv_order_time, String.format("%1$s%2$s", mContext.getString(R.string.rv_order_time), dataBean.getCrtTime()));
                 helper.loadRoundImage(mContext, dataBean.getPicture(), (ImageView) helper.getView(R.id.iv_goods), 10);
                 helper.setText(R.id.tv_name, dataBean.getName());