移动依赖库，出游人交互，费用明细开发、确认订单

RvClient/src/main/AndroidManifest.xml

@@ -148,13 +148,13 @@
         <!-- umShare 相关 start -->
         <!-- WeiXin callback -->
         <activity
-            android:name="com.rv.home.wxapi.WXEntryActivity"
+            android:name="com.rv.home.rv.wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
-            android:name="com.rv.home.wxapi.WXPayEntryActivity"
+            android:name="com.rv.home.rv.wxapi.WXPayEntryActivity"
             android:exported="true"
             android:launchMode="singleTop" />
         <!-- QQ callback -->

RvClient/src/main/java/com/test/rv/ModuleUtil.java

@@ -4,6 +4,7 @@ import com.base.utils.tools.android.IntentUtil;
 import com.frame.base.FrameApp;
 import com.frame.rv.ModuleChangeUtil;
 import com.frame.rv.OnModuleChangedListener;
+import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.HomeActivity;
 import com.rv.rvmine.MineActivity;
 import com.rv.travel.TravelActivity;
@@ -61,6 +62,11 @@ public class ModuleUtil {
             public void onClear() {
                 currentModule = -1;
             }
+
+            @Override
+            public void onLogin() {
+                FrameApp.getInstance().startActivity(LoginRvActivity.getIntent(FrameApp.getInstance()));
+            }
         });
     }
 }

RvFrame/build.gradle

@@ -33,7 +33,11 @@ android {
             }
         }
     }
-
+    sourceSets {
+        main {
+            jniLibs.srcDir 'libs'
+        }
+    }
 
     dependencies {
         api fileTree(include: ['*.jar'], dir: 'libs')
@@ -57,5 +61,18 @@ android {
         api 'com.just.agentweb:agentweb:4.0.3-beta'
         //api 'com.just.agentweb:filechooser:4.0.3-beta'
         //api 'com.just.agentweb:download:4.0.3-beta'
+
+
+        //百度定位
+        api files('libs/BaiduLBS_Android.jar')
+        //bugly
+        api files('libs/bugly_crash_release.jar')
+        //友盟
+        api files('libs/umeng-common-2.0.2.jar')
+        api files('libs/umeng-share-core-6.9.4.jar')
+        api files('libs/umeng-share-QQ-simplify-6.9.4.jar')
+        api files('libs/umeng-share-wechat-simplify-6.9.4.jar')
+        api files('libs/umeng-shareboard-widget-6.9.4.jar')
+        api files('libs/umeng-sharetool-6.9.4.jar')
     }
 }

RvFrame/src/main/java/com/frame/rv/BaseTabLayout.java

@@ -70,7 +70,7 @@ public class BaseTabLayout extends FrameLayout {
 
 
     private void init(Context context) {
-        View view = LayoutInflater.from(context).inflate(R.layout.base_tab_layout, this, true);
+        View view = LayoutInflater.from(context).inflate(R.layout.layout_tab, this, true);
         tvHome = view.findViewById(R.id.tv_home);
         tvTravel = view.findViewById(R.id.tv_travel);
         tvCamp = view.findViewById(R.id.tv_camp);

RvFrame/src/main/java/com/frame/rv/BaseTitleBarLayout.java

@@ -32,7 +32,7 @@ public class BaseTitleBarLayout extends RelativeLayout {
 
     private void init(Context context) {
 
-        View view = LayoutInflater.from(context).inflate(R.layout.layout_title_bar, this, true);
+        View view = LayoutInflater.from(context).inflate(R.layout.layout_title, this, true);
         backImageView = view.findViewById(R.id.title_bar_back_image_view);
         titleTextView = view.findViewById(R.id.title_bar_text_view);
         buttonView = view.findViewById(R.id.title_bar_button_view);

RvFrame/src/main/java/com/frame/rv/OnModuleChangedListener.java

@@ -6,6 +6,13 @@ public interface OnModuleChangedListener {
     int MODULE_CAMP = 2;
     int MODULE_FIND = 3;
     int MODULE_MINE = 4;
+
+    //模块切换
     void onChanged(int module);
+
+    //当前模块首页的Activity被销毁
     void onClear();
+
+    //需要登录
+    void onLogin();
 }

RvFrame/src/main/res/layout/layout_tips.xml

@@ -9,8 +9,8 @@
         android:id="@+id/tips_progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp" />
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
 
 
     <ImageView

RvHome/src/main/java/com/rv/home/wxapi/WXEntryActivity.java → RvHome/src/main/java/com/rv/home/rv/wxapi/WXEntryActivity.java

-package com.rv.home.wxapi;
-
+package com.rv.home.rv.wxapi;
 
 
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
@@ -7,5 +6,4 @@ import com.umeng.socialize.weixin.view.WXCallbackActivity;
 public class WXEntryActivity extends WXCallbackActivity {
 
 
-
 }

RvHome/src/main/java/com/rv/home/wxapi/WXPayEntryActivity.java → RvHome/src/main/java/com/rv/home/rv/wxapi/WXPayEntryActivity.java

-package com.rv.home.wxapi;
+package com.rv.home.rv.wxapi;
 
 
 import android.content.Intent;

RvHome/src/main/res/layout/rv_act_home.xml

@@ -15,6 +15,6 @@
         android:layout_weight="1"
         android:background="#ffffff" />
 
-    <include layout="@layout/base_tab_layout" />
+    <include layout="@layout/layout_tab" />
 
 </LinearLayout>

RvTravel/src/main/java/com/rv/travel/adapter/AdapterTravelMember.java

@@ -6,6 +6,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.rv.travel.R;
@@ -47,7 +48,6 @@ public class AdapterTravelMember extends BaseQuickAdapter<BeanTravelMember, Adap
             }
         });
         helper.deleteView.setTag(item);
-
         helper.deleteView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -57,6 +57,21 @@ public class AdapterTravelMember extends BaseQuickAdapter<BeanTravelMember, Adap
                 }
             }
         });
+
+        if (item.getIsChild().equals("0")) {
+            helper.isChildView.setText("成人");
+        } else {
+            helper.isChildView.setText("儿童");
+        }
+
+        helper.mobileView.setText(item.getPhone());
+        helper.nameView.setText(item.getName());
+        if (TextUtil.isEmpty(item.getIdCard())) {
+            helper.idCardTipView.setVisibility(View.INVISIBLE);
+        } else {
+            helper.idCardTipView.setVisibility(View.VISIBLE);
+        }
+        helper.idCardView.setText(item.getIdCard());
     }
 
     public class AdapterViewHolder extends BaseViewHolder {
@@ -67,6 +82,8 @@ public class AdapterTravelMember extends BaseQuickAdapter<BeanTravelMember, Adap
         TextView nameView;
         TextView mobileView;
         TextView idCardView;
+        TextView idCardTipView;
+        TextView isChildView;
 
         public AdapterViewHolder(View view) {
             super(view);
@@ -75,6 +92,8 @@ public class AdapterTravelMember extends BaseQuickAdapter<BeanTravelMember, Adap
             nameView = view.findViewById(R.id.item_travel_member_name);
             mobileView = view.findViewById(R.id.item_travel_member_mobile);
             idCardView = view.findViewById(R.id.item_travel_member_id_card);
+            idCardTipView = view.findViewById(R.id.item_travel_member_id_card_tip);
+            isChildView = view.findViewById(R.id.item_travel_member_is_child);
         }
     }
 }

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

@@ -10,6 +10,7 @@ import com.rv.travel.bean.BeanBanner;
 import com.rv.travel.bean.BeanHot;
 import com.rv.travel.bean.BeanRim;
 import com.rv.travel.bean.BeanTravelMember;
+import com.rv.travel.bean.BeanTravelMoneyDetail;
 import com.yuyife.okgo.OkGoUtil;
 
 import org.json.JSONArray;
@@ -362,6 +363,65 @@ public class ApiUtil {
         });
     }
 
+    //获取费用明显 goodId=37&spePriceId=109&tourUserIds=4,5
+//    商品id	goodId	int		是
+//    具体商品（商品项）id	spePriceId	string		是
+//    成人数量 adultNum
+//    儿童数量 childNum
+    public static void getTravelMoneyDetail(
+            String goodId,
+            String spePriceId,
+            String adultNum,
+            String childNum,
+            final OnApiResponseCallback<BeanTravelMoneyDetail, String> callback) {
+        Map<String, String> map = new HashMap<>();
+        map.put("goodId", goodId);
+        map.put("spePriceId", spePriceId);
+        map.put("number", adultNum);
+        map.put("childNumber", childNum);
+
+        String url = TravelApi.QUERY_TRAVEL_MONEY_DETAIL;
+        OkGoUtil.getMap(url, map, new StringCallback() {
+            @Override
+            public void onSuccess(Response<String> response) {
+
+                LogUtil.e(ApiUtil.class, "onSuccess getTravelMoneyDetail:" + response.body());
+
+                if (callback == null) return;
+                String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
+                if (status == null) {
+                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    return;
+                }
+                if (!status.equals(ApiKey.STATUS_200)) {
+                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    return;
+                }
+
+                JSONObject data = OkGoUtil.getJsonObjectToJson(response.body(), ApiKey.DATA);
+                BeanTravelMoneyDetail bean = null;
+                if (data != null) {
+                    bean = new Gson().fromJson(data.toString(), new TypeToken<BeanTravelMoneyDetail>() {
+                    }.getType());
+
+
+                }
+                callback.done(bean, null);
+
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                LogUtil.e(ApiUtil.class, "onError getTravelMoneyDetail:" + response.body());
+                LogUtil.e(ApiUtil.class, "onError getTravelMoneyDetail:" + response.message());
+                if (callback != null) {
+                    callback.done(null, response.message());
+                }
+            }
+        });
+    }
+
     //确认下单
     public static void commitOrder(
             String contactEmail,
@@ -371,12 +431,11 @@ public class ApiUtil {
             String endTime,
             String goodId,
             String myPassagerIds,
-            String speIds,
             String spePriceId,
             String startAddr,
             String startCompanyId,
             String startTime,
-            final OnApiResponseCallback<List<Boolean>, String> callback) {
+            final OnApiResponseCallback<Boolean, String> callback) {
         Map<String, String> map = new HashMap<>();
         map.put("contactEmail", contactEmail);
         map.put("contactMan", contactMan);
@@ -385,13 +444,12 @@ public class ApiUtil {
         map.put("endTime", endTime);
         map.put("goodId", goodId);
         map.put("myPassagerIds", myPassagerIds);
-        map.put("speIds", speIds);
         map.put("spePriceId", spePriceId);
         map.put("startAddr", startAddr);
         map.put("startCompanyId", startCompanyId);
         map.put("startTime", startTime);
         String url = TravelApi.COMMIT_ORDER;
-        OkGoUtil.getMap(url, map, new StringCallback() {
+        OkGoUtil.postJson(url, map, new StringCallback() {
             @Override
             public void onSuccess(Response<String> response) {
 
@@ -400,11 +458,11 @@ public class ApiUtil {
                 if (callback == null) return;
                 String status = OkGoUtil.getStringToJson(response.body(), ApiKey.STATUS);
                 if (status == null) {
-                    callback.done(null, ApiKey.ERROR_NO_STATUS);
+                    callback.done(false, ApiKey.ERROR_NO_STATUS);
                     return;
                 }
                 if (!status.equals(ApiKey.STATUS_200)) {
-                    callback.done(null, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
+                    callback.done(false, ApiKey.ERROR_PREFIX + "--status" + status + "--message" + OkGoUtil.getStringToJson(response.body(), ApiKey.MESSAGE));
                     return;
                 }
 
@@ -417,7 +475,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(null, response.message());
+                    callback.done(false, response.message());
                 }
             }
         });

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

@@ -18,4 +18,6 @@ public interface TravelApi extends RvFrameConfig {
     String QUERY_TRAVEL_MEMBER = HOST + "/api/tour/tourUser/app/unauth/getTourUser/";
     //确认下单
     String COMMIT_ORDER = HOST + "/api/order/orderTour/add";
+    //查费用明细
+    String QUERY_TRAVEL_MONEY_DETAIL = HOST + "/api/order/orderTour/calculate-price";
 }

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

 package com.rv.travel.bean;
 
 public class BeanOrderParam {
+    public String getGoodId() {
+        return goodId;
+    }
+
+    public void setGoodId(String goodId) {
+        this.goodId = goodId;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getChildPrice() {
+        return childPrice;
+    }
+
+    public void setChildPrice(String childPrice) {
+        this.childPrice = childPrice;
+    }
+
+    public String getSpePriceId() {
+        return spePriceId;
+    }
+
+    public void setSpePriceId(String spePriceId) {
+        this.spePriceId = spePriceId;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    private String endTime;//1,
+    private String goodId;//1,
+    private String price;//成人价格
+    private String childPrice;//儿童价格
+    private String spePriceId;//具体商品id
     private String adultNum;//1,
     private String childNum;//0,
     private String time;//"2019-06-20周四~2019-06-22周六",

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

 package com.rv.travel.bean;
 
 public class BeanTravelMember {
-    public BeanTravelMember(String name, String id) {
-        this.name = name;
-        this.id = id;
-    }
+
 
     private String id;//5,
     private String userid;//14,
@@ -15,7 +12,7 @@ public class BeanTravelMember {
     private String crtTime;//1558754042768,
     private String updTime;//1558766256489,
     private String isdel;//0,
-    private String isChild;//1
+    private String isChild;//0大人 1儿童
 
     public String getId() {
         return id;

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

+package com.rv.travel.bean;
+
+public class BeanTravelMoneyDetail {
+
+    private String orderAmount;//1380,
+    private String goodsAmount;//1380,
+    private String realAmount;//880,
+    private String costDetail;//"{"key;//"费用明细","val;//"","children;//[{"key;//"成人价格","detail;//"￥880.00/人×1人","val;//"￥880.00"}]}",
+    private String number;//1,
+    private String childNumber;//0,
+    private String price;//880,
+    private String totalPrice;//880,
+    private String realPrice;//880,
+    private String childPrice;//500,
+    private String totalChildPrice;//0,
+    private String realChildPrice;//0
+
+    public String getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(String orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public String getGoodsAmount() {
+        return goodsAmount;
+    }
+
+    public void setGoodsAmount(String goodsAmount) {
+        this.goodsAmount = goodsAmount;
+    }
+
+    public String getRealAmount() {
+        return realAmount;
+    }
+
+    public void setRealAmount(String realAmount) {
+        this.realAmount = realAmount;
+    }
+
+    public String getCostDetail() {
+        return costDetail;
+    }
+
+    public void setCostDetail(String costDetail) {
+        this.costDetail = costDetail;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getChildNumber() {
+        return childNumber;
+    }
+
+    public void setChildNumber(String childNumber) {
+        this.childNumber = childNumber;
+    }
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(String totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public String getRealPrice() {
+        return realPrice;
+    }
+
+    public void setRealPrice(String realPrice) {
+        this.realPrice = realPrice;
+    }
+
+    public String getChildPrice() {
+        return childPrice;
+    }
+
+    public void setChildPrice(String childPrice) {
+        this.childPrice = childPrice;
+    }
+
+    public String getTotalChildPrice() {
+        return totalChildPrice;
+    }
+
+    public void setTotalChildPrice(String totalChildPrice) {
+        this.totalChildPrice = totalChildPrice;
+    }
+
+    public String getRealChildPrice() {
+        return realChildPrice;
+    }
+
+    public void setRealChildPrice(String realChildPrice) {
+        this.realChildPrice = realChildPrice;
+    }
+
+
+}

RvTravel/src/main/java/com/rv/travel/dialog/TravelDialogUtil.java

@@ -6,13 +6,17 @@ import android.content.DialogInterface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.base.utils.ui.dialog.DialogPlusUtil;
 import com.base.utils.ui.dialog.DialogUtil;
 import com.frame.base.FrameApp;
 import com.orhanobut.dialogplus.DialogPlus;
 import com.rv.travel.R;
 import com.rv.travel.bean.BeanTravelMember;
+import com.rv.travel.bean.BeanTravelMoneyDetail;
+import com.rv.travel.fragment.TravelFragmentCommitOrder;
 
 import java.util.List;
 
@@ -28,7 +32,7 @@ public class TravelDialogUtil {
         final String[] items;
 
         if (data == null || data.size() == 0) {
-            items = new String[]{"无"};
+            items = new String[]{"无,去添加！"};
         } else {
             items = new String[data.size()];
             int i = 0;
@@ -45,6 +49,8 @@ public class TravelDialogUtil {
                 if (callback != null) {
                     if (data != null && data.size() > 0) {
                         callback.done(data.get(which));
+                    } else {
+                        callback.done(null);
                     }
                 }
 
@@ -52,11 +58,42 @@ public class TravelDialogUtil {
         }).setTitle("选择出游人").create().show();
     }
 
-    public static void showCommitOrderMoneyDetail(final Context context) {
-        View dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_order_money_detail, null);
-        TravelDialogUtil.mDialogPlus = DialogPlusUtil.getDialogPlus(context, dialogView)
+    public static void showCommitOrderMoneyDetail(final TravelFragmentCommitOrder travelFragmentCommitOrder) {
+        BeanTravelMoneyDetail moneyDetail = travelFragmentCommitOrder.getMoneyDetailBean();
+        if (moneyDetail == null) {
+            travelFragmentCommitOrder.showToastShort("明细数据为空");
+            return;
+        }
+        View dialogView = LayoutInflater.from(travelFragmentCommitOrder.getContext()).inflate(R.layout.dialog_order_money_detail, null);
+        TravelDialogUtil.mDialogPlus = DialogPlusUtil.getDialogPlus(travelFragmentCommitOrder.getContext(), dialogView)
                 .create();
         TravelDialogUtil.mDialogPlus.show();
+        TextView moneyText = dialogView.findViewById(R.id.commit_order_money_detail_money_text);
+
+        TextView adultDesText = dialogView.findViewById(R.id.commit_order_money_detail_adult_des_text);
+        TextView childDesText = dialogView.findViewById(R.id.commit_order_money_detail_child_des_text);
+        TextView adultTotalText = dialogView.findViewById(R.id.commit_order_money_detail_adult_total_money_text);
+        TextView childTotalText = dialogView.findViewById(R.id.commit_order_money_detail_child_total_money_text);
+        //订单价格
+        //moneyText.setText(moneyDetail.getOrderAmount());
+        moneyText.setText(moneyDetail.getRealAmount());
+        //大人总价格
+        if (TextUtil.isEmpty(moneyDetail.getNumber())||moneyDetail.getNumber().equals("0")){
+            adultTotalText.setText("0");
+            adultDesText.setText("0");
+        }else {
+            adultTotalText.setText(moneyDetail.getTotalPrice());
+            adultDesText.setText(moneyDetail.getPrice() + "/" + moneyDetail.getNumber());
+        }
+        //儿童总价格
+        if (TextUtil.isEmpty(moneyDetail.getChildNumber())||moneyDetail.getChildNumber().equals("0")){
+            childTotalText.setText("0");
+            childDesText.setText("0");
+        }else {
+            childTotalText.setText(moneyDetail.getTotalChildPrice());
+            childDesText.setText(moneyDetail.getChildPrice() + "/" + moneyDetail.getChildNumber());
+        }
+
         dialogView.findViewById(R.id.money_detail_close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -71,12 +108,7 @@ public class TravelDialogUtil {
                 FrameApp.getMainHandler().postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        showPaySelectDialog(context, new OnDialogDoneCallback<Boolean>() {
-                            @Override
-                            public void done(Boolean aBoolean) {
-
-                            }
-                        });
+                        travelFragmentCommitOrder.commit();
                     }
                 }, 600);
             }
@@ -98,13 +130,15 @@ public class TravelDialogUtil {
 
 
     //选择支付
-    public static void showPaySelectDialog(Context context, final OnDialogDoneCallback<Boolean> listener) {
+    public static void showPaySelectDialog(Context context, String price, final OnDialogDoneCallback<Boolean> listener) {
         isPayWx = true;
         dismissDialogPlus();
         View dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_order_select_pay, null);
         TravelDialogUtil.mDialogPlus = DialogPlusUtil.getDialogPlus(context, dialogView)
                 .create();
         TravelDialogUtil.mDialogPlus.show();
+        final TextView priceView = dialogView.findViewById(R.id.select_pay_price);
+        priceView.setText(price);
         final ImageView payWx = dialogView.findViewById(R.id.select_pay_wx);
         final ImageView payZfb = dialogView.findViewById(R.id.select_pay_zfb);
         payWx.setOnClickListener(new View.OnClickListener() {

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

@@ -9,10 +9,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.LogUtil;
+import com.base.utils.tools.android.VerifyUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.frame.base.FrameApp;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.rv.travel.R;
@@ -22,6 +26,7 @@ import com.rv.travel.api.ApiUtil;
 import com.rv.travel.api.OnApiResponseCallback;
 import com.rv.travel.bean.BeanOrderParam;
 import com.rv.travel.bean.BeanTravelMember;
+import com.rv.travel.bean.BeanTravelMoneyDetail;
 import com.rv.travel.dialog.TravelDialogUtil;
 
 import java.util.ArrayList;
@@ -34,12 +39,97 @@ import butterknife.Unbinder;
 
 //确认下单
 public class TravelFragmentCommitOrder extends BaseFragment {
+    public void commit() {
+        if (!judge()) {
+            return;
+        }
+
+        showSweetProgressDialog("请稍等");
+        List<String> idList = new ArrayList<>();
+
+        for (BeanTravelMember bean : selectData) {
+            idList.add(bean.getId());
+        }
+        String ids = idList.toString().replace("[", "").replace("]", "");
+        ApiUtil.commitOrder(
+                emailInput.getText().toString(),
+                nameInput.getText().toString(),
+                mobileInput.getText().toString(),
+                beanOrderParam.getEndAddr(),
+                "" + com.base.utils.tools.java.DateUtil.getDateByYYYYMMDD_java(beanOrderParam.getEndTime()),
+                beanOrderParam.getGoodId(),
+                ids,
+                beanOrderParam.getSpePriceId(),
+                beanOrderParam.getStartAddr(),
+                beanOrderParam.getStartCompanyId(),
+                "" + com.base.utils.tools.java.DateUtil.getDateByYYYYMMDD_java(beanOrderParam.getStartTime()),
+                new OnApiResponseCallback<Boolean, 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);
+                    }
+                }
+
+
+        );
+    }
+
+    private boolean judge() {
+        if (TextUtil.isEmpty(nameInput.getText().toString())) {
+            showToastShort("请输入联系人姓名");
+            return false;
+
+        }
+        if (TextUtil.isEmpty(mobileInput.getText().toString())) {
+            showToastShort("请输入联系人手机");
+            return false;
+
+        }
+        if (!VerifyUtil.isValidMobileNumber(mobileInput.getText().toString())) {
+            showToastShort("请输入正确的联系人手机");
+            return false;
+
+        }
+
+        int count = adultNum + childNum;
+        if (count == 0) {
+            showToastShort("没有选择出游人");
+            return false;
+
+        }
+        for (int i = 0; i < selectData.size(); i++) {
+            if (!TextUtil.isEmpty(selectData.get(i).getId())) {
+                count -= 1;
+            }
+        }
+        if (count != 0) {
+            showToastShort("请选择成员");
+            return false;
+
+        }
+
+        if (!commitCheck.isChecked()) {
+            showToastShort("请勾选同意须知和《合同协议》");
+            return false;
+        }
+
+        return true;
+    }
 
     private BeanOrderParam beanOrderParam;
+
     public static TravelFragmentCommitOrder getInstance(String orderJson) {
         TravelFragmentCommitOrder instance = new TravelFragmentCommitOrder();
-        LogUtil.e(TravelFragmentCommitOrder.class,"orderJson:"+orderJson);
-        if (!TextUtil.isEmpty(orderJson)){
+        LogUtil.e(TravelFragmentCommitOrder.class, "orderJson:" + orderJson);
+        if (!TextUtil.isEmpty(orderJson)) {
             instance.beanOrderParam = new Gson().fromJson(orderJson,
                     new TypeToken<BeanOrderParam>() {
                     }.getType());
@@ -51,6 +141,24 @@ public class TravelFragmentCommitOrder extends BaseFragment {
     CheckBox commitCheck;
     @BindView(R2.id.commit_order_member_recycler)
     RecyclerView memberRecycler;
+    @BindView(R2.id.commit_order_name_input)
+    EditText nameInput;
+    @BindView(R2.id.commit_order_mobile_input)
+    EditText mobileInput;
+    @BindView(R2.id.commit_order_email_input)
+    EditText emailInput;
+    @BindView(R2.id.commit_order_company)
+    TextView companyText;
+    @BindView(R2.id.commit_order_company_address)
+    TextView companyAddressText;
+    @BindView(R2.id.commit_order_aim_address)
+    TextView aimText;
+    @BindView(R2.id.commit_order_time)
+    TextView timeText;
+    @BindView(R2.id.commit_order_member_count)
+    TextView memberCountText;
+    @BindView(R2.id.commit_order_money)
+    TextView moneyText;
 
     @OnClick({
             R2.id.commit_order_agree,
@@ -63,34 +171,32 @@ public class TravelFragmentCommitOrder extends BaseFragment {
         int id = view.getId();
         if (id == R.id.commit_order_agree) {
             //合同协议
+            showToastShort("查看合同");
         } else if (id == R.id.commit_order_button) {
+
+            if (!judge()) {
+                return;
+            }
             //提交订单
-            TravelDialogUtil.showPaySelectDialog(baseContext, new TravelDialogUtil.OnDialogDoneCallback<Boolean>() {
+            TravelDialogUtil.showPaySelectDialog(baseContext, moneyText.getText().toString(), new TravelDialogUtil.OnDialogDoneCallback<Boolean>() {
                 @Override
                 public void done(Boolean aBoolean) {
-
+                    if (aBoolean) {
+                        //微信支付
+                    } else {
+                        //支付宝支付
+                    }
+                    commit();
                 }
             });
         } else if (id == R.id.commit_order_money_detail) {
+
             //费用明细
-            TravelDialogUtil.showCommitOrderMoneyDetail(baseContext);
+            TravelDialogUtil.showCommitOrderMoneyDetail(TravelFragmentCommitOrder.this);
+
         } else if (id == R.id.commit_order_select_member_text || id == R.id.commit_order_select_member_icon) {
             //选人员
-            List<BeanTravelMember> data = new ArrayList<>();
-            data.add(new BeanTravelMember("张3", "0"));
-            data.add(new BeanTravelMember("张4", "1"));
-            data.add(new BeanTravelMember("张5", "2"));
 
-            TravelDialogUtil.showSelectTravel(baseContext, data, new TravelDialogUtil.OnDialogDoneCallback<BeanTravelMember>() {
-                @Override
-                public void done(BeanTravelMember beanTravelMember) {
-                    if (selectData.contains(beanTravelMember)) {
-                        return;
-                    }
-                    selectData.add(beanTravelMember);
-                    adapterTravelMember.setNewData(selectData);
-                }
-            });
         }
     }
 
@@ -112,39 +218,54 @@ public class TravelFragmentCommitOrder extends BaseFragment {
         onView();
     }
 
-    private AdapterTravelMember adapterTravelMember;
-    private List<BeanTravelMember> selectData = new ArrayList<>();
 
     @Override
     public void onData() {
-        adapterTravelMember = new AdapterTravelMember(R.layout.item_travel_member, selectData);
-        adapterTravelMember.setItemRootClickListener(new AdapterTravelMember.OnItemAllClickListener() {
-            @Override
-            public void onItemRootClick(final BeanTravelMember bean) {
 
     }
 
     @Override
-            public void onItemDeleteClick(BeanTravelMember bean) {
+    public void onView() {
 
-                selectData.remove(bean);
-                adapterTravelMember.setNewData(selectData);
+        getMember();
+
+        setOrderParam();
     }
-        });
-        memberRecycler.setLayoutManager(new LinearLayoutManager(baseContext));
-        memberRecycler.setAdapter(adapterTravelMember);
 
+    private BeanTravelMoneyDetail moneyDetail;
+
+    public BeanTravelMoneyDetail getMoneyDetailBean() {
+        return moneyDetail;
     }
 
+    private void getMoneyDetail() {
+
+        ApiUtil.getTravelMoneyDetail(
+                beanOrderParam.getGoodId(),
+                beanOrderParam.getSpePriceId(),
+                beanOrderParam.getAdultNum(),
+                beanOrderParam.getChildNum(),
+                new OnApiResponseCallback<BeanTravelMoneyDetail, String>() {
                     @Override
-    public void onView() {
+                    public void done(BeanTravelMoneyDetail data, String errorMessage) {
+                        moneyDetail = data;
+                        if (moneyDetail != null) {
+                            //float money = Float.valueOf(moneyDetail.getOrderAmount());
+                            float money = Float.valueOf(moneyDetail.getRealAmount());
+                            moneyText.setText(String.valueOf(money));
+                        }
 
-        getMember();
                     }
+                }
+        );
+
+    }
+
 
     List<BeanTravelMember> dataAdult;
     List<BeanTravelMember> dataChild;
-    private void getMember(){
+
+    private void getMember() {
         //查成年人
         ApiUtil.getTravelMember("0", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
             @Override
@@ -156,8 +277,89 @@ public class TravelFragmentCommitOrder extends BaseFragment {
         ApiUtil.getTravelMember("1", new OnApiResponseCallback<List<BeanTravelMember>, String>() {
             @Override
             public void done(List<BeanTravelMember> data, String errorMessage) {
-                dataChild =data;
+                dataChild = data;
+            }
+        });
+    }
+
+
+    private AdapterTravelMember adapterTravelMember;
+    private List<BeanTravelMember> selectData = new ArrayList<>();
+
+    private int adultNum, childNum;
+    private int adultPrice, childPrice;
+
+    private void setOrderParam() {
+        if (beanOrderParam != null) {
+            getMoneyDetail();
+
+            companyText.setText(beanOrderParam.getStartCompanyName());
+            companyAddressText.setText(beanOrderParam.getStartAddr());
+            aimText.setText(beanOrderParam.getEndAddr());
+            timeText.setText(beanOrderParam.getTime());
+            adultNum = Integer.valueOf(beanOrderParam.getAdultNum());
+            childNum = Integer.valueOf(beanOrderParam.getChildNum());
+            childPrice = Integer.valueOf(beanOrderParam.getChildPrice());
+            adultPrice = Integer.valueOf(beanOrderParam.getPrice());
+            String member = beanOrderParam.getAdultNum() + "成人" + beanOrderParam.getChildNum() + "儿童";
+            memberCountText.setText(member);
+
+
+            float price = (childNum * childPrice) + (adultNum * adultPrice);
+            moneyText.setText(String.valueOf(price));
+            for (int i = 0; i < Integer.valueOf(beanOrderParam.getAdultNum()); i++) {
+
+                BeanTravelMember travelMember = new BeanTravelMember();
+                travelMember.setIsChild("0");
+                selectData.add(travelMember);
+            }
+            for (int i = 0; i < Integer.valueOf(beanOrderParam.getChildNum()); i++) {
+
+                BeanTravelMember travelMember = new BeanTravelMember();
+                travelMember.setIsChild("1");
+                selectData.add(travelMember);
+            }
+
+            adapterTravelMember = new AdapterTravelMember(R.layout.item_travel_member, selectData);
+            adapterTravelMember.setItemRootClickListener(new AdapterTravelMember.OnItemAllClickListener() {
+                @Override
+                public void onItemRootClick(final BeanTravelMember bean) {
+                    final List<BeanTravelMember> data = new ArrayList<>();
+                    if (bean.getIsChild().equals("0")) {
+                        data.addAll(dataAdult);
+                    } else {
+                        data.addAll(dataChild);
+                    }
+
+                    TravelDialogUtil.showSelectTravel(baseContext, data, new TravelDialogUtil.OnDialogDoneCallback<BeanTravelMember>() {
+                        @Override
+                        public void done(BeanTravelMember beanTravelMember) {
+                            if (beanTravelMember == null) {
+                                showToastShort("无成员，跳转到添加");
+                                return;
+                            }
+                            if (selectData.contains(beanTravelMember)) {
+                                showToastShort("此成员已添加！");
+                                return;
+                            }
+                            selectData.remove(bean);
+                            selectData.add(beanTravelMember);
+                            adapterTravelMember.setNewData(selectData);
                         }
                     });
                 }
+
+                @Override
+                public void onItemDeleteClick(BeanTravelMember bean) {
+                    BeanTravelMember newBean = new BeanTravelMember();
+                    newBean.setIsChild(bean.getIsChild());
+                    selectData.remove(bean);
+                    selectData.add(newBean);
+                    adapterTravelMember.setNewData(selectData);
+                }
+            });
+            memberRecycler.setLayoutManager(new LinearLayoutManager(baseContext));
+            memberRecycler.setAdapter(adapterTravelMember);
+        }
+    }
 }
\ No newline at end of file

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

@@ -10,9 +10,12 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import com.base.utils.base.BaseFragment;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.frame.rv.ModuleChangeUtil;
 import com.just.agentweb.AgentWeb;
 import com.rv.travel.R;
 import com.rv.travel.R2;
+import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -51,6 +54,13 @@ public class TravelWebFragment extends BaseFragment {
         view.findViewById(R.id.travel_web_subscribe_button).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (TextUtil.isEmpty(OkGoUtil.getToken())) {
+                    showToastShort("请先登录");
+                    if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
+                        ModuleChangeUtil.getOnModuleChangedListener().onLogin();
+                    }
+                    return;
+                }
                 //buttonLayout.setVisibility(View.INVISIBLE);
                 mAgentWeb.getJsAccessEntrace().quickCallJs("openModal");
             }

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

@@ -65,6 +65,7 @@
 
 
             <TextView
+                android:id="@+id/commit_order_money_detail_adult_des_text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -75,6 +76,7 @@
                 android:textSize="@dimen/_ui_text_size_h6" />
 
             <TextView
+                android:id="@+id/commit_order_money_detail_adult_total_money_text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -114,6 +116,7 @@
 
 
             <TextView
+                android:id="@+id/commit_order_money_detail_child_des_text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -124,6 +127,7 @@
                 android:textSize="@dimen/_ui_text_size_h6" />
 
             <TextView
+                android:id="@+id/commit_order_money_detail_child_total_money_text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -139,6 +143,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/_ui_height_h5"
         android:gravity="center|start"
+        android:visibility="invisible"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/ui_dimen_padding_h1"
         android:paddingRight="@dimen/ui_dimen_padding_h1">
@@ -219,10 +224,11 @@
                 android:textSize="@dimen/_ui_text_size_h3" />
 
             <TextView
+                android:id="@+id/commit_order_money_detail_money_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:lines="1"
-                android:text="28000"
+                android:text="0.00"
                 android:textColor="@color/uiColorLittle"
                 android:textSize="@dimen/_ui_text_size_h3" />
 

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

@@ -64,10 +64,11 @@
             android:textSize="@dimen/ui_text_size_h3" />
 
         <TextView
+            android:id="@+id/select_pay_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/ui_dimen_margin_h1"
-            android:text="3562.00"
+            android:text="0.00"
             android:textColor="@color/uiColorLittle"
             android:textSize="@dimen/ui_text_size_h5" />
 

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

@@ -62,6 +62,7 @@
                         android:orientation="vertical">
 
                         <TextView
+                            android:id="@+id/commit_order_company"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/ui_dimen_common"
@@ -72,6 +73,7 @@
                             android:textSize="@dimen/_ui_text_size_h6" />
 
                         <TextView
+                            android:id="@+id/commit_order_company_address"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:gravity="center|start"
@@ -127,6 +129,7 @@
 
 
                         <TextView
+                            android:id="@+id/commit_order_aim_address"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:gravity="center|start"
@@ -172,6 +175,7 @@
 
 
                         <TextView
+                            android:id="@+id/commit_order_time"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:gravity="center|start"
@@ -277,6 +281,7 @@
 
 
                         <EditText
+                            android:id="@+id/commit_order_name_input"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:background="@null"
@@ -332,6 +337,7 @@
 
 
                         <EditText
+                            android:id="@+id/commit_order_mobile_input"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:background="@null"
@@ -398,6 +404,7 @@
 
 
                         <EditText
+                            android:id="@+id/commit_order_email_input"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:background="@null"
@@ -454,6 +461,7 @@
                         android:weightSum="2">
 
                         <TextView
+                            android:id="@+id/commit_order_member_count"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
@@ -521,6 +529,7 @@
 
 
                 <LinearLayout
+                    android:id="@+id/commit_order_go_book"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/_ui_height_h5"
                     android:gravity="center|start"
@@ -617,10 +626,11 @@
                     android:textSize="@dimen/_ui_text_size_h3" />
 
                 <TextView
+                    android:id="@+id/commit_order_money"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:lines="1"
-                    android:text="5000"
+                    android:text="****"
                     android:textColor="@color/uiColorLittle"
                     android:textSize="@dimen/_ui_text_size_h3" />
 
@@ -628,10 +638,12 @@
                     android:id="@+id/commit_order_money_detail"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:drawableRight="@drawable/rv_common_icon_down_arrow"
+                    android:drawablePadding="5dp"
                     android:gravity="center"
-                    android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
-                    android:layout_marginRight="@dimen/ui_dimen_margin_h1"
                     android:lines="1"
+                    android:paddingLeft="@dimen/ui_dimen_margin_h1"
+                    android:paddingRight="@dimen/ui_dimen_margin_h1"
                     android:text="明细"
                     android:textColor="@color/colorTextH1"
                     android:textSize="@dimen/_ui_text_size_h5" />

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

@@ -8,6 +8,7 @@
     android:orientation="horizontal">
 
     <TextView
+        android:id="@+id/item_travel_member_is_child"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/ui_dimen_margin_h1"
@@ -57,6 +58,7 @@
             android:paddingBottom="@dimen/ui_dimen_common">
 
             <TextView
+                android:id="@+id/item_travel_member_id_card_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="@dimen/ui_dimen_common"

RvWrapper/build.gradle

@@ -28,12 +28,7 @@ android {
 dependencies {
     api 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'
     /*fragment*/
@@ -51,17 +46,8 @@ dependencies {
     api "com.squareup.okhttp3:logging-interceptor:$rootProject.ext.okHttpVersion"
     //转换器，请求结果转换成Model
     api 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    //百度定位
-    api files('libs/BaiduLBS_Android.jar')
-    //bugly
-    api files('libs/bugly_crash_release.jar')
-    //友盟
-    api files('libs/umeng-common-2.0.2.jar')
-    api files('libs/umeng-share-core-6.9.4.jar')
-    api files('libs/umeng-share-QQ-simplify-6.9.4.jar')
-    api files('libs/umeng-share-wechat-simplify-6.9.4.jar')
-    api files('libs/umeng-shareboard-widget-6.9.4.jar')
-    api files('libs/umeng-sharetool-6.9.4.jar')
+
+
     api 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     api project(path: ':RvFrame')