diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 8e6b97a..b4e78a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,6 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivityAlarmListBinding import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.extensions.formatToDate import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.model.AlarmListModel import com.casic.br.operationsite.vm.AlarmViewModel @@ -62,7 +61,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - alarmListAdapter.setRefreshData(dataRows) + alarmListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -71,7 +70,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - alarmListAdapter.setLoadMoreData(dataRows) + alarmListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -129,7 +128,7 @@ val diffTime = if (deltaT < 24) { "${deltaT}小时前" } else { - item.alarmTime.formatToDate() + item.alarmTime } val color = when (item.alarmStatusName) { diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 8e6b97a..b4e78a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,6 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivityAlarmListBinding import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.extensions.formatToDate import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.model.AlarmListModel import com.casic.br.operationsite.vm.AlarmViewModel @@ -62,7 +61,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - alarmListAdapter.setRefreshData(dataRows) + alarmListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -71,7 +70,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - alarmListAdapter.setLoadMoreData(dataRows) + alarmListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -129,7 +128,7 @@ val diffTime = if (deltaT < 24) { "${deltaT}小时前" } else { - item.alarmTime.formatToDate() + item.alarmTime } val color = when (item.alarmStatusName) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index be2c225..f8f11d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -21,8 +21,8 @@ import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,8 +49,8 @@ } override fun initEvent() { - val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) - val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) + val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 8e6b97a..b4e78a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,6 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivityAlarmListBinding import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.extensions.formatToDate import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.model.AlarmListModel import com.casic.br.operationsite.vm.AlarmViewModel @@ -62,7 +61,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - alarmListAdapter.setRefreshData(dataRows) + alarmListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -71,7 +70,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - alarmListAdapter.setLoadMoreData(dataRows) + alarmListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -129,7 +128,7 @@ val diffTime = if (deltaT < 24) { "${deltaT}小时前" } else { - item.alarmTime.formatToDate() + item.alarmTime } val color = when (item.alarmStatusName) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index be2c225..f8f11d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -21,8 +21,8 @@ import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,8 +49,8 @@ } override fun initEvent() { - val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) - val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) + val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 903b9d0..9ec789c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -47,7 +47,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - workSiteListAdapter.setRefreshData(dataRows) + workSiteListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -56,7 +56,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - workSiteListAdapter.setLoadMoreData(dataRows) + workSiteListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 8e6b97a..b4e78a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,6 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivityAlarmListBinding import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.extensions.formatToDate import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.model.AlarmListModel import com.casic.br.operationsite.vm.AlarmViewModel @@ -62,7 +61,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - alarmListAdapter.setRefreshData(dataRows) + alarmListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -71,7 +70,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - alarmListAdapter.setLoadMoreData(dataRows) + alarmListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -129,7 +128,7 @@ val diffTime = if (deltaT < 24) { "${deltaT}小时前" } else { - item.alarmTime.formatToDate() + item.alarmTime } val color = when (item.alarmStatusName) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index be2c225..f8f11d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -21,8 +21,8 @@ import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,8 +49,8 @@ } override fun initEvent() { - val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) - val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) + val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 903b9d0..9ec789c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -47,7 +47,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - workSiteListAdapter.setRefreshData(dataRows) + workSiteListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -56,7 +56,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - workSiteListAdapter.setLoadMoreData(dataRows) + workSiteListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c4e0d34..94d87d9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.widget.TextView @@ -211,6 +212,7 @@ } override fun onMarkerClick(marker: Marker?): Boolean { + Log.d(kTag, "onMarkerClick: ${marker?.options?.title}") marker?.apply { infoWindow = if (this.options.title.toString().startsWith("AQS")) { LayoutInflater.from(context).inflate(R.layout.popup_safety_tree_info, null) diff --git a/app/build.gradle b/app/build.gradle index 9ee2ec9..c9a928a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.0' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.1' implementation 'androidx.core:core-ktx:1.9.0' def base_version = "1.6.1" implementation "androidx.appcompat:appcompat:${base_version}" diff --git a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt index a1aa150..ead34f9 100644 --- a/app/src/main/java/com/casic/br/operationsite/extensions/String.kt +++ b/app/src/main/java/com/casic/br/operationsite/extensions/String.kt @@ -9,9 +9,7 @@ import top.zibin.luban.Luban import top.zibin.luban.OnCompressListener import java.io.File -import java.text.SimpleDateFormat import java.util.Locale -import java.util.regex.Pattern /** * String扩展方法 @@ -64,27 +62,4 @@ listener.onError(e) } }).launch() -} - - -fun String.getChannel(): String { - val regEx = "[^0-9]" - val p = Pattern.compile(regEx) - val m = p.matcher(this) - return m.replaceAll("").trim { it <= ' ' } -} - -fun String.formatToDate(): String { - if (this.isBlank()) { - return this - } - val simpleDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA) - val date = simpleDateFormat.parse(this) - - val dateFormat = SimpleDateFormat("MM-dd", Locale.CHINA) - return dateFormat.format(date) -} - -fun String.splitGasParam(): List { - return this.split(":") } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 8e6b97a..b4e78a3 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,6 @@ import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.ActivityAlarmListBinding import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.extensions.formatToDate import com.casic.br.operationsite.extensions.initImmersionBar import com.casic.br.operationsite.model.AlarmListModel import com.casic.br.operationsite.vm.AlarmViewModel @@ -62,7 +61,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - alarmListAdapter.setRefreshData(dataRows) + alarmListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -71,7 +70,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - alarmListAdapter.setLoadMoreData(dataRows) + alarmListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } @@ -129,7 +128,7 @@ val diffTime = if (deltaT < 24) { "${deltaT}小时前" } else { - item.alarmTime.formatToDate() + item.alarmTime } val color = when (item.alarmStatusName) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index be2c225..f8f11d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -21,8 +21,8 @@ import com.pengxh.kt.lite.extensions.createDownloadFileDir import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager -import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.FileDownloadManager +import com.pengxh.kt.lite.utils.LiteKitConstant import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import java.io.File @@ -49,8 +49,8 @@ } override fun initEvent() { - val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) - val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) + val index = intent.getIntExtra(LiteKitConstant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val urls = intent.getStringArrayListExtra(LiteKitConstant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 903b9d0..9ec789c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -47,7 +47,7 @@ val dataRows = it.data?.rows!! when { isRefresh -> { - workSiteListAdapter.setRefreshData(dataRows) + workSiteListAdapter.refresh(dataRows) binding.refreshLayout.finishRefresh() isRefresh = false } @@ -56,7 +56,7 @@ if (dataRows.size == 0) { "到底了，别拉了".show(this) } - workSiteListAdapter.setLoadMoreData(dataRows) + workSiteListAdapter.loadMore(dataRows) binding.refreshLayout.finishLoadMore() isLoadMore = false } diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index c4e0d34..94d87d9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -2,6 +2,7 @@ import android.graphics.Color import android.os.Bundle +import android.util.Log import android.view.LayoutInflater import android.view.View import android.widget.TextView @@ -211,6 +212,7 @@ } override fun onMarkerClick(marker: Marker?): Boolean { + Log.d(kTag, "onMarkerClick: ${marker?.options?.title}") marker?.apply { infoWindow = if (this.options.title.toString().startsWith("AQS")) { LayoutInflater.from(context).inflate(R.layout.popup_safety_tree_info, null) diff --git a/app/src/main/res/layout/activity_drag_map.xml b/app/src/main/res/layout/activity_drag_map.xml index 799d0e9..9fdda86 100644 --- a/app/src/main/res/layout/activity_drag_map.xml +++ b/app/src/main/res/layout/activity_drag_map.xml @@ -64,7 +64,7 @@