diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - @@ -55,7 +54,6 @@ - @@ -55,7 +54,6 @@ - @@ -55,7 +54,6 @@ - @@ -55,7 +54,6 @@ - @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..96ea16c 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..96ea16c 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..96ea16c 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419..96ea16c 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..96ea16c 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419..96ea16c 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7460cc2..83f613a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/QMUI.Compat.NoActionBar" android:usesCleartextTraffic="true"> @@ -55,7 +54,6 @@ - 4 || it["beforeConfirm"]!!.length > 4 || + it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 + ) { + homeView.todoDataView.textSize = 36f + homeView.undeterminedDataView.textSize = 36f + homeView.inHandleDataView.textSize = 36f + homeView.completedDataView.textSize = 36f + } + homeView.todoDataView.text = it["beforeGet"] + homeView.undeterminedDataView.text = it["beforeConfirm"] + homeView.inHandleDataView.text = it["inHandle"] + homeView.completedDataView.text = it["over"] + }) + //地图初始化 - homeView.mapView.onCreate(savedInstanceState) - aMap = homeView.mapView.map - val uiSettings = aMap.uiSettings - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 - //显示定位小蓝点 - locationStyle = MyLocationStyle() - locationStyle - locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 - locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 - aMap.myLocationStyle = locationStyle - aMap.isMyLocationEnabled = true - aMap.moveCamera(CameraUpdateFactory.zoomTo(14.toFloat())) + initMap(savedInstanceState) //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) @@ -65,31 +96,43 @@ } } }) - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { - homeView.unDeployedWellView.text = it["bfWell"] - homeView.deployedWellView.text = it["cfWell"] - homeView.allWellDataView.text = it["total"] - }) - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { - if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || - it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 - ) { - homeView.todoDataView.textSize = 36f - homeView.undeterminedDataView.textSize = 36f - homeView.inHandleDataView.textSize = 36f - homeView.completedDataView.textSize = 36f - } - homeView.todoDataView.text = it["beforeGet"] - homeView.undeterminedDataView.text = it["beforeConfirm"] - homeView.inHandleDataView.text = it["inHandle"] - homeView.completedDataView.text = it["over"] - }) return homeView } + private fun initMap(savedInstanceState: Bundle?) { + homeView.mapView.onCreate(savedInstanceState) + aMap = homeView.mapView.map + val uiSettings = aMap.uiSettings + uiSettings.isMyLocationButtonEnabled = true//设置默认定位按钮是否显示 + uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER + uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 + uiSettings.isRotateGesturesEnabled = false//不许地图随手势旋转角度 + //显示定位小蓝点 + val locationStyle = MyLocationStyle() + locationStyle.showMyLocation(true)//设置是否显示定位小蓝点 + locationStyle.interval(10 * 1000)////设置连续定位模式下的定位间隔，只在连续定位模式下生效。单位为毫秒 + aMap.myLocationStyle = locationStyle + aMap.isMyLocationEnabled = true + //注册地图缩放监听 + aMap.addOnCameraChangeListener(this) + } + + /***地图接口实现*********************************************************************************/ + override fun onCameraChange(p0: CameraPosition?) { + Log.d(kTag, "onCameraChange: ") + } + + override fun onCameraChangeFinish(p0: CameraPosition?) { +// resetMarks() + Log.d(kTag, "onCameraChangeFinish: ") + } + + override fun onMarkerClick(p0: Marker?): Boolean { + + return false + } + + /***以下是地图生命周期管理************************************************************************/ override fun onResume() { super.onResume() homeView.mapView.onResume() @@ -98,8 +141,6 @@ workOrderViewModel.countWorkOrderByState() } - /***以下是地图生命周期管理************************************************************************/ - override fun onPause() { super.onPause() homeView.mapView.onPause() diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 80f5c04..1df65f2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -11,7 +11,6 @@ import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.SaveKeyValues import com.casic.app.smartwell.view.AboutUsActivity -import com.casic.app.smartwell.view.CustomerServiceActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity import com.casic.app.smartwell.vm.UpdateVersionViewModel @@ -53,10 +52,6 @@ requireContext().navigatePageTo(HelpCenterActivity::class.java) } - customerServiceLayout.setOnClickListener { - requireContext().navigatePageTo(CustomerServiceActivity::class.java) - } - updateVersionLayout.setOnClickListener { updateVersionViewModel.updateVersion() } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 874e449..f19ae75 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch @@ -9,7 +8,6 @@ class WellListViewModel : BaseViewModel() { - private val kTag = "WellListViewModel" val listModel = MutableLiveData() fun obtainWellList( @@ -22,7 +20,9 @@ listModel.value = RetrofitServiceManager.obtainWellList( keywords, wellType, deptid, isAlarm, page ) - }, { - Log.d(kTag, "obtainWellList: ${it.printStackTrace()}") + }) + + fun obtainAllWell() = launch({ + listModel.value = RetrofitServiceManager.obtainAllWell() }) } \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 3f162a9..480894e 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -111,9 +111,7 @@ android:id="@+id/submitButton" style="@style/buttonStyle" android:layout_alignParentBottom="true" - android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_margin="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer_service.xml b/app/src/main/res/layout/activity_customer_service.xml deleted file mode 100644 index 766487d..0000000 --- a/app/src/main/res/layout/activity_customer_service.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_help_center.xml b/app/src/main/res/layout/activity_help_center.xml index 2b51b79..64dfc15 100644 --- a/app/src/main/res/layout/activity_help_center.xml +++ b/app/src/main/res/layout/activity_help_center.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@color/white" android:orientation="vertical" - tools:context=".view.CustomerServiceActivity"> + tools:context=".view.HelpCenterActivity"> diff --git a/app/src/main/res/layout/activity_user_detail.xml b/app/src/main/res/layout/activity_user_detail.xml index e6d8082..b536285 100644 --- a/app/src/main/res/layout/activity_user_detail.xml +++ b/app/src/main/res/layout/activity_user_detail.xml @@ -107,8 +107,7 @@ style="@style/buttonStyle" android:layout_alignParentBottom="true" android:layout_marginHorizontal="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" + android:layout_marginVertical="@dimen/dp_10" android:text="退出登录" /> diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 0a89b13..ed26092 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -46,15 +46,26 @@ - + - + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..96ea16c 100644 --- a/app/src/main/res/mipmap-hdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 --- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..96ea16c 100644 --- a/app/src/main/res/mipmap-mdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 --- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..96ea16c 100644 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 --- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..96ea16c 100644 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 --- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419..96ea16c 100644 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 --- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 00f7dfa..eb48ef2 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -12,6 +12,7 @@ 20dp 30dp 50dp + 80dp 100dp 200dp