diff --git a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt index c011699..8c854d0 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt +++ b/app/src/main/java/com/rehome/dywoa/ui/activity/sbxdjgl/MjApplyActivity.kt @@ -17,6 +17,7 @@ import com.rehome.dywoa.utils.GsonUtils import com.rehome.dywoa.utils.HttpListener import com.rehome.dywoa.utils.NoProgresshttpUtils import com.rehome.dywoa.utils.NohttpUtils +import com.rehome.dywoa.weiget.DatePickDialog import com.yolanda.nohttp.NoHttp import com.yolanda.nohttp.RequestMethod import com.yolanda.nohttp.rest.Response @@ -66,24 +67,24 @@ class MjApplyActivity : BaseActivityOaToolbarViewBinding resetCurrentMonth() -// binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> -// -// val dialog = DatePickDialog( -// context, calendar -// ) { outPutDate: String?,calendarBack:Calendar? -> -// if (calendarBack != null) { -// if(calendarBack.after(calendarSunday)){ -// showToast("开始时间不能在结束时间之后") -// }else{ -// stime = binding.tvSt.getText().toString().trim { it <= ' ' } -// binding.tvSt.text = outPutDate -// calendar = calendarBack; -// } -// } -// //checkServerConnectStatus() -// } -// dialog.show() -// }) + binding.tvSt.setOnClickListener(View.OnClickListener { view: View? -> + + val dialog = DatePickDialog( + context, calendar + ) { outPutDate: String?,calendarBack:Calendar? -> + if (calendarBack != null) { + if(calendarBack.after(calendarSunday)){ + showToast("开始时间不能在结束时间之后") + }else{ + stime = binding.tvSt.getText().toString().trim { it <= ' ' } + binding.tvSt.text = outPutDate + calendar = calendarBack; + } + } + //checkServerConnectStatus() + } + dialog.show() + }) // // binding.tvEt.setOnClickListener(View.OnClickListener { view: View? -> // diff --git a/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java b/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java index a28dac5..95fb81b 100644 --- a/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/rehome/dywoa/ui/fragment/MineFragment.java @@ -824,7 +824,7 @@ public class MineFragment extends BaseLazyFragment { HashMap param = new HashMap<>(); param.put("YHID",username); - //param.put("YHID","280840"); +// param.put("YHID","803011"); String url = Contans.IP + Contans.GET_WAIT_FOR_TO_DO; showLog(url); diff --git a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java index b7e6ff0..cb95b5f 100644 --- a/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java +++ b/app/src/main/java/com/rehome/dywoa/utils/HttpResponseListener.java @@ -132,9 +132,15 @@ public class HttpResponseListener implements OnResponseListener { * * @param what */ +// public void onFinish(int what) { +// if (mActivity != null && mDialog != null && mDialog.isShowing()) { +// mDialog.dismiss(); +// } +// } + @Override public void onFinish(int what) { - if (mActivity != null && mDialog != null && mDialog.isShowing()) { + if (mActivity != null && !mActivity.isFinishing() && !mActivity.isDestroyed() && mDialog != null && mDialog.isShowing()) { mDialog.dismiss(); } }