确认订单

RvFrame/build.gradle

@@ -53,10 +53,12 @@ android {
 
         api project(path: ':MyFrame')
         api project(path: ':Banner')
+        //api project(path: ':WXPay')
+        api "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:$rootProject.ext.wechatPayVersion"
+
         //适配器
         api "com.github.CymChad:BaseRecyclerViewAdapterHelper:$rootProject.ext.quickAdapterVersion"
-        //微信支付
-        api "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:$rootProject.ext.wechatPayVersion"
+
         //https://github.com/Justson/AgentWeb
         api 'com.just.agentweb:agentweb:4.0.3-beta'
         //api 'com.just.agentweb:filechooser:4.0.3-beta'

RvHome/build.gradle

@@ -24,12 +24,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api "com.android.support:support-v4:$rootProject.ext.supportVersion"
-    api "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
-    api "com.android.support:design:$rootProject.ext.supportVersion"
-    api "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
-    api "com.android.support:cardview-v7:$rootProject.ext.supportVersion"
-    api 'com.android.support.constraint:constraint-layout:1.1.3'
+
     api 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     api project(':RvWrapper')

RvTravel/build.gradle

@@ -41,6 +41,7 @@ android {
         androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
             exclude group: 'com.android.support', module: 'support-annotations'
         })
+        //api project(path: ':WXPay')
         api project(path: ':RvFrame')
         api 'com.jakewharton:butterknife:8.8.1'
         annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

RvTravel/src/main/java/com/rv/travel/TravelActivity.java

@@ -23,6 +23,7 @@ import com.rv.travel.bean.BeanHot;
 import com.rv.travel.bean.BeanTravelMember;
 import com.rv.travel.fragment.TravelFragmentHotType;
 import com.rv.travel.fragment.TravelFragmentMain;
+import com.yuyife.okgo.OkGoUtil;
 
 import java.util.List;
 
@@ -115,6 +116,16 @@ public class TravelActivity extends BaseActivity {
 //            }
 //        });
 
+        //判断Token是否过期
+        ApiUtil.getTravelMember("1", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
+            @Override
+            public void done(List<BeanTravelMember> data, String errorMessage) {
+                if (errorMessage!=null&&data==null){
+                    OkGoUtil.setToken(null);
+                }
+            }
+        });
+
 
     }
 

RvTravel/src/main/java/com/rv/travel/api/ApiUtil.java

@@ -8,6 +8,7 @@ import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
 import com.rv.travel.bean.BeanBanner;
 import com.rv.travel.bean.BeanHot;
+import com.rv.travel.bean.BeanOrderResponse;
 import com.rv.travel.bean.BeanRim;
 import com.rv.travel.bean.BeanTravelMember;
 import com.rv.travel.bean.BeanTravelMoneyDetail;
@@ -430,12 +431,12 @@ public class ApiUtil {
             String endAddr,
             String endTime,
             String goodId,
-            String myPassagerIds,
+            String tourUserIds,
             String spePriceId,
             String startAddr,
             String startCompanyId,
             String startTime,
-            final OnApiResponseCallback<Boolean, String> callback) {
+            final OnApiResponseCallback<BeanOrderResponse, String> callback) {
         Map<String, String> map = new HashMap<>();
         map.put("contactEmail", contactEmail);
         map.put("contactMan", contactMan);
@@ -443,7 +444,7 @@ public class ApiUtil {
         map.put("endAddr", endAddr);
         map.put("endTime", endTime);
         map.put("goodId", goodId);
-        map.put("myPassagerIds", myPassagerIds);
+        map.put("tourUserIds", tourUserIds);
         map.put("spePriceId", spePriceId);
         map.put("startAddr", startAddr);
         map.put("startCompanyId", startCompanyId);
@@ -458,15 +459,21 @@ public class ApiUtil {
                 if (callback == null) return;
                 String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
                 if (status == null) {
-                    callback.done(false, ApiKey.ERROR_NO_STATUS);
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
                     return;
                 }
                 if (!status.equals(ApiKey.STATUS_200)) {
-                    callback.done(false, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
                     return;
                 }
 
-
+                JSONObject data = OkGoUtil.getJsonObjectToJson(response.body(), ApiKey.DATA);
+                BeanOrderResponse bean = null;
+                if (data != null) {
+                    bean = new Gson().fromJson(data.toString(), new TypeToken<BeanOrderResponse>() {
+                    }.getType());
+                }
+                callback.done(bean, null);
             }
 
             @Override
@@ -475,7 +482,7 @@ public class ApiUtil {
                 LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.body());
                 LogUtil.e(ApiUtil.class, "onError commitOrder:" + response.message());
                 if (callback != null) {
-                    callback.done(false, response.message());
+                    callback.done(null, response.message());
                 }
             }
         });

RvTravel/src/main/java/com/rv/travel/bean/BeanOrderResponse.java

+package com.rv.travel.bean;
+
+public class BeanOrderResponse {
+    private String id;//381,
+    private String no;//"20190612111223010014",
+    private String type;//2,
+    private String detailId;//14,
+    private String status;//3,
+    private String goodsAmount;//1380,
+    private String orderAmount;//1380,
+    private String realAmount;//880,
+    private String userId;//27,
+    private String picture;//"https://xxtest.upyuns.com/image/app/ENRq748FQTq86R8R77J88YEWhnPeZ3.png",
+    private String name;//"04-05号 惠州长荣大观园2日游",
+    private String crtTime;//"2019-06-12 11:12:23",
+    private String crtUser;//"27",
+    private String crtName;//"13612688539",
+    private String crtHost;//"116.4.96.152",
+    private String updTime;//"2019-06-12 11:12:23",
+    private String updUser;//"27",
+    private String updName;//"13612688539",
+    private String updHost;//"116.4.96.152"
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getGoodsAmount() {
+        return goodsAmount;
+    }
+
+    public void setGoodsAmount(String goodsAmount) {
+        this.goodsAmount = goodsAmount;
+    }
+
+    public String getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(String orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public String getRealAmount() {
+        return realAmount;
+    }
+
+    public void setRealAmount(String realAmount) {
+        this.realAmount = realAmount;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPicture() {
+        return picture;
+    }
+
+    public void setPicture(String picture) {
+        this.picture = picture;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCrtTime() {
+        return crtTime;
+    }
+
+    public void setCrtTime(String crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    public String getCrtUser() {
+        return crtUser;
+    }
+
+    public void setCrtUser(String crtUser) {
+        this.crtUser = crtUser;
+    }
+
+    public String getCrtName() {
+        return crtName;
+    }
+
+    public void setCrtName(String crtName) {
+        this.crtName = crtName;
+    }
+
+    public String getCrtHost() {
+        return crtHost;
+    }
+
+    public void setCrtHost(String crtHost) {
+        this.crtHost = crtHost;
+    }
+
+    public String getUpdTime() {
+        return updTime;
+    }
+
+    public void setUpdTime(String updTime) {
+        this.updTime = updTime;
+    }
+
+    public String getUpdUser() {
+        return updUser;
+    }
+
+    public void setUpdUser(String updUser) {
+        this.updUser = updUser;
+    }
+
+    public String getUpdName() {
+        return updName;
+    }
+
+    public void setUpdName(String updName) {
+        this.updName = updName;
+    }
+
+    public String getUpdHost() {
+        return updHost;
+    }
+
+    public void setUpdHost(String updHost) {
+        this.updHost = updHost;
+    }
+
+}

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

@@ -5,8 +5,7 @@ import android.webkit.JavascriptInterface;
 import com.rv.travel.GoOtherUtil;
 
 /**
- * Created by cenxiaozhong on 2017/5/14.
- * source code  https://github.com/Justson/AgentWeb
+ * Js调用Android 是在子线程完成的
  */
 
 public class AndroidInterface {
@@ -25,8 +24,6 @@ public class AndroidInterface {
 
     @JavascriptInterface
     public void readyOrder(String orderJson) {
-
-        //travelWebFragment.showToastLong("readyOrder:" + orderJson);
         GoOtherUtil.goTravelCommitOrder(orderJson, travelWebFragment.getActivity());
 
     }

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

@@ -25,6 +25,7 @@ import com.rv.travel.adapter.AdapterTravelMember;
 import com.rv.travel.api.ApiUtil;
 import com.rv.travel.api.OnApiResponseCallback;
 import com.rv.travel.bean.BeanOrderParam;
+import com.rv.travel.bean.BeanOrderResponse;
 import com.rv.travel.bean.BeanTravelMember;
 import com.rv.travel.bean.BeanTravelMoneyDetail;
 import com.rv.travel.dialog.TravelDialogUtil;
@@ -63,18 +64,22 @@ public class TravelFragmentCommitOrder extends BaseFragment {
                 beanOrderParam.getStartAddr(),
                 beanOrderParam.getStartCompanyId(),
                 "" + com.base.utils.tools.java.DateUtil.getDateByYYYYMMDD_java(beanOrderParam.getStartTime()),
-                new OnApiResponseCallback<Boolean, String>() {
+                new OnApiResponseCallback<BeanOrderResponse, String>() {
                     @Override
-                    public void done(Boolean data, String errorMessage) {
-
-                        showSweetSuccessDialogAndDelayClose("ok");
-                        FrameApp.getMainHandler().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (getActivity() != null)
-                                    getActivity().finish();
-                            }
-                        }, 1200);
+                    public void done(BeanOrderResponse data, String errorMessage) {
+                        dismissSweetDialog();
+                        if (data != null) {
+                            showSweetSuccessDialogAndDelayClose("ok");
+                            FrameApp.getMainHandler().postDelayed(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (getActivity() != null)
+                                        getActivity().finish();
+                                }
+                            }, 1200);
+                        } else {
+                            showSweetErrorDialog(errorMessage);
+                        }
                     }
                 }
 
@@ -326,9 +331,13 @@ public class TravelFragmentCommitOrder extends BaseFragment {
                 public void onItemRootClick(final BeanTravelMember bean) {
                     final List<BeanTravelMember> data = new ArrayList<>();
                     if (bean.getIsChild().equals("0")) {
-                        data.addAll(dataAdult);
+                        if (dataAdult != null) {
+                            data.addAll(dataAdult);
+                        }
                     } else {
-                        data.addAll(dataChild);
+                        if (dataChild != null) {
+                            data.addAll(dataChild);
+                        }
                     }
 
                     TravelDialogUtil.showSelectTravel(baseContext, data, new TravelDialogUtil.OnDialogDoneCallback<BeanTravelMember>() {

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

@@ -11,10 +11,13 @@ import android.widget.LinearLayout;
 
 import com.base.utils.base.BaseFragment;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.frame.base.FrameApp;
 import com.frame.rv.ModuleChangeUtil;
 import com.just.agentweb.AgentWeb;
 import com.rv.travel.R;
 import com.rv.travel.R2;
+import com.rv.travel.TravelActivity;
+import com.rv.travel.other.TravelFragmentActivity;
 import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
@@ -33,17 +36,23 @@ public class TravelWebFragment extends BaseFragment {
     private String URL_ADDRESS = "";
     @BindView(R2.id.travel_web_fragment_root)
     FrameLayout rootLayout;
-    @BindView(R2.id.travel_web_button_layout)
-    LinearLayout buttonLayout;
 
+    LinearLayout buttonLayout;
     public void showButtonLayout() {
-        buttonLayout.setVisibility(View.VISIBLE);
+        FrameApp.getMainHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                buttonLayout.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_web, container, false);
+        buttonLayout = view.findViewById(R.id.travel_web_button_layout);
+
         unbinder = ButterKnife.bind(this, view);
         view.findViewById(R.id.travel_web_service_button).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -61,7 +70,7 @@ public class TravelWebFragment extends BaseFragment {
                     }
                     return;
                 }
-                //buttonLayout.setVisibility(View.INVISIBLE);
+                buttonLayout.setVisibility(View.GONE);
                 mAgentWeb.getJsAccessEntrace().quickCallJs("openModal");
             }
         });

RvTravel/src/main/java/com/rv/travel/other/TravelFragmentActivity.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.view.View;
+import android.widget.Button;
 
 import com.base.utils.base.BaseActivity;
 import com.base.utils.ui.datetime.selector.util.TextUtil;

RvTravel/src/main/res/layout/fragment_web.xml

 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/colorBottom">
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/travel_web_fragment_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/_ui_height_h3" />
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        />
 
 
     <LinearLayout
@@ -59,4 +62,4 @@
 
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

settings.gradle

+//include ':WXPay'
 include ':RvFrame'
 include ':RvTravel'
 include ':RvClient'