diff --git a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt b/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt deleted file mode 100644 index 2dac61c..0000000 --- a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.br.ktd.base - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.LayoutRes -import androidx.fragment.app.Fragment - -abstract class KotlinBaseFragment : Fragment() { - - lateinit var bv: View - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - bv = inflater.inflate(initLayoutRes(), container, false) - initView(savedInstanceState) - setupTopBarLayout() - return bv - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - observeRequestState() - initEvent() - } - - @LayoutRes - abstract fun initLayoutRes(): Int - - /** - * 沉浸式状态栏 - */ - abstract fun setupTopBarLayout() - - /** - * 初始化布局以及控件 - */ - abstract fun initView(savedInstanceState: Bundle?) - - /** - * 网络请求状态监听 - */ - abstract fun observeRequestState() - - /** - * 业务逻辑，按钮等事件 - */ - abstract fun initEvent() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt b/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt deleted file mode 100644 index 2dac61c..0000000 --- a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.br.ktd.base - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.LayoutRes -import androidx.fragment.app.Fragment - -abstract class KotlinBaseFragment : Fragment() { - - lateinit var bv: View - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - bv = inflater.inflate(initLayoutRes(), container, false) - initView(savedInstanceState) - setupTopBarLayout() - return bv - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - observeRequestState() - initEvent() - } - - @LayoutRes - abstract fun initLayoutRes(): Int - - /** - * 沉浸式状态栏 - */ - abstract fun setupTopBarLayout() - - /** - * 初始化布局以及控件 - */ - abstract fun initView(savedInstanceState: Bundle?) - - /** - * 网络请求状态监听 - */ - abstract fun observeRequestState() - - /** - * 业务逻辑，按钮等事件 - */ - abstract fun initEvent() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt index ce2fa9f..1597942 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt @@ -7,13 +7,18 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R import com.casic.br.ktd.adapter.AlarmAdapter -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.model.AlarmListModel import com.casic.br.ktd.vm.AlarmViewModel import com.casic.br.ktd.widgets.DateRangeActionSheet +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_alarm.view.* +import kotlinx.android.synthetic.main.fragment_alarm.alarmLayout +import kotlinx.android.synthetic.main.fragment_alarm.alarmRecyclerView +import kotlinx.android.synthetic.main.fragment_alarm.calendarView +import kotlinx.android.synthetic.main.fragment_alarm.emptyLayout +import kotlinx.android.synthetic.main.fragment_alarm.resetParamView +import kotlinx.android.synthetic.main.fragment_alarm.selectedDateView class AlarmPageFragment : KotlinBaseFragment(), Handler.Callback { @@ -28,7 +33,7 @@ private var startTime = "" private var endTime = "" - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] @@ -38,17 +43,19 @@ when { isRefresh -> { alarmAdapter.setRefreshData(dataRows) - bv.alarmLayout.finishRefresh() + alarmLayout.finishRefresh() isRefresh = false } + isLoadMore -> { if (dataRows.size == 0) { "到底了，别拉了".show(requireContext()) } alarmAdapter.setLoadMoreData(dataRows) - bv.alarmLayout.finishLoadMore() + alarmLayout.finishLoadMore() isLoadMore = false } + else -> { dataBeans = dataRows weakReferenceHandler.sendEmptyMessage(2023072901) @@ -59,7 +66,7 @@ } override fun initEvent() { - bv.calendarView.setOnClickListener { + calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) .setOnActionSheetListener(object : DateRangeActionSheet.OnDateRangeSelectedListener { @@ -69,13 +76,13 @@ //条件查询 getAlarmsByPage(true) - bv.selectedDateView.text = "$startDate ~ $endDate" + selectedDateView.text = "$startDate ~ $endDate" } }).build().show() } - bv.resetParamView.setOnClickListener { - bv.selectedDateView.text = "" + resetParamView.setOnClickListener { + selectedDateView.text = "" startTime = "" endTime = "" @@ -84,12 +91,12 @@ getAlarmsByPage(true) } - bv.alarmLayout.setOnRefreshListener { + alarmLayout.setOnRefreshListener { isRefresh = true getAlarmsByPage(true) } - bv.alarmLayout.setOnLoadMoreListener { + alarmLayout.setOnLoadMoreListener { isLoadMore = true getAlarmsByPage(false) } @@ -115,13 +122,13 @@ when (msg.what) { 2023072901 -> { if (dataBeans.size == 0) { - bv.alarmLayout.visibility = View.GONE - bv.emptyLayout.visibility = View.VISIBLE + alarmLayout.visibility = View.GONE + emptyLayout.visibility = View.VISIBLE } else { - bv.alarmLayout.visibility = View.VISIBLE - bv.emptyLayout.visibility = View.GONE + alarmLayout.visibility = View.VISIBLE + emptyLayout.visibility = View.GONE alarmAdapter = AlarmAdapter(requireContext(), dataBeans) - bv.alarmRecyclerView.adapter = alarmAdapter + alarmRecyclerView.adapter = alarmAdapter alarmAdapter.setOnItemCheckedListener(object : AlarmAdapter.OnItemClickedListener { override fun onItemClicked(item: AlarmListModel.DataModel.RowsModel) { @@ -138,8 +145,7 @@ return true } - override fun initLayoutRes(): Int = R.layout.fragment_alarm - + override fun initLayoutView(): Int = R.layout.fragment_alarm override fun observeRequestState() { } diff --git a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt b/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt deleted file mode 100644 index 2dac61c..0000000 --- a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.br.ktd.base - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.LayoutRes -import androidx.fragment.app.Fragment - -abstract class KotlinBaseFragment : Fragment() { - - lateinit var bv: View - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - bv = inflater.inflate(initLayoutRes(), container, false) - initView(savedInstanceState) - setupTopBarLayout() - return bv - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - observeRequestState() - initEvent() - } - - @LayoutRes - abstract fun initLayoutRes(): Int - - /** - * 沉浸式状态栏 - */ - abstract fun setupTopBarLayout() - - /** - * 初始化布局以及控件 - */ - abstract fun initView(savedInstanceState: Bundle?) - - /** - * 网络请求状态监听 - */ - abstract fun observeRequestState() - - /** - * 业务逻辑，按钮等事件 - */ - abstract fun initEvent() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt index ce2fa9f..1597942 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt @@ -7,13 +7,18 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R import com.casic.br.ktd.adapter.AlarmAdapter -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.model.AlarmListModel import com.casic.br.ktd.vm.AlarmViewModel import com.casic.br.ktd.widgets.DateRangeActionSheet +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_alarm.view.* +import kotlinx.android.synthetic.main.fragment_alarm.alarmLayout +import kotlinx.android.synthetic.main.fragment_alarm.alarmRecyclerView +import kotlinx.android.synthetic.main.fragment_alarm.calendarView +import kotlinx.android.synthetic.main.fragment_alarm.emptyLayout +import kotlinx.android.synthetic.main.fragment_alarm.resetParamView +import kotlinx.android.synthetic.main.fragment_alarm.selectedDateView class AlarmPageFragment : KotlinBaseFragment(), Handler.Callback { @@ -28,7 +33,7 @@ private var startTime = "" private var endTime = "" - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] @@ -38,17 +43,19 @@ when { isRefresh -> { alarmAdapter.setRefreshData(dataRows) - bv.alarmLayout.finishRefresh() + alarmLayout.finishRefresh() isRefresh = false } + isLoadMore -> { if (dataRows.size == 0) { "到底了，别拉了".show(requireContext()) } alarmAdapter.setLoadMoreData(dataRows) - bv.alarmLayout.finishLoadMore() + alarmLayout.finishLoadMore() isLoadMore = false } + else -> { dataBeans = dataRows weakReferenceHandler.sendEmptyMessage(2023072901) @@ -59,7 +66,7 @@ } override fun initEvent() { - bv.calendarView.setOnClickListener { + calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) .setOnActionSheetListener(object : DateRangeActionSheet.OnDateRangeSelectedListener { @@ -69,13 +76,13 @@ //条件查询 getAlarmsByPage(true) - bv.selectedDateView.text = "$startDate ~ $endDate" + selectedDateView.text = "$startDate ~ $endDate" } }).build().show() } - bv.resetParamView.setOnClickListener { - bv.selectedDateView.text = "" + resetParamView.setOnClickListener { + selectedDateView.text = "" startTime = "" endTime = "" @@ -84,12 +91,12 @@ getAlarmsByPage(true) } - bv.alarmLayout.setOnRefreshListener { + alarmLayout.setOnRefreshListener { isRefresh = true getAlarmsByPage(true) } - bv.alarmLayout.setOnLoadMoreListener { + alarmLayout.setOnLoadMoreListener { isLoadMore = true getAlarmsByPage(false) } @@ -115,13 +122,13 @@ when (msg.what) { 2023072901 -> { if (dataBeans.size == 0) { - bv.alarmLayout.visibility = View.GONE - bv.emptyLayout.visibility = View.VISIBLE + alarmLayout.visibility = View.GONE + emptyLayout.visibility = View.VISIBLE } else { - bv.alarmLayout.visibility = View.VISIBLE - bv.emptyLayout.visibility = View.GONE + alarmLayout.visibility = View.VISIBLE + emptyLayout.visibility = View.GONE alarmAdapter = AlarmAdapter(requireContext(), dataBeans) - bv.alarmRecyclerView.adapter = alarmAdapter + alarmRecyclerView.adapter = alarmAdapter alarmAdapter.setOnItemCheckedListener(object : AlarmAdapter.OnItemClickedListener { override fun onItemClicked(item: AlarmListModel.DataModel.RowsModel) { @@ -138,8 +145,7 @@ return true } - override fun initLayoutRes(): Int = R.layout.fragment_alarm - + override fun initLayoutView(): Int = R.layout.fragment_alarm override fun observeRequestState() { } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index f3eba5c..8547417 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -5,18 +5,22 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* +import com.amap.api.maps.model.BitmapDescriptorFactory +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.LatLng +import com.amap.api.maps.model.MarkerOptions +import com.amap.api.maps.model.PolylineOptions import com.casic.br.ktd.R -import com.casic.br.ktd.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_home.view.* +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_home.mapView class HomePageFragment : KotlinBaseFragment() { private lateinit var aMap: AMap - override fun initView(savedInstanceState: Bundle?) { - bv.mapView.onCreate(savedInstanceState) - aMap = bv.mapView.map + override fun initData(savedInstanceState: Bundle?) { + mapView.onCreate(savedInstanceState) + aMap = mapView.map val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true uiSettings.isMyLocationButtonEnabled = false @@ -56,7 +60,7 @@ ) } - override fun initLayoutRes(): Int = R.layout.fragment_home + override fun initLayoutView(): Int = R.layout.fragment_home override fun observeRequestState() { @@ -77,21 +81,21 @@ override fun onResume() { super.onResume() - bv.mapView.onResume() + mapView.onResume() } override fun onPause() { super.onPause() - bv.mapView.onPause() + mapView.onPause() } override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - bv.mapView.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) } override fun onDestroy() { super.onDestroy() - bv.mapView.onDestroy() + mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt b/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt deleted file mode 100644 index 2dac61c..0000000 --- a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.br.ktd.base - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.LayoutRes -import androidx.fragment.app.Fragment - -abstract class KotlinBaseFragment : Fragment() { - - lateinit var bv: View - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - bv = inflater.inflate(initLayoutRes(), container, false) - initView(savedInstanceState) - setupTopBarLayout() - return bv - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - observeRequestState() - initEvent() - } - - @LayoutRes - abstract fun initLayoutRes(): Int - - /** - * 沉浸式状态栏 - */ - abstract fun setupTopBarLayout() - - /** - * 初始化布局以及控件 - */ - abstract fun initView(savedInstanceState: Bundle?) - - /** - * 网络请求状态监听 - */ - abstract fun observeRequestState() - - /** - * 业务逻辑，按钮等事件 - */ - abstract fun initEvent() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt index ce2fa9f..1597942 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt @@ -7,13 +7,18 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R import com.casic.br.ktd.adapter.AlarmAdapter -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.model.AlarmListModel import com.casic.br.ktd.vm.AlarmViewModel import com.casic.br.ktd.widgets.DateRangeActionSheet +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_alarm.view.* +import kotlinx.android.synthetic.main.fragment_alarm.alarmLayout +import kotlinx.android.synthetic.main.fragment_alarm.alarmRecyclerView +import kotlinx.android.synthetic.main.fragment_alarm.calendarView +import kotlinx.android.synthetic.main.fragment_alarm.emptyLayout +import kotlinx.android.synthetic.main.fragment_alarm.resetParamView +import kotlinx.android.synthetic.main.fragment_alarm.selectedDateView class AlarmPageFragment : KotlinBaseFragment(), Handler.Callback { @@ -28,7 +33,7 @@ private var startTime = "" private var endTime = "" - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] @@ -38,17 +43,19 @@ when { isRefresh -> { alarmAdapter.setRefreshData(dataRows) - bv.alarmLayout.finishRefresh() + alarmLayout.finishRefresh() isRefresh = false } + isLoadMore -> { if (dataRows.size == 0) { "到底了，别拉了".show(requireContext()) } alarmAdapter.setLoadMoreData(dataRows) - bv.alarmLayout.finishLoadMore() + alarmLayout.finishLoadMore() isLoadMore = false } + else -> { dataBeans = dataRows weakReferenceHandler.sendEmptyMessage(2023072901) @@ -59,7 +66,7 @@ } override fun initEvent() { - bv.calendarView.setOnClickListener { + calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) .setOnActionSheetListener(object : DateRangeActionSheet.OnDateRangeSelectedListener { @@ -69,13 +76,13 @@ //条件查询 getAlarmsByPage(true) - bv.selectedDateView.text = "$startDate ~ $endDate" + selectedDateView.text = "$startDate ~ $endDate" } }).build().show() } - bv.resetParamView.setOnClickListener { - bv.selectedDateView.text = "" + resetParamView.setOnClickListener { + selectedDateView.text = "" startTime = "" endTime = "" @@ -84,12 +91,12 @@ getAlarmsByPage(true) } - bv.alarmLayout.setOnRefreshListener { + alarmLayout.setOnRefreshListener { isRefresh = true getAlarmsByPage(true) } - bv.alarmLayout.setOnLoadMoreListener { + alarmLayout.setOnLoadMoreListener { isLoadMore = true getAlarmsByPage(false) } @@ -115,13 +122,13 @@ when (msg.what) { 2023072901 -> { if (dataBeans.size == 0) { - bv.alarmLayout.visibility = View.GONE - bv.emptyLayout.visibility = View.VISIBLE + alarmLayout.visibility = View.GONE + emptyLayout.visibility = View.VISIBLE } else { - bv.alarmLayout.visibility = View.VISIBLE - bv.emptyLayout.visibility = View.GONE + alarmLayout.visibility = View.VISIBLE + emptyLayout.visibility = View.GONE alarmAdapter = AlarmAdapter(requireContext(), dataBeans) - bv.alarmRecyclerView.adapter = alarmAdapter + alarmRecyclerView.adapter = alarmAdapter alarmAdapter.setOnItemCheckedListener(object : AlarmAdapter.OnItemClickedListener { override fun onItemClicked(item: AlarmListModel.DataModel.RowsModel) { @@ -138,8 +145,7 @@ return true } - override fun initLayoutRes(): Int = R.layout.fragment_alarm - + override fun initLayoutView(): Int = R.layout.fragment_alarm override fun observeRequestState() { } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index f3eba5c..8547417 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -5,18 +5,22 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* +import com.amap.api.maps.model.BitmapDescriptorFactory +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.LatLng +import com.amap.api.maps.model.MarkerOptions +import com.amap.api.maps.model.PolylineOptions import com.casic.br.ktd.R -import com.casic.br.ktd.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_home.view.* +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_home.mapView class HomePageFragment : KotlinBaseFragment() { private lateinit var aMap: AMap - override fun initView(savedInstanceState: Bundle?) { - bv.mapView.onCreate(savedInstanceState) - aMap = bv.mapView.map + override fun initData(savedInstanceState: Bundle?) { + mapView.onCreate(savedInstanceState) + aMap = mapView.map val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true uiSettings.isMyLocationButtonEnabled = false @@ -56,7 +60,7 @@ ) } - override fun initLayoutRes(): Int = R.layout.fragment_home + override fun initLayoutView(): Int = R.layout.fragment_home override fun observeRequestState() { @@ -77,21 +81,21 @@ override fun onResume() { super.onResume() - bv.mapView.onResume() + mapView.onResume() } override fun onPause() { super.onPause() - bv.mapView.onPause() + mapView.onPause() } override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - bv.mapView.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) } override fun onDestroy() { super.onDestroy() - bv.mapView.onDestroy() + mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index bf20e0e..448c89d 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -4,7 +4,6 @@ import android.os.Environment import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.LoadingDialogHub import com.casic.br.ktd.utils.LocaleConstant @@ -14,6 +13,7 @@ import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog import com.casic.br.ktd.widgets.ChangePasswordDialog +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.calculateSize import com.pengxh.kt.lite.extensions.deleteFile import com.pengxh.kt.lite.extensions.formatFileSize @@ -21,7 +21,12 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_mine.view.* +import kotlinx.android.synthetic.main.fragment_mine.carNumberView +import kotlinx.android.synthetic.main.fragment_mine.changePwdView +import kotlinx.android.synthetic.main.fragment_mine.clearCacheView +import kotlinx.android.synthetic.main.fragment_mine.loginOutButton +import kotlinx.android.synthetic.main.fragment_mine.userNameView +import kotlinx.android.synthetic.main.fragment_mine.userRoleView import java.io.File import java.nio.charset.StandardCharsets @@ -30,7 +35,7 @@ private lateinit var userViewModel: UserViewModel private lateinit var rootDir: File - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { //缓存根目录 rootDir = File(requireContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), "") @@ -59,7 +64,7 @@ } userViewModel.userInfo.observe(this) { if (it.code == 200) { - bv.userNameView.text = it.data.name + userNameView.text = it.data.name val userRoleBuilder = StringBuilder() it.data.roleNames.forEachIndexed { index, role -> @@ -69,13 +74,13 @@ userRoleBuilder.append(role).append("，") } } - bv.userRoleView.text = userRoleBuilder.toString() + userRoleView.text = userRoleBuilder.toString() } } } override fun initEvent() { - bv.loginOutButton.setOnClickListener { + loginOutButton.setOnClickListener { AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("退出登录") @@ -92,7 +97,7 @@ }).build().show() } - bv.changePwdView.setOnClickListener { + changePwdView.setOnClickListener { val oldPwd = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String ChangePasswordDialog.Builder() .setContext(requireContext()) @@ -113,7 +118,7 @@ }).build().show() } - bv.clearCacheView.setOnClickListener { + clearCacheView.setOnClickListener { AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("清除缓存") @@ -124,7 +129,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { rootDir.deleteFile() - bv.clearCacheView.text = rootDir.calculateSize().formatFileSize() + clearCacheView.text = rootDir.calculateSize().formatFileSize() } override fun onCancelClick() {} @@ -132,7 +137,7 @@ } } - override fun initLayoutRes(): Int = R.layout.fragment_mine + override fun initLayoutView(): Int = R.layout.fragment_mine override fun observeRequestState() { userViewModel.loadState.observe(this) { @@ -152,9 +157,9 @@ userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String - bv.carNumberView.text = value + carNumberView.text = value //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 - bv.clearCacheView.text = rootDir.calculateSize().formatFileSize() + clearCacheView.text = rootDir.calculateSize().formatFileSize() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt b/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt deleted file mode 100644 index 2dac61c..0000000 --- a/app/src/main/java/com/casic/br/ktd/base/KotlinBaseFragment.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.br.ktd.base - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.annotation.LayoutRes -import androidx.fragment.app.Fragment - -abstract class KotlinBaseFragment : Fragment() { - - lateinit var bv: View - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - bv = inflater.inflate(initLayoutRes(), container, false) - initView(savedInstanceState) - setupTopBarLayout() - return bv - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - observeRequestState() - initEvent() - } - - @LayoutRes - abstract fun initLayoutRes(): Int - - /** - * 沉浸式状态栏 - */ - abstract fun setupTopBarLayout() - - /** - * 初始化布局以及控件 - */ - abstract fun initView(savedInstanceState: Bundle?) - - /** - * 网络请求状态监听 - */ - abstract fun observeRequestState() - - /** - * 业务逻辑，按钮等事件 - */ - abstract fun initEvent() -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt index ce2fa9f..1597942 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/AlarmPageFragment.kt @@ -7,13 +7,18 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R import com.casic.br.ktd.adapter.AlarmAdapter -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.model.AlarmListModel import com.casic.br.ktd.vm.AlarmViewModel import com.casic.br.ktd.widgets.DateRangeActionSheet +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_alarm.view.* +import kotlinx.android.synthetic.main.fragment_alarm.alarmLayout +import kotlinx.android.synthetic.main.fragment_alarm.alarmRecyclerView +import kotlinx.android.synthetic.main.fragment_alarm.calendarView +import kotlinx.android.synthetic.main.fragment_alarm.emptyLayout +import kotlinx.android.synthetic.main.fragment_alarm.resetParamView +import kotlinx.android.synthetic.main.fragment_alarm.selectedDateView class AlarmPageFragment : KotlinBaseFragment(), Handler.Callback { @@ -28,7 +33,7 @@ private var startTime = "" private var endTime = "" - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] @@ -38,17 +43,19 @@ when { isRefresh -> { alarmAdapter.setRefreshData(dataRows) - bv.alarmLayout.finishRefresh() + alarmLayout.finishRefresh() isRefresh = false } + isLoadMore -> { if (dataRows.size == 0) { "到底了，别拉了".show(requireContext()) } alarmAdapter.setLoadMoreData(dataRows) - bv.alarmLayout.finishLoadMore() + alarmLayout.finishLoadMore() isLoadMore = false } + else -> { dataBeans = dataRows weakReferenceHandler.sendEmptyMessage(2023072901) @@ -59,7 +66,7 @@ } override fun initEvent() { - bv.calendarView.setOnClickListener { + calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) .setOnActionSheetListener(object : DateRangeActionSheet.OnDateRangeSelectedListener { @@ -69,13 +76,13 @@ //条件查询 getAlarmsByPage(true) - bv.selectedDateView.text = "$startDate ~ $endDate" + selectedDateView.text = "$startDate ~ $endDate" } }).build().show() } - bv.resetParamView.setOnClickListener { - bv.selectedDateView.text = "" + resetParamView.setOnClickListener { + selectedDateView.text = "" startTime = "" endTime = "" @@ -84,12 +91,12 @@ getAlarmsByPage(true) } - bv.alarmLayout.setOnRefreshListener { + alarmLayout.setOnRefreshListener { isRefresh = true getAlarmsByPage(true) } - bv.alarmLayout.setOnLoadMoreListener { + alarmLayout.setOnLoadMoreListener { isLoadMore = true getAlarmsByPage(false) } @@ -115,13 +122,13 @@ when (msg.what) { 2023072901 -> { if (dataBeans.size == 0) { - bv.alarmLayout.visibility = View.GONE - bv.emptyLayout.visibility = View.VISIBLE + alarmLayout.visibility = View.GONE + emptyLayout.visibility = View.VISIBLE } else { - bv.alarmLayout.visibility = View.VISIBLE - bv.emptyLayout.visibility = View.GONE + alarmLayout.visibility = View.VISIBLE + emptyLayout.visibility = View.GONE alarmAdapter = AlarmAdapter(requireContext(), dataBeans) - bv.alarmRecyclerView.adapter = alarmAdapter + alarmRecyclerView.adapter = alarmAdapter alarmAdapter.setOnItemCheckedListener(object : AlarmAdapter.OnItemClickedListener { override fun onItemClicked(item: AlarmListModel.DataModel.RowsModel) { @@ -138,8 +145,7 @@ return true } - override fun initLayoutRes(): Int = R.layout.fragment_alarm - + override fun initLayoutView(): Int = R.layout.fragment_alarm override fun observeRequestState() { } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt index f3eba5c..8547417 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/HomePageFragment.kt @@ -5,18 +5,22 @@ import com.amap.api.maps.AMap import com.amap.api.maps.AMapOptions import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* +import com.amap.api.maps.model.BitmapDescriptorFactory +import com.amap.api.maps.model.CameraPosition +import com.amap.api.maps.model.LatLng +import com.amap.api.maps.model.MarkerOptions +import com.amap.api.maps.model.PolylineOptions import com.casic.br.ktd.R -import com.casic.br.ktd.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_home.view.* +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_home.mapView class HomePageFragment : KotlinBaseFragment() { private lateinit var aMap: AMap - override fun initView(savedInstanceState: Bundle?) { - bv.mapView.onCreate(savedInstanceState) - aMap = bv.mapView.map + override fun initData(savedInstanceState: Bundle?) { + mapView.onCreate(savedInstanceState) + aMap = mapView.map val uiSettings = aMap.uiSettings uiSettings.isCompassEnabled = true uiSettings.isMyLocationButtonEnabled = false @@ -56,7 +60,7 @@ ) } - override fun initLayoutRes(): Int = R.layout.fragment_home + override fun initLayoutView(): Int = R.layout.fragment_home override fun observeRequestState() { @@ -77,21 +81,21 @@ override fun onResume() { super.onResume() - bv.mapView.onResume() + mapView.onResume() } override fun onPause() { super.onPause() - bv.mapView.onPause() + mapView.onPause() } override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - bv.mapView.onSaveInstanceState(outState) + mapView.onSaveInstanceState(outState) } override fun onDestroy() { super.onDestroy() - bv.mapView.onDestroy() + mapView.onDestroy() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index bf20e0e..448c89d 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -4,7 +4,6 @@ import android.os.Environment import androidx.lifecycle.ViewModelProvider import com.casic.br.ktd.R -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.utils.AuthenticationHelper import com.casic.br.ktd.utils.LoadingDialogHub import com.casic.br.ktd.utils.LocaleConstant @@ -14,6 +13,7 @@ import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog import com.casic.br.ktd.widgets.ChangePasswordDialog +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.calculateSize import com.pengxh.kt.lite.extensions.deleteFile import com.pengxh.kt.lite.extensions.formatFileSize @@ -21,7 +21,12 @@ import com.pengxh.kt.lite.utils.PageNavigationManager import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState -import kotlinx.android.synthetic.main.fragment_mine.view.* +import kotlinx.android.synthetic.main.fragment_mine.carNumberView +import kotlinx.android.synthetic.main.fragment_mine.changePwdView +import kotlinx.android.synthetic.main.fragment_mine.clearCacheView +import kotlinx.android.synthetic.main.fragment_mine.loginOutButton +import kotlinx.android.synthetic.main.fragment_mine.userNameView +import kotlinx.android.synthetic.main.fragment_mine.userRoleView import java.io.File import java.nio.charset.StandardCharsets @@ -30,7 +35,7 @@ private lateinit var userViewModel: UserViewModel private lateinit var rootDir: File - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { //缓存根目录 rootDir = File(requireContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), "") @@ -59,7 +64,7 @@ } userViewModel.userInfo.observe(this) { if (it.code == 200) { - bv.userNameView.text = it.data.name + userNameView.text = it.data.name val userRoleBuilder = StringBuilder() it.data.roleNames.forEachIndexed { index, role -> @@ -69,13 +74,13 @@ userRoleBuilder.append(role).append("，") } } - bv.userRoleView.text = userRoleBuilder.toString() + userRoleView.text = userRoleBuilder.toString() } } } override fun initEvent() { - bv.loginOutButton.setOnClickListener { + loginOutButton.setOnClickListener { AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("退出登录") @@ -92,7 +97,7 @@ }).build().show() } - bv.changePwdView.setOnClickListener { + changePwdView.setOnClickListener { val oldPwd = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String ChangePasswordDialog.Builder() .setContext(requireContext()) @@ -113,7 +118,7 @@ }).build().show() } - bv.clearCacheView.setOnClickListener { + clearCacheView.setOnClickListener { AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("清除缓存") @@ -124,7 +129,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { rootDir.deleteFile() - bv.clearCacheView.text = rootDir.calculateSize().formatFileSize() + clearCacheView.text = rootDir.calculateSize().formatFileSize() } override fun onCancelClick() {} @@ -132,7 +137,7 @@ } } - override fun initLayoutRes(): Int = R.layout.fragment_mine + override fun initLayoutView(): Int = R.layout.fragment_mine override fun observeRequestState() { userViewModel.loadState.observe(this) { @@ -152,9 +157,9 @@ userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String - bv.carNumberView.text = value + carNumberView.text = value //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 - bv.clearCacheView.text = rootDir.calculateSize().formatFileSize() + clearCacheView.text = rootDir.calculateSize().formatFileSize() } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt index dc46490..4aa71b4 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/TaskPageFragment.kt @@ -9,7 +9,6 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.br.ktd.R import com.casic.br.ktd.adapter.TaskAdapter -import com.casic.br.ktd.base.KotlinBaseFragment import com.casic.br.ktd.holder.SwipeViewHolder import com.casic.br.ktd.model.TaskListModel import com.casic.br.ktd.utils.LoadingDialogHub @@ -20,6 +19,7 @@ import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertInputDialog import com.casic.br.ktd.widgets.DateRangeActionSheet +import com.pengxh.kt.lite.base.KotlinBaseFragment import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate @@ -28,7 +28,17 @@ import com.pengxh.kt.lite.vm.LoadState import com.qmuiteam.qmui.recyclerView.QMUIRVItemSwipeAction import com.qmuiteam.qmui.recyclerView.QMUISwipeAction -import kotlinx.android.synthetic.main.fragment_task.view.* +import kotlinx.android.synthetic.main.fragment_task.addTaskButton +import kotlinx.android.synthetic.main.fragment_task.calendarView +import kotlinx.android.synthetic.main.fragment_task.deleteTaskButton +import kotlinx.android.synthetic.main.fragment_task.emptyLayout +import kotlinx.android.synthetic.main.fragment_task.resetParamView +import kotlinx.android.synthetic.main.fragment_task.selectedDateView +import kotlinx.android.synthetic.main.fragment_task.taskCodeView +import kotlinx.android.synthetic.main.fragment_task.taskLayout +import kotlinx.android.synthetic.main.fragment_task.taskNameView +import kotlinx.android.synthetic.main.fragment_task.taskRecyclerView +import kotlinx.android.synthetic.main.fragment_task.taskSettingsButton class TaskPageFragment : KotlinBaseFragment(), Handler.Callback { @@ -46,7 +56,7 @@ private var endTime = "" private var deviceId = "" - override fun initView(savedInstanceState: Bundle?) { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(this) taskViewModel = ViewModelProvider(this)[TaskViewModel::class.java] taskViewModel.taskList.observe(this) { @@ -55,17 +65,19 @@ when { isRefresh -> { taskAdapter.setRefreshData(dataRows) - bv.taskLayout.finishRefresh() + taskLayout.finishRefresh() isRefresh = false } + isLoadMore -> { if (dataRows.size == 0) { "到底了，别拉了".show(requireContext()) } taskAdapter.setLoadMoreData(dataRows) - bv.taskLayout.finishLoadMore() + taskLayout.finishLoadMore() isLoadMore = false } + else -> { dataBeans = dataRows weakReferenceHandler.sendEmptyMessage(2023070501) @@ -89,15 +101,15 @@ when (msg.what) { 2023070501 -> { if (dataBeans.size == 0) { - bv.taskLayout.visibility = View.GONE - bv.emptyLayout.visibility = View.VISIBLE + taskLayout.visibility = View.GONE + emptyLayout.visibility = View.VISIBLE } else { - bv.taskLayout.visibility = View.VISIBLE - bv.emptyLayout.visibility = View.GONE + taskLayout.visibility = View.VISIBLE + emptyLayout.visibility = View.GONE taskAdapter = TaskAdapter(requireContext(), dataBeans) //绑定侧滑事件 - swipeAction.attachToRecyclerView(bv.taskRecyclerView) - bv.taskRecyclerView.adapter = taskAdapter + swipeAction.attachToRecyclerView(taskRecyclerView) + taskRecyclerView.adapter = taskAdapter taskAdapter.setOnItemCheckedListener(object : TaskAdapter.OnItemCheckedListener { override fun onItemClicked(item: TaskListModel.DataModel.RowsModel) { @@ -179,7 +191,7 @@ } override fun initEvent() { - bv.calendarView.setOnClickListener { + calendarView.setOnClickListener { DateRangeActionSheet.Builder().setContext(requireContext()) .setOnActionSheetListener(object : DateRangeActionSheet.OnDateRangeSelectedListener { @@ -190,12 +202,12 @@ getTasksByPage(true) //显示 - bv.selectedDateView.text = "$startDate ~ $endDate" + selectedDateView.text = "$startDate ~ $endDate" } }).build().show() } - bv.taskNameView.setOnEditorActionListener { _, actionId, _ -> + taskNameView.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH) { getTasksByPage(true) } @@ -203,7 +215,7 @@ false } - bv.taskCodeView.setOnEditorActionListener { _, actionId, _ -> + taskCodeView.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH) { getTasksByPage(true) } @@ -211,10 +223,10 @@ false } - bv.resetParamView.setOnClickListener { - bv.selectedDateView.text = "" - bv.taskNameView.setText("") - bv.taskCodeView.setText("") + resetParamView.setOnClickListener { + selectedDateView.text = "" + taskNameView.setText("") + taskCodeView.setText("") startTime = "" endTime = "" @@ -223,7 +235,7 @@ getTasksByPage(true) } - bv.addTaskButton.setOnClickListener { + addTaskButton.setOnClickListener { AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("新建巡检任务") @@ -241,11 +253,11 @@ }).build().show() } - bv.deleteTaskButton.setOnClickListener { + deleteTaskButton.setOnClickListener { selectedItems.size.toString().show(requireContext()) } - bv.taskSettingsButton.setOnClickListener { + taskSettingsButton.setOnClickListener { AlertInputDialog.Builder() .setContext(requireContext()) .setTitle("设置阈值") @@ -267,12 +279,12 @@ }).build().show() } - bv.taskLayout.setOnRefreshListener { + taskLayout.setOnRefreshListener { isRefresh = true getTasksByPage(true) } - bv.taskLayout.setOnLoadMoreListener { + taskLayout.setOnLoadMoreListener { isLoadMore = true getTasksByPage(false) } @@ -287,22 +299,27 @@ taskViewModel.getTasksByPage( startTime, endTime, - bv.taskNameView.text.toString(), - bv.taskCodeView.text.toString(), + taskNameView.text.toString(), + taskCodeView.text.toString(), page ) } - override fun initLayoutRes(): Int = R.layout.fragment_task + override fun initLayoutView(): Int = R.layout.fragment_task override fun observeRequestState() { alarmViewModel.loadState.observe(this) { when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "报警规则新增中，请稍后...") + LoadState.Loading -> LoadingDialogHub.show( + requireActivity(), + "报警规则新增中，请稍后..." + ) + LoadState.Success -> { LoadingDialogHub.dismiss() "报警规则新增成功".show(requireActivity()) } + else -> { LoadingDialogHub.dismiss() "报警规则新增失败，请重试".show(requireActivity())