Skip to content

android / dayu

Go to a project
Commit c731c043 by wukun
Options

bug修复

parent 4670ea15
Inline Side-by-side
Showing with 59 additions and 4 deletions
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderMaterialFragment.java
...@@ -12,9 +12,13 @@ import com.dayu.order.databinding.FragmentOrderMaterialBinding; ...@@ -12,9 +12,13 @@ import com.dayu.order.databinding.FragmentOrderMaterialBinding;
import com.dayu.order.presenter.ordermaterial.OrderMaterialContract; import com.dayu.order.presenter.ordermaterial.OrderMaterialContract;
import com.dayu.order.presenter.ordermaterial.OrderMaterialPresenter; import com.dayu.order.presenter.ordermaterial.OrderMaterialPresenter;
import com.dayu.order.ui.adapter.OrderMaterialListAdapter; import com.dayu.order.ui.adapter.OrderMaterialListAdapter;
import com.dayu.usercenter.event.RefreshMaterialEvent;
import com.dayu.usercenter.ui.activity.CommeWebViewActivity; import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter, FragmentOrderMaterialBinding> public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter, FragmentOrderMaterialBinding>
implements OrderMaterialContract.View { implements OrderMaterialContract.View {
...@@ -39,6 +43,7 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter, ...@@ -39,6 +43,7 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter,
@Override @Override
public void initView() { public void initView() {
EventBus.getDefault().register(this);
OrderMaterialListAdapter adapter = new OrderMaterialListAdapter(false); OrderMaterialListAdapter adapter = new OrderMaterialListAdapter(false);
mBind.lvPart.setAdapter(adapter); mBind.lvPart.setAdapter(adapter);
adapter.setPresenter(mPresenter); adapter.setPresenter(mPresenter);
...@@ -61,4 +66,15 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter, ...@@ -61,4 +66,15 @@ public class OrderMaterialFragment extends BaseFragment<OrderMaterialPresenter,
showDialog(); showDialog();
mPresenter.queryMaterialList(); mPresenter.queryMaterialList();
} }
@Subscribe
public void onRefreshMaterial(RefreshMaterialEvent event) {
mPresenter.refresh();
}
@Override
public void onDestroy() {
EventBus.getDefault().unregister(this);
super.onDestroy();
}
} }
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java
...@@ -30,6 +30,7 @@ import com.dayu.utils.ToastUtils; ...@@ -30,6 +30,7 @@ import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils; import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterErrorDialog;
import com.dayu.widgets.listener.OnItemClickListener; import com.dayu.widgets.listener.OnItemClickListener;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -283,10 +284,12 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra ...@@ -283,10 +284,12 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
if (detectSatus != 1) { if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers()) Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> { .subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) { if (integer == 2 ) {
mBind.recyclerView.setVisibility(View.GONE); mBind.recyclerView.setVisibility(View.GONE);
mBind.registerView.setVisibility(View.VISIBLE); mBind.registerView.setVisibility(View.VISIBLE);
} else if (integer == 4) { }else if (integer == 3){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog(); showInReviewDiaglog();
} else { } else {
mBind.recyclerView.setVisibility(View.VISIBLE); mBind.recyclerView.setVisibility(View.VISIBLE);
...@@ -302,6 +305,18 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra ...@@ -302,6 +305,18 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
}); });
} }
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() { private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n", CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> { (dialog1, confirm) -> {
......
userCenter/src/main/java/com/dayu/usercenter/event/RefreshMaterialEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class RefreshMaterialEvent {
private String title;
public RefreshMaterialEvent() {
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity/CommeWebViewActivity.java
...@@ -10,7 +10,6 @@ import android.view.KeyEvent; ...@@ -10,7 +10,6 @@ import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.webkit.ValueCallback; import android.webkit.ValueCallback;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
...@@ -24,6 +23,7 @@ import com.dayu.common.Constants; ...@@ -24,6 +23,7 @@ import com.dayu.common.Constants;
import com.dayu.provider.event.RefreshServe; import com.dayu.provider.event.RefreshServe;
import com.dayu.provider.router.RouterPath; import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R; import com.dayu.usercenter.R;
import com.dayu.usercenter.event.RefreshMaterialEvent;
import com.dayu.utils.ProgressUtil; import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils; import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager; import com.dayu.utils.UserManager;
...@@ -52,6 +52,7 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin ...@@ -52,6 +52,7 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
private String mUrl; private String mUrl;
//定义支付域名（替换成公司申请H5的域名即可） //定义支付域名（替换成公司申请H5的域名即可）
private String realm = "https://m.dayuspm.com"; private String realm = "https://m.dayuspm.com";
private String title;
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -63,12 +64,15 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin ...@@ -63,12 +64,15 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE); Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
mUrl = bundle.getString(Constants.URL); mUrl = bundle.getString(Constants.URL);
int type = bundle.getInt(Constants.TYPE); int type = bundle.getInt(Constants.TYPE);
String title = bundle.getString(Constants.TITLE); title = bundle.getString(Constants.TITLE);
if (TextUtils.isEmpty(title)) { if (TextUtils.isEmpty(title)) {
mBind.rlTitle.setVisibility(View.GONE); mBind.rlTitle.setVisibility(View.GONE);
} else { } else {
mBind.tvTitle.setText(title); mBind.tvTitle.setText(title);
mBind.titleBack.setOnClickListener(v -> { mBind.titleBack.setOnClickListener(v -> {
if ("用料".equals(title)){
EventBus.getDefault().post(new RefreshMaterialEvent());
}
if (type == 0) { if (type == 0) {
finish(); finish();
} else { } else {
...@@ -252,6 +256,9 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin ...@@ -252,6 +256,9 @@ public class CommeWebViewActivity extends DataBindingActivity<ActivityWebviewBin
clearCach(); clearCach();
return true; return true;
} }
if ("用料".equals(title)){
EventBus.getDefault().post(new RefreshMaterialEvent());
}
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }
......
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 sign in to comment