Commit 457517a7 authored by youjj's avatar youjj

没有出游人,跳转到添加。优化不能选择支付宝支付

parent 3c657219
......@@ -7,6 +7,7 @@ import com.frame.rv.OnModuleEventListener;
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.rvmine.traveler.AddAVisitorActivity;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.TravelActivity;
......@@ -94,6 +95,22 @@ public class ModuleUtil {
public void onPay(int type) {
}
@Override
public void onTravelMember(int type) {
switch (type) {
case OnModuleEventListener.MODULE_TRAVEL_MEMBER_ADD:
//添加出游人
FrameApp.getInstance().startActivity(AddAVisitorActivity.getIntent(FrameApp.getInstance()));
break;
case OnModuleEventListener.MODULE_TRAVEL_MEMBER_FINISH:
//添加完成
break;
}
}
});
}
}
......@@ -21,6 +21,13 @@ public interface OnModuleEventListener {
int MODULE_PAY_START = 20; //开始支付
int MODULE_PAY_FINISH = 21; //支付结束
//需要支付、支付结束
void onPay(int type);
int MODULE_TRAVEL_MEMBER_ADD = 30; //开始添加出游人
int MODULE_TRAVEL_MEMBER_FINISH = 31; //添加出游人结束
//需要添加出游人,和添加完成
void onTravelMember(int type);
}
......@@ -13,6 +13,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.rvmine.R;
import com.rv.rvmine.R2;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
......@@ -54,11 +55,12 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.add_a_visitor_title));
titleView.setText(R.id.tv_title_right,getString(R.string.rv_save));
titleView.setText(R.id.tv_title_right, getString(R.string.rv_save));
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
......@@ -66,6 +68,7 @@ public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onShowResult(int requestType, BaseBean result) {
finish();
}
@Override
......
......@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.base.utils.ui.dialog.DialogPlusUtil;
......@@ -130,7 +131,7 @@ public class TravelDialogUtil {
//选择支付
public static void showPaySelectDialog(Context context, String price, final OnDialogDoneCallback<Boolean> listener) {
public static void showPaySelectDialog(final Context context, String price, final OnDialogDoneCallback<Boolean> listener) {
isPayWx = true;
dismissDialogPlus();
View dialogView = LayoutInflater.from(context).inflate(R.layout.dialog_order_select_pay, null);
......@@ -152,6 +153,10 @@ public class TravelDialogUtil {
payZfb.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (true){
Toast.makeText(context, "暂不支持", Toast.LENGTH_SHORT).show();
return;
}
isPayWx = false;
payZfb.setImageResource(R.mipmap.common_icon_pay_round);
payWx.setImageResource(R.mipmap.common_icon_round);
......
......@@ -17,6 +17,8 @@ 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.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.rv.travel.R;
......@@ -344,7 +346,10 @@ public class TravelFragmentCommitOrder extends BaseFragment {
@Override
public void done(BeanTravelMember beanTravelMember) {
if (beanTravelMember == null) {
showToastShort("无成员,跳转到添加");
//showToastShort("无成员,跳转到添加");
if (ModuleEventUtil.getOnModuleEventListener()!=null){
ModuleEventUtil.getOnModuleEventListener().onTravelMember(OnModuleEventListener.MODULE_TRAVEL_MEMBER_ADD);
}
return;
}
if (selectData.contains(beanTravelMember)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment