diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index dd9e31a..52edf7b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -7,6 +7,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.* @@ -22,6 +23,7 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -47,13 +49,13 @@ //手指是否已经从方向控制盘抬起 private var isActionUp = true - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.GAS) { gasTreeItems.add("${it.host}:${it.port}") - configSelectView.text = gasTreeItems[0] } } + configSelectView.text = gasTreeItems[0] //获取wifi列表 wifiSsids.clear() @@ -102,17 +104,16 @@ }).build().show() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(gasTreeItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = gasTreeItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(gasTreeItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = gasTreeItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() @@ -143,7 +144,8 @@ }).build().show() } - warningSwitch.setOnCheckedChangeListener { _, isChecked -> + warningSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + buttonView.isChecked = false val gasParam = configSelectView.text.toString().splitGasParam() if (isChecked) { //开 @@ -241,7 +243,12 @@ override fun initLayoutView(): Int = R.layout.activity_methane override fun observeRequestState() { - + alarmViewModel.loadState.observe(this) { + when (it) { + LoadState.Success -> warningSwitch.isChecked = true + else -> warningSwitch.isChecked = false + } + } } override fun setupTopBarLayout() { @@ -255,7 +262,6 @@ override fun onDestroy() { super.onDestroy() - udpClient.release() connectivityManager?.bindProcessToNetwork(null) connectivityManager?.unregisterNetworkCallback(networkCallback) } diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index dd9e31a..52edf7b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -7,6 +7,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.* @@ -22,6 +23,7 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -47,13 +49,13 @@ //手指是否已经从方向控制盘抬起 private var isActionUp = true - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.GAS) { gasTreeItems.add("${it.host}:${it.port}") - configSelectView.text = gasTreeItems[0] } } + configSelectView.text = gasTreeItems[0] //获取wifi列表 wifiSsids.clear() @@ -102,17 +104,16 @@ }).build().show() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(gasTreeItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = gasTreeItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(gasTreeItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = gasTreeItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() @@ -143,7 +144,8 @@ }).build().show() } - warningSwitch.setOnCheckedChangeListener { _, isChecked -> + warningSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + buttonView.isChecked = false val gasParam = configSelectView.text.toString().splitGasParam() if (isChecked) { //开 @@ -241,7 +243,12 @@ override fun initLayoutView(): Int = R.layout.activity_methane override fun observeRequestState() { - + alarmViewModel.loadState.observe(this) { + when (it) { + LoadState.Success -> warningSwitch.isChecked = true + else -> warningSwitch.isChecked = false + } + } } override fun setupTopBarLayout() { @@ -255,7 +262,6 @@ override fun onDestroy() { super.onDestroy() - udpClient.release() connectivityManager?.bindProcessToNetwork(null) connectivityManager?.unregisterNetworkCallback(networkCallback) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 6ea0ff5..06a285c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -19,7 +20,7 @@ ImmersionBar.with(this).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserDetailViewModel::class.java] } diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index dd9e31a..52edf7b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -7,6 +7,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.* @@ -22,6 +23,7 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -47,13 +49,13 @@ //手指是否已经从方向控制盘抬起 private var isActionUp = true - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.GAS) { gasTreeItems.add("${it.host}:${it.port}") - configSelectView.text = gasTreeItems[0] } } + configSelectView.text = gasTreeItems[0] //获取wifi列表 wifiSsids.clear() @@ -102,17 +104,16 @@ }).build().show() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(gasTreeItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = gasTreeItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(gasTreeItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = gasTreeItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() @@ -143,7 +144,8 @@ }).build().show() } - warningSwitch.setOnCheckedChangeListener { _, isChecked -> + warningSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + buttonView.isChecked = false val gasParam = configSelectView.text.toString().splitGasParam() if (isChecked) { //开 @@ -241,7 +243,12 @@ override fun initLayoutView(): Int = R.layout.activity_methane override fun observeRequestState() { - + alarmViewModel.loadState.observe(this) { + when (it) { + LoadState.Success -> warningSwitch.isChecked = true + else -> warningSwitch.isChecked = false + } + } } override fun setupTopBarLayout() { @@ -255,7 +262,6 @@ override fun onDestroy() { super.onDestroy() - udpClient.release() connectivityManager?.bindProcessToNetwork(null) connectivityManager?.unregisterNetworkCallback(networkCallback) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 6ea0ff5..06a285c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -19,7 +20,7 @@ ImmersionBar.with(this).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserDetailViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 8e7cdf9..d7d345c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -1,6 +1,7 @@ package com.casic.br.operationsite.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -66,7 +67,7 @@ titleView.text = "事件信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { val userDetail = Gson().fromJson( diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index dd9e31a..52edf7b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -7,6 +7,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.* @@ -22,6 +23,7 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -47,13 +49,13 @@ //手指是否已经从方向控制盘抬起 private var isActionUp = true - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.GAS) { gasTreeItems.add("${it.host}:${it.port}") - configSelectView.text = gasTreeItems[0] } } + configSelectView.text = gasTreeItems[0] //获取wifi列表 wifiSsids.clear() @@ -102,17 +104,16 @@ }).build().show() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(gasTreeItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = gasTreeItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(gasTreeItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = gasTreeItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() @@ -143,7 +144,8 @@ }).build().show() } - warningSwitch.setOnCheckedChangeListener { _, isChecked -> + warningSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + buttonView.isChecked = false val gasParam = configSelectView.text.toString().splitGasParam() if (isChecked) { //开 @@ -241,7 +243,12 @@ override fun initLayoutView(): Int = R.layout.activity_methane override fun observeRequestState() { - + alarmViewModel.loadState.observe(this) { + when (it) { + LoadState.Success -> warningSwitch.isChecked = true + else -> warningSwitch.isChecked = false + } + } } override fun setupTopBarLayout() { @@ -255,7 +262,6 @@ override fun onDestroy() { super.onDestroy() - udpClient.release() connectivityManager?.bindProcessToNetwork(null) connectivityManager?.unregisterNetworkCallback(networkCallback) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 6ea0ff5..06a285c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -19,7 +20,7 @@ ImmersionBar.with(this).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserDetailViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 8e7cdf9..d7d345c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -1,6 +1,7 @@ package com.casic.br.operationsite.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -66,7 +67,7 @@ titleView.text = "事件信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { val userDetail = Gson().fromJson( diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 963c092..c024a56 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -55,7 +55,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! /** diff --git a/app/build.gradle b/app/build.gradle index 098120a..803935d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.8' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' implementation 'com.google.android.material:material:1.6.1' diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index e37bae7..e86ac1c 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,8 +26,8 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_completed.* -import kotlinx.android.synthetic.main.include_empty_view.* +import kotlinx.android.synthetic.main.fragment_completed.view.* +import kotlinx.android.synthetic.main.include_empty_view.view.* class CompletedFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - completedRefreshLayout.finishRefresh() + baseView.completedRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - completedRefreshLayout.finishLoadMore() + baseView.completedRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - completedRefreshLayout.setOnRefreshListener { + baseView.completedRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - completedRefreshLayout.setOnLoadMoreListener { + baseView.completedRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -125,12 +126,12 @@ workingListAdapter.notifyDataSetChanged() } else { //首次加载数据 if (dataBeans.size == 0) { - emptyView.showEmptyPage { + baseView.emptyView.showEmptyPage { pageIndex = 1 obtainProjectListByPage() } } else { - emptyView.hide() + baseView.emptyView.hide() workingListAdapter = object : NormalRecyclerAdapter( R.layout.item_working_rv, dataBeans @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - completedRecyclerView.addItemDecoration( + baseView.completedRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - completedRecyclerView.adapter = workingListAdapter + baseView.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index eb71513..210808d 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_not_start.* +import kotlinx.android.synthetic.main.fragment_not_start.view.* import kotlinx.android.synthetic.main.include_empty_view.* class NotStartFragment : KotlinBaseFragment() { @@ -48,7 +49,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -58,7 +59,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - notStartRefreshLayout.finishRefresh() + baseView.notStartRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -66,7 +67,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - notStartRefreshLayout.finishLoadMore() + baseView.notStartRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -102,13 +103,13 @@ } override fun initEvent() { - notStartRefreshLayout.setOnRefreshListener { + baseView.notStartRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - notStartRefreshLayout.setOnLoadMoreListener { + baseView.notStartRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -151,14 +152,17 @@ } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人：${item.workPersonName}") - .setText(R.id.connectionPhoneView, "联系电话：${item.workPersonPhoneNumber}") + .setText( + R.id.connectionPhoneView, + "联系电话：${item.workPersonPhoneNumber}" + ) .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - notStartRecyclerView.addItemDecoration( + baseView.notStartRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - notStartRecyclerView.adapter = workingListAdapter + baseView.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index c015bdf..bdc28e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,6 +3,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import android.os.Handler import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,7 +26,7 @@ import com.pengxh.kt.lite.utils.BroadcastManager import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.WeakReferenceHandler -import kotlinx.android.synthetic.main.fragment_working.* +import kotlinx.android.synthetic.main.fragment_working.view.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -49,7 +50,7 @@ } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) workSiteViewModel = ViewModelProvider(this)[WorkSiteViewModel::class.java] workSiteViewModel.worksiteModel.observe(this) { @@ -59,7 +60,7 @@ isRefresh -> { dataBeans.clear() dataBeans = dataRows!! - workingRefreshLayout.finishRefresh() + baseView.workingRefreshLayout.finishRefresh() isRefresh = false } isLoadMore -> { @@ -67,7 +68,7 @@ "到底了，别拉了".show(requireContext()) } dataBeans.addAll(dataRows!!) - workingRefreshLayout.finishLoadMore() + baseView.workingRefreshLayout.finishLoadMore() isLoadMore = false } else -> { @@ -103,13 +104,13 @@ } override fun initEvent() { - workingRefreshLayout.setOnRefreshListener { + baseView.workingRefreshLayout.setOnRefreshListener { isRefresh = true //刷新之后页码重置 pageIndex = 1 obtainProjectListByPage() } - workingRefreshLayout.setOnLoadMoreListener { + baseView.workingRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ obtainProjectListByPage() @@ -156,10 +157,10 @@ .setText(R.id.workSiteView, "现场描述：${item.workSiteDesc}") } } - workingRecyclerView.addItemDecoration( + baseView.workingRecyclerView.addItemDecoration( ItemDecoration(95f.dp2px(requireContext()).toFloat(), 0f) ) - workingRecyclerView.adapter = workingListAdapter + baseView.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index 9a4d01b..d412a6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -41,7 +41,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { this.id = intent.getStringExtra(Constant.INTENT_PARAM)!! aMap = mapView.map diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index bbe3e52..2a25cd0 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider @@ -52,7 +53,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index 1e78dd3..f538396 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -3,6 +3,7 @@ import android.annotation.SuppressLint import android.content.Context import android.net.Uri +import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log @@ -55,7 +56,7 @@ titleView.text = "人员信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java] diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index f969350..7cf446c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -15,7 +16,6 @@ import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil import kotlinx.android.synthetic.main.activity_big_image.* -import java.util.* class BigImageActivity : KotlinBaseActivity() { @@ -26,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index ec12038..1f5576f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -7,6 +7,7 @@ import android.graphics.ImageFormat import android.graphics.Rect import android.media.FaceDetector +import android.os.Bundle import android.os.Handler import android.util.DisplayMetrics import android.view.Surface @@ -64,7 +65,7 @@ titleView.text = "入场申请人脸采集" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { //调节屏幕亮度最大 window.setScreenBrightness(WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_FULL) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 89f506e..0404dce 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -9,6 +9,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import android.util.Log import android.view.SurfaceHolder import androidx.lifecycle.ViewModelProvider @@ -71,13 +72,13 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { cameraItems.add("${it.host}:${it.port}") - configSelectView.text = cameraItems[0] } } + configSelectView.text = cameraItems[0] //获取wifi列表 wifiSsids.clear() @@ -104,17 +105,16 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(cameraItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = cameraItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(cameraItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = cameraItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index fb9f7d3..f0b8082 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.initLayoutImmersionBar @@ -31,7 +32,7 @@ initLayoutImmersionBar(rootView) } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 344a9af..4ed70ac 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import androidx.fragment.app.Fragment import androidx.viewpager.widget.ViewPager import com.casic.br.operationsite.R @@ -47,7 +48,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { mainViewPager.adapter = ViewPagerAdapter(pageViews, supportFragmentManager) mainViewPager.offscreenPageLimit = pageViews.size //缓存页数 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index dd9e31a..52edf7b 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -7,6 +7,7 @@ import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.* @@ -22,6 +23,7 @@ import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.SaveKeyValues +import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.AlertInputDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -47,13 +49,13 @@ //手指是否已经从方向控制盘抬起 private var isActionUp = true - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.GAS) { gasTreeItems.add("${it.host}:${it.port}") - configSelectView.text = gasTreeItems[0] } } + configSelectView.text = gasTreeItems[0] //获取wifi列表 wifiSsids.clear() @@ -102,17 +104,16 @@ }).build().show() } - configSelectView.setOnClickListener { - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(gasTreeItems) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = gasTreeItems[position] - } - }).build().show() - } + val bottomActionSheet = BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(gasTreeItems) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + configSelectView.text = gasTreeItems[position] + } + }).build() + configSelectView.setOnClickListener { bottomActionSheet.show() } netSelectView.setOnClickListener { BottomActionSheet.Builder() @@ -143,7 +144,8 @@ }).build().show() } - warningSwitch.setOnCheckedChangeListener { _, isChecked -> + warningSwitch.setOnCheckedChangeListener { buttonView, isChecked -> + buttonView.isChecked = false val gasParam = configSelectView.text.toString().splitGasParam() if (isChecked) { //开 @@ -241,7 +243,12 @@ override fun initLayoutView(): Int = R.layout.activity_methane override fun observeRequestState() { - + alarmViewModel.loadState.observe(this) { + when (it) { + LoadState.Success -> warningSwitch.isChecked = true + else -> warningSwitch.isChecked = false + } + } } override fun setupTopBarLayout() { @@ -255,7 +262,6 @@ override fun onDestroy() { super.onDestroy() - udpClient.release() connectivityManager?.bindProcessToNetwork(null) connectivityManager?.unregisterNetworkCallback(networkCallback) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 6ea0ff5..06a285c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -1,5 +1,6 @@ package com.casic.br.operationsite.view +import android.os.Bundle import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -19,7 +20,7 @@ ImmersionBar.with(this).init() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserDetailViewModel::class.java] } diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 8e7cdf9..d7d345c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -1,6 +1,7 @@ package com.casic.br.operationsite.view import android.content.Context +import android.os.Bundle import android.os.CountDownTimer import android.os.Handler import android.text.Editable @@ -66,7 +67,7 @@ titleView.text = "事件信息" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { val userDetailJson = SaveKeyValues.getValue(LocaleConstant.USER_DETAIL_MODEL, "") as String if (userDetailJson.isNotBlank()) { val userDetail = Gson().fromJson( diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 963c092..c024a56 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -55,7 +55,7 @@ titleView.text = "燃气作业现场动态感知" } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { projectId = intent.getStringExtra(Constant.INTENT_PARAM)!! /** diff --git a/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt index 8e9e463..cdea1f6 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/AlarmViewModel.kt @@ -73,8 +73,8 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { + "报警开关控制失败".show(BaseApplication.get()) loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) it.printStackTrace() }) } \ No newline at end of file