From a141213b3234d2d83ffb6a5d2d42ede0e722d949 Mon Sep 17 00:00:00 2001 From: lmw <125975490@qq.com> Date: 星期二, 13 六月 2023 11:57:21 +0800 Subject: [PATCH] 公务出行开发完成 --- app/src/main/java/com/kuanzhai/user/ui/charter/CharterFragment.kt | 81 ++++------------------------------------ 1 files changed, 9 insertions(+), 72 deletions(-) diff --git a/app/src/main/java/com/kuanzhai/user/ui/charter/CharterFragment.kt b/app/src/main/java/com/kuanzhai/user/ui/charter/CharterFragment.kt index 173f8ba..2e49c0a 100644 --- a/app/src/main/java/com/kuanzhai/user/ui/charter/CharterFragment.kt +++ b/app/src/main/java/com/kuanzhai/user/ui/charter/CharterFragment.kt @@ -8,22 +8,18 @@ import cn.sinata.xldutils.utils.isValidPhone import cn.sinata.xldutils.utils.myToast import cn.sinata.xldutils.utils.optString -import com.kuanzhai.user.OkApplication +import com.kuanzhai.user.KuanzhaiApplication import com.kuanzhai.user.R import com.kuanzhai.user.dialog.AlertDialog -import com.kuanzhai.user.dialog.CharterReserveTimeDialog import com.kuanzhai.user.dialog.SingleWheelDialog import com.kuanzhai.user.interfaces.StringCallback import com.kuanzhai.user.network.HttpManager import com.kuanzhai.user.network.requestByF import com.kuanzhai.user.ui.H5Activity import com.kuanzhai.user.ui.MainActivity -import com.kuanzhai.user.utils.Const -import com.kuanzhai.user.utils.IntegerInputFilter import kotlinx.android.synthetic.main.fragment_charter.* import org.jetbrains.anko.sdk27.coroutines.onClick import org.jetbrains.anko.support.v4.startActivity -import org.jetbrains.anko.support.v4.startActivityForResult class CharterFragment:BaseFragment() { override fun contentViewId() = R.layout.fragment_charter @@ -63,38 +59,19 @@ override fun onFirstVisibleToUser() { - et_count.filters = arrayOf(IntegerInputFilter(999)) getPhone() tv_rule.onClick { getRule() } - tv_time.onClick { - val charterReserveTimeDialog = CharterReserveTimeDialog() - charterReserveTimeDialog.setCallback(object :StringCallback{ - override fun onRlt(rlt: String) { - tv_time.text = rlt - } - }) - charterReserveTimeDialog.show(fragmentManager!!,"time") - } + tv_duration.onClick { if (!singleWheelDialog.isAdded) singleWheelDialog.show(fragmentManager!!,"count") } - tv_type.onClick { - startActivityForResult<CharterTypeActivity>(Const.RequestCode.CHAPTER_TYPE) - } - tv_usage.onClick { - startActivityForResult<ChooseUsageActivity>(Const.RequestCode.CHAPTER_USAGE, - "data" to arrayListOf("旅游","商务","会议")) - } + tv_action.onClick { if (mainActivity.checkLogin()){ - val time = tv_time.text.toString() - if (time.isEmpty()){ - myToast("请选择用车时间") - return@onClick - } + if (day == 0){ myToast("请选择用车时长") return@onClick @@ -103,39 +80,14 @@ myToast("请选择车型") return@onClick } - val usage = tv_usage.text.toString() - if (usage.isEmpty()){ - myToast("请选择车辆用途") - return@onClick - } - val countS = et_count.text.toString() - if(countS.isEmpty()){ - myToast("请填写乘车人数") - return@onClick - } - val name = et_name.text.toString() - if (name.isEmpty()){ - myToast("请填写联系人姓名") - return@onClick - } - val phone = et_phone.text.toString() - if (!phone.isValidPhone()){ - myToast("请填写正确的联系电话") - return@onClick - } - showDialog() - tv_action.isEnabled = false - HttpManager.orderCharteredCar(day,"$time 00:00:00","${OkApplication.lon},${OkApplication.lat}",name, - phone,usage,countS.toInt(),carTypeId).requestByF(this@CharterFragment,success = {_,_-> - successDialog.show(fragmentManager!!,"suc") - tv_action.isEnabled = true - }){_,_-> tv_action.isEnabled = true} + + } } } private fun getPhone(){ - HttpManager.queryPhones(OkApplication.chooseCityCode).requestByF(this){_,data-> + HttpManager.queryPhones(KuanzhaiApplication.chooseCityCode).requestByF(this){ _, data-> data?.filter { it.type == 3 }?.forEach { tv_phone.text = "旅游包车调度电话:%s".format(it.phone) tv_phone.onClick {_-> @@ -165,31 +117,16 @@ } private fun clearData(){ - tv_time.text = "" - tv_duration.text = "" - tv_type.text = "" - tv_usage.text = "" - et_count.setText("") - et_name.setText("") - et_phone.setText("") + tv_price.text = "" day = 0 carTypeId = 0 - et_phone.clearFocus() } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (resultCode == Activity.RESULT_OK&&data!=null){ - if (requestCode == Const.RequestCode.CHAPTER_TYPE){ - tv_type.text = data.getStringExtra("name") - carTypeId = data.getIntExtra("id",0) - min = data.getIntExtra("min",0) - max = data.getIntExtra("max",0) - calculate() - }else if (requestCode == Const.RequestCode.CHAPTER_USAGE){ - tv_usage.text = data.getStringExtra("data") - } + } } } \ No newline at end of file -- Gitblit v1.7.1