调整页面 修复bug

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/MainActivity.java

@@ -149,22 +149,22 @@ public class MainActivity extends BaseActivity {
     @Override
     public void loadData() {
 //        //版本信息校验
-        VersionUtils versionUtils = new VersionUtils(AppManager.getAppManager().currentActivity());
-        versionUtils.checkVersion(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, new VersionUtils.CallBack() {
-            @Override
-            public void onError(String msg) {
-                ToastUtils.show(msg + "");
-            }
-
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onNewest() {
-                ToastUtils.show("当前版本为最新版本");
-            }
-        });
+//        VersionUtils versionUtils = new VersionUtils(AppManager.getAppManager().currentActivity());
+//        versionUtils.checkVersion(BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, new VersionUtils.CallBack() {
+//            @Override
+//            public void onError(String msg) {
+//                ToastUtils.show(msg + "");
+//            }
+//
+//            @Override
+//            public void onSuccess() {
+//            }
+//
+//            @Override
+//            public void onNewest() {
+//                ToastUtils.show("当前版本为最新版本");
+//            }
+//        });
 //        DhUtils.getInstance().initServiceInfo();
     }
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventDetailsFragment.java

@@ -1,7 +1,6 @@
 package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +10,8 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.kongzue.dialogx.dialogs.MessageDialog;
+import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.adapter.EventDetailsAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
@@ -66,19 +67,19 @@ public class EventDetailsFragment extends BaseFragment {
         binding.tvCompleted.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ChangeStatus("30");
+                ChangeStatus("30", binding.tvCompleted.getText().toString());
             }
         });
         binding.tvFinish.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ChangeStatus("50");
+                ChangeStatus("50", binding.tvFinish.getText().toString());
             }
         });
         binding.tvRefuse.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ChangeStatus("40");
+                ChangeStatus("40", binding.tvRefuse.getText().toString());
             }
         });
         binding.mapLocation.setOnClickListener(new View.OnClickListener() {
@@ -95,32 +96,47 @@ public class EventDetailsFragment extends BaseFragment {
         });
     }
 
-    private void ChangeStatus(String status) {
-        showLoadingDialog();
-        Params params = new Params();
-        params.put("eventId", viewModel.eventId.get());
-        params.put("id", getActivity().getIntent().getStringExtra("eventCode"));
-        params.put("status", status);
-        chooseStatusRequest.setParams(params);
-        chooseStatusRequest.execute(new ProcessErrorSubscriber() {
-            @Override
-            public void onError(Throwable e) {
-                super.onError(e);
-                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
-                if (e != null) {
-                    ToastUtils.show(e.getMessage());
-                }
-            }
-
-            @Override
-            public void onNext(Object o) {
-                super.onNext(o);
-                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
-                ToastUtils.show("操作成功");
-                getActivity().setResult(1000);
-                getActivity().finish();
-            }
-        });
+    private void ChangeStatus(String status, String str) {
+        MessageDialog.show("温馨提示", "是否确定" + str + "?", "确定", "取消")
+                .setCancelButton(new OnDialogButtonClickListener<MessageDialog>() {
+                    @Override
+                    public boolean onClick(MessageDialog baseDialog, View v) {
+                        baseDialog.dismiss();
+                        return false;
+                    }
+                })
+                .setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
+                    @Override
+                    public boolean onClick(MessageDialog baseDialog, View v) {
+                        showLoadingDialog();
+                        Params params = new Params();
+                        params.put("eventId", viewModel.eventId.get());
+                        params.put("id", getActivity().getIntent().getStringExtra("eventCode"));
+                        params.put("status", status);
+                        chooseStatusRequest.setParams(params);
+                        chooseStatusRequest.execute(new ProcessErrorSubscriber() {
+                            @Override
+                            public void onError(Throwable e) {
+                                super.onError(e);
+                                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+                                if (e != null) {
+                                    ToastUtils.show(e.getMessage());
+                                }
+                            }
+
+                            @Override
+                            public void onNext(Object o) {
+                                super.onNext(o);
+                                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                                ToastUtils.show("操作成功");
+                                getActivity().setResult(1000);
+                                getActivity().finish();
+                            }
+                        });
+
+                        return false;
+                    }
+                });
 
 
     }