diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0e59210..2063b92 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -1,5 +1,6 @@ + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0e59210..2063b92 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -1,5 +1,6 @@ + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0e59210..2063b92 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -1,5 +1,6 @@ + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0e59210..2063b92 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -1,5 +1,6 @@ + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> diff --git a/app/src/main/res/layout/item_well_operation_rv.xml b/app/src/main/res/layout/item_well_operation_rv.xml index 2071e25..5628a97 100644 --- a/app/src/main/res/layout/item_well_operation_rv.xml +++ b/app/src/main/res/layout/item_well_operation_rv.xml @@ -23,7 +23,7 @@ android:layout_marginEnd="@dimen/dp_5" android:background="@drawable/bg_solid_text_green_radius_5" android:paddingHorizontal="@dimen/dp_5" - android:paddingVertical="@dimen/dp_3" + android:paddingVertical="1dp" android:text="已布防" android:textColor="@color/white" /> diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index d0a2f49..95567db 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d8f7de..0d66103 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + @@ -27,7 +28,7 @@ android:label="@string/app_name" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/QMUI.Compat.NoActionBar" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { - override fun getItem(position: Int): Fragment { - return pages[position] - } + override fun getItem(position: Int) = pages[position] - override fun getCount(): Int { - return pages.size - } + override fun getCount() = pages.size - override fun getPageTitle(position: Int): CharSequence { - return pageTitles[position] - } + override fun getPageTitle(position: Int) = pageTitles[position] } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt index 4eeb06e..c327938 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/ViewPagerAdapter.kt @@ -9,7 +9,7 @@ private var pageList: List = list - override fun getItem(position: Int): Fragment = pageList[position] + override fun getItem(position: Int) = pageList[position] - override fun getCount(): Int = pageList.size + override fun getCount() = pageList.size } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt index 93da00d..6f1d122 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellListAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_list_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -43,13 +41,11 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onItemButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onItemButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt index 05d8dea..c35b4b1 100644 --- a/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt +++ b/app/src/main/java/com/casic/app/smartwell/adapter/WellOperationAdapter.kt @@ -16,11 +16,9 @@ private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder { - return ItemViewHolder( - layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) - ) - } + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( + layoutInflater.inflate(R.layout.item_well_operation_rv, parent, false) + ) override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { //绑定数据 @@ -45,16 +43,14 @@ holder.ownerShipView.text = String.format("权属单位：${rowsBean.deptName}") holder.wellLocationView.text = String.format("井位置：${rowsBean.position}") //绑定事件 - if (listener != null) { - holder.itemView.setOnClickListener { - listener!!.onClicked(position) - } - holder.operationButton.setOnClickListener { - listener!!.onOperationClicked(position) - } - holder.navigationButton.setOnClickListener { - listener!!.onNavigationButtonClicked(position) - } + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } + holder.operationButton.setOnClickListener { + listener?.onOperationClicked(position) + } + holder.navigationButton.setOnClickListener { + listener?.onNavigationButtonClicked(position) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index 3529312..ac030f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -36,7 +36,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this.replace("\\", "/")}" } @@ -48,7 +48,7 @@ if (this.isEmpty()) return this val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String return "$defaultValue/static/${this}" } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index dabbe10..f89555f 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -66,8 +66,7 @@ private var wellModels: MutableList = ArrayList() override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { homeView = inflater.inflate(R.layout.fragment_home, container, false) homeView.titleView.text = "首页" @@ -281,10 +280,7 @@ if (!isInRange) { clustersMarkers.add( GaoDeClusterMarkerView( - requireContext(), - it, - proj, - LocaleConstant.RADIUS_SIZE + requireContext(), it, proj, LocaleConstant.RADIUS_SIZE ) )//相距多少才聚合 } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f0f3539..8a9a150 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -16,13 +16,13 @@ const val FIVE_YEARS = 5L * 365 * 60 * 60 * 24 * 1000L const val RADIUS_SIZE = 100 //相距多少米才聚合，单位：米 - const val DISTANCE = 5 //两点间距离阈值，单位：米 const val PERMISSIONS_CODE = 999 const val PAGE_LIMIT = 20 const val ACCOUNT = "account" const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" + const val DEFAULT_SERVER = "http://111.198.10.15:11309" const val USER_DETAIL_MODEL = "userDetailModel" const val INTENT_PARAM = "intentParam" const val APP_AUTHORITY = "com.casic.app.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt index 7dd2576..76c37f1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/TimeLineItemDecoration.kt @@ -22,8 +22,7 @@ } override fun getItemOffsets( - outRect: Rect, view: View, - parent: RecyclerView, state: RecyclerView.State + outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State ) { super.getItemOffsets(outRect, view, parent, state) outRect.left = 16.5f.dp2px(context) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index c6b5e70..01fece1 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -7,7 +7,7 @@ /** * PublicKey校验 */ - @GET("/config/baseConfig") + @GET("/sys/config/baseConfig") suspend fun obtainPublicKey(): String /** @@ -17,7 +17,7 @@ * @param secretKey 加密后的密码 */ @FormUrlEncoded - @POST("/user/appLogin") + @POST("/sys/user/appLogin") suspend fun obtainLoginResult( @Field("username") account: String, @Field("password") secretKey: String @@ -161,7 +161,7 @@ * @param roleTips 角色类型，例：leader,member */ @FormUrlEncoded - @POST("/mgr/simplelist") + @POST("/sys/mgr/simplelist") suspend fun obtainSubordinate( @Header("token") token: String, @Field("hasMine") hasMine: String?, @@ -274,7 +274,7 @@ /** * 获取用户信息 */ - @GET("/user/info") + @GET("/sys/user/info") suspend fun obtainUserDetail(@Header("token") token: String): String /** @@ -294,7 +294,7 @@ /** * 退出登录 */ - @GET("/user/logout") + @GET("/sys/user/logout") suspend fun loginOut(@Header("token") token: String): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index d2859fc..99e655a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -15,7 +15,7 @@ private val api by lazy { val defaultValue = SaveKeyValues.getValue( LocaleConstant.DEFAULT_SERVER_CONFIG, - "http://111.198.10.15:11304" + LocaleConstant.DEFAULT_SERVER ) as String createRetrofit(defaultValue) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 006a9fe..fd8df9e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -21,14 +21,14 @@ class MainActivity : KotlinBaseActivity() { private var menuItem: MenuItem? = null - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() private var clickTime: Long = 0 init { - fragmentList.add(HomePageFragment()) - fragmentList.add(OrderListFragment()) - fragmentList.add(NoticePageFragment()) - fragmentList.add(MinePageFragment()) + fragmentPages.add(HomePageFragment()) + fragmentPages.add(OrderListFragment()) + fragmentPages.add(NoticePageFragment()) + fragmentPages.add(MinePageFragment()) } override fun initLayoutView(): Int = R.layout.activity_main @@ -62,8 +62,8 @@ } false } - mainViewPager.adapter = ViewPagerAdapter(fragmentList, supportFragmentManager) - mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 + mainViewPager.adapter = ViewPagerAdapter(fragmentPages, supportFragmentManager) + mainViewPager.offscreenPageLimit = fragmentPages.size //缓存页数 mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index 5db0c8a..cd6438d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -24,7 +24,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { private lateinit var workOrderViewModel: WorkOrderViewModel - private lateinit var jobId: String private val context: Context = this@OrderCompletedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_completed_detail @@ -39,13 +38,13 @@ } override fun initData() { - jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderViewModel.obtainWorkOrderDetail(id = jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(id = jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index 21fa8a1..16510b9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -10,7 +10,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -35,7 +34,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_in_handle_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -67,18 +65,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!!//初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -183,7 +178,7 @@ imageAdapter.setImageList(urls) imageGridView.adapter = imageAdapter imageGridView.setOnItemClickListener { _, _, position, _ -> - if (urls[position].isEmpty()) { + if (urls[position].isBlank()) { "图片加载失败，无法查看大图".show(context) } else { context.navigatePageTo(position, urls) @@ -290,9 +285,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.completeWorkOrder( - id = orderId, - handleMessage = state, - handlePhotos = imagePaths.reformat() + orderId, state, imagePaths.reformat() ) } @@ -350,7 +343,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -422,7 +422,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -485,22 +484,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index fd3b02f..4700479 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -9,7 +9,6 @@ import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.GridLayoutManager import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener import com.casic.app.smartwell.extensions.* @@ -33,7 +32,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.AlertMessageDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog import kotlinx.android.synthetic.main.activity_order_not_confirmed_detail.* import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -68,18 +66,15 @@ override fun initData() { val jobId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! //初始化图片九宫格 - imageAdapter = EditableImageAdapter(this, 3) - imageAdapter.setImageMargins(20f, 20f, 3f) - addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel.obtainWorkOrderDetail(jobId) } @@ -194,7 +189,7 @@ return } operationViewModel.transferWorkOrder( - id = orderId, userId = personBean.id!! + orderId, personBean.id!! ) } @@ -250,10 +245,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { operationViewModel.confirmWorkOrder( - id = orderId, - firstState = state, - firstStatePhotos = imagePaths.reformat(), - needHandle = needHandle + orderId, state, imagePaths.reformat(), needHandle ) } @@ -311,7 +303,14 @@ } }) uploadImageViewModel.loadState.observe(this, { - dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) //转单状态处理 @@ -383,7 +382,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - showLoadingDialog(context, "图片上传中，请稍后...") if (result == null) { "选择照片失败，请重试".show(context) return @@ -446,22 +444,4 @@ } }) } - - private var loadingDialog: QMUITipDialog? = null - - fun showLoadingDialog(context: Context?, message: String?) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - loadingDialog!!.show() - } - - fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } - } - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index 9e8a680..e41f751 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -124,7 +124,7 @@ "窨井ID异常，无法导航".show(context) return@setOnClickListener } - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) } wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { @@ -135,9 +135,7 @@ "窨井经纬度异常，无法开启导航".show(context) } else { Poi( - orderDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + orderDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt index 23f94dd..97b7a7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OvertimeOrderActivity.kt @@ -17,11 +17,11 @@ class OvertimeOrderActivity : KotlinBaseActivity() { - private var fragmentList: ArrayList = ArrayList() + private var fragmentPages: ArrayList = ArrayList() init { - fragmentList.add(OvertimeNotAcceptFragment()) - fragmentList.add(OvertimeNotHandleFragment()) + fragmentPages.add(OvertimeNotAcceptFragment()) + fragmentPages.add(OvertimeNotHandleFragment()) } override fun initLayoutView(): Int = R.layout.activity_order_overtime @@ -38,12 +38,10 @@ override fun initData() { val topViewPagerAdapter = TopViewPagerAdapter( - supportFragmentManager, - LocaleConstant.OVER_TIME_PAGE_TITLES, - fragmentList + supportFragmentManager, LocaleConstant.OVER_TIME_PAGE_TITLES, fragmentPages ) //页面永不销毁 - overTimeViewPager.offscreenPageLimit = fragmentList.size + overTimeViewPager.offscreenPageLimit = fragmentPages.size overTimeViewPager.adapter = topViewPagerAdapter overTimeTabLayout.setupWithViewPager(overTimeViewPager) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 1a1c587..956592f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -60,7 +60,7 @@ } override fun initEvent() { - contentTypeViewModel.obtainAlarmContentType(alarmType = "1") + contentTypeViewModel.obtainAlarmContentType("1") contentTypeViewModel.listModel.observe(this, { if (it.code == 200) { //构造一个默认值 @@ -105,12 +105,10 @@ } val levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( - parent: FlowLayout?, - position: Int, map: Map? + parent: FlowLayout?, position: Int, map: Map? ): View { val tagView = inflater.inflate( - R.layout.item_tag_flowlayout, - alarmLevelLayout, false + R.layout.item_tag_flowlayout, alarmLevelLayout, false ) as TextView tagView.text = levelMaps[position]["name"] return tagView @@ -138,8 +136,7 @@ orderStatusAdapter = object : TagAdapter(orderStatusModels) { override fun getView( - parent: FlowLayout?, - position: Int, bean: OrderStatusModel.DataBean? + parent: FlowLayout?, position: Int, bean: OrderStatusModel.DataBean? ): View { val tagView = inflater.inflate( R.layout.item_tag_flowlayout, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index ada7e69..258566b 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -59,10 +59,11 @@ searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + + obtainSearchResult() } override fun initEvent() { - obtainSearchResult(args, pageIndex) searchOrderViewModel.listModel.observe(this, { if (it.code == 200) { val dataRows = it.data?.rows @@ -102,12 +103,12 @@ isRefresh = true //刷新之后页码重置 pageIndex = 1 - obtainSearchResult(args, pageIndex) + obtainSearchResult() } resultRefreshLayout.setOnLoadMoreListener { isLoadMore = true pageIndex++ - obtainSearchResult(args, pageIndex) + obtainSearchResult() } //接单状态处理 @@ -136,8 +137,10 @@ val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(this) - .setFlowItems(orderFlow).build().show() + TimeLineBottomSheet.Builder() + .setContext(this) + .setFlowItems(orderFlow) + .build().show() } else { "抱歉，无法查到该工单的流转记录".show(this) } @@ -145,7 +148,7 @@ }) } - private fun obtainSearchResult(args: ArrayList, pageIndex: Int) { + private fun obtainSearchResult() { searchOrderViewModel.obtainSearchResult( keywords = args[0], alarmContent = args[1], @@ -164,7 +167,8 @@ } else { //首次加载数据 if (dataBeans.size == 0) { emptyView!!.showEmptyPage { - obtainSearchResult(args, pageIndex) + pageIndex = 1 + obtainSearchResult() } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index cc92ebb..82ee58e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -43,7 +43,7 @@ override fun initData() { val wellId = intent.getStringExtra(LocaleConstant.INTENT_PARAM)!! wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(wellId) //监控内容 monitorLayout.setOnClickListener { @@ -121,9 +121,7 @@ return@setOnClickListener } Poi( - wellDetail.position, - LatLng(lat.toDouble(), lng.toDouble()), - "" + wellDetail.position, LatLng(lat.toDouble(), lng.toDouble()), "" ).showRouteOnMap(this) } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 37df3bb..446b0f0 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -46,7 +46,7 @@ if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(wellId) } } else { emptyView!!.hide() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index daa93dc..847164c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -60,10 +60,16 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + + wellViewModel.obtainWellType() + } + + override fun onResume() { + obtainWellList() + super.onResume() } override fun initEvent() { - wellViewModel.obtainWellType() wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> @@ -81,7 +87,7 @@ easyPopupWindow.setupPopupData(items) } }) - obtainWellList() + //数据监听 wellListViewModel.listModel.observe(this, { if (it.code == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 9f0d398..ad1ad98 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt index 751657d..bfdd91f 100644 --- a/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt +++ b/app/src/main/java/com/casic/app/smartwell/widgets/GaoDeClusterMarkerView.kt @@ -17,8 +17,7 @@ import java.util.* class GaoDeClusterMarkerView( - private val context: Context, firstMarkers: MarkerOptions, - projection: Projection, gridSize: Int + private val context: Context, firstMarkers: MarkerOptions, projection: Projection, gridSize: Int ) { //当前可观区域里的 聚合过之后的集合 private val includeMarkers: ArrayList @@ -67,8 +66,7 @@ // 设置marker位置 options.position( LatLng( - includeMarkers[0].position.latitude, - includeMarkers[0].position.longitude + includeMarkers[0].position.latitude, includeMarkers[0].position.longitude ) ) } else { // 聚合的时候 diff --git a/app/src/main/res/layout/activity_change_pwd.xml b/app/src/main/res/layout/activity_change_pwd.xml index 8007bd1..5bc4d0f 100644 --- a/app/src/main/res/layout/activity_change_pwd.xml +++ b/app/src/main/res/layout/activity_change_pwd.xml @@ -108,7 +108,10 @@ android:id="@+id/submitButton" style="@style/MainButtonStyle" android:layout_alignParentBottom="true" - android:layout_margin="20dp" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="20dp" android:text="提\u3000\u3000交" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 0e59210..2063b92 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -1,5 +1,6 @@ + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> + android:nestedScrollingEnabled="false" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="3" /> diff --git a/app/src/main/res/layout/item_well_operation_rv.xml b/app/src/main/res/layout/item_well_operation_rv.xml index 2071e25..5628a97 100644 --- a/app/src/main/res/layout/item_well_operation_rv.xml +++ b/app/src/main/res/layout/item_well_operation_rv.xml @@ -23,7 +23,7 @@ android:layout_marginEnd="@dimen/dp_5" android:background="@drawable/bg_solid_text_green_radius_5" android:paddingHorizontal="@dimen/dp_5" - android:paddingVertical="@dimen/dp_3" + android:paddingVertical="1dp" android:text="已布防" android:textColor="@color/white" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f1a040f..14c1838 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,9 +3,6 @@