diff --git a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt index e81b7da..aaef036 100644 --- a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt @@ -36,12 +36,12 @@ //设置数据 val dataSet = LineDataSet(entries, entries[0].data.toString()) dataSet.setDrawCircles(true) - //线条颜色 - dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) //圆点颜色 dataSet.setCircleColor(R.color.redTextColor.convertColor(BaseApplication.obtainInstance())) - dataSet.setDrawFilled(true) - dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + //线条颜色 + dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + dataSet.setDrawFilled(false) +// dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER lineDataSets.add(dataSet) diff --git a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt index e81b7da..aaef036 100644 --- a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt @@ -36,12 +36,12 @@ //设置数据 val dataSet = LineDataSet(entries, entries[0].data.toString()) dataSet.setDrawCircles(true) - //线条颜色 - dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) //圆点颜色 dataSet.setCircleColor(R.color.redTextColor.convertColor(BaseApplication.obtainInstance())) - dataSet.setDrawFilled(true) - dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + //线条颜色 + dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + dataSet.setDrawFilled(false) +// dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER lineDataSets.add(dataSet) diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index ac4de0b..daa0f2e 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -103,7 +103,11 @@ } } - densityView.text = device.stregnth + val value = device.stregnth.toDouble().toInt() + val level = "$value%" + val ppm = "${value * 500}ppm" + densityView.text = "$level(相当于$ppm)" + lastDataView.text = device.uptime if (device.onlineState == "0") { deviceStateView.text = "离线" @@ -113,7 +117,11 @@ deviceStateView.setTextColor(Color.GREEN) } signalImageView.setBackgroundResource(device.rsrp.toSignalImage()) - deviceBatteryView.text = device.cell + deviceBatteryView.text = if (device.cell.isNullOrBlank()) { + "0%" + } else { + device.cell + "%" + } } }) } diff --git a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt index e81b7da..aaef036 100644 --- a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt @@ -36,12 +36,12 @@ //设置数据 val dataSet = LineDataSet(entries, entries[0].data.toString()) dataSet.setDrawCircles(true) - //线条颜色 - dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) //圆点颜色 dataSet.setCircleColor(R.color.redTextColor.convertColor(BaseApplication.obtainInstance())) - dataSet.setDrawFilled(true) - dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + //线条颜色 + dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + dataSet.setDrawFilled(false) +// dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER lineDataSets.add(dataSet) diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index ac4de0b..daa0f2e 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -103,7 +103,11 @@ } } - densityView.text = device.stregnth + val value = device.stregnth.toDouble().toInt() + val level = "$value%" + val ppm = "${value * 500}ppm" + densityView.text = "$level(相当于$ppm)" + lastDataView.text = device.uptime if (device.onlineState == "0") { deviceStateView.text = "离线" @@ -113,7 +117,11 @@ deviceStateView.setTextColor(Color.GREEN) } signalImageView.setBackgroundResource(device.rsrp.toSignalImage()) - deviceBatteryView.text = device.cell + deviceBatteryView.text = if (device.cell.isNullOrBlank()) { + "0%" + } else { + device.cell + "%" + } } }) } diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index a5b43ab..848ddcf 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -7,6 +7,7 @@ import com.casic.smarttube.extensions.dateToMonthDay import com.casic.smarttube.extensions.getQuarterOfYear import com.casic.smarttube.utils.ChartViewHelper +import com.casic.smarttube.utils.LoadingDialogHub import com.casic.smarttube.vm.DeviceViewModel import com.casic.smarttube.widgets.DateSelectDialog import com.github.mikephil.charting.data.Entry @@ -16,6 +17,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_history_data.* import java.util.* @@ -43,7 +45,12 @@ } override fun observeRequestState() { - + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) } override fun initEvent() { @@ -51,8 +58,7 @@ periodSpinner.setSelection(3) periodSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected( - parent: AdapterView<*>?, view: View?, - position: Int, id: Long + parent: AdapterView<*>?, view: View?, position: Int, id: Long ) { val time = System.currentTimeMillis() val calendar = Calendar.getInstance() diff --git a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt index e81b7da..aaef036 100644 --- a/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt +++ b/app/src/main/java/com/casic/smarttube/utils/ChartViewHelper.kt @@ -36,12 +36,12 @@ //设置数据 val dataSet = LineDataSet(entries, entries[0].data.toString()) dataSet.setDrawCircles(true) - //线条颜色 - dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) //圆点颜色 dataSet.setCircleColor(R.color.redTextColor.convertColor(BaseApplication.obtainInstance())) - dataSet.setDrawFilled(true) - dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + //线条颜色 + dataSet.color = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) + dataSet.setDrawFilled(false) +// dataSet.fillColor = R.color.redTextColor.convertColor(BaseApplication.obtainInstance()) dataSet.mode = LineDataSet.Mode.CUBIC_BEZIER lineDataSets.add(dataSet) diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index ac4de0b..daa0f2e 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -103,7 +103,11 @@ } } - densityView.text = device.stregnth + val value = device.stregnth.toDouble().toInt() + val level = "$value%" + val ppm = "${value * 500}ppm" + densityView.text = "$level(相当于$ppm)" + lastDataView.text = device.uptime if (device.onlineState == "0") { deviceStateView.text = "离线" @@ -113,7 +117,11 @@ deviceStateView.setTextColor(Color.GREEN) } signalImageView.setBackgroundResource(device.rsrp.toSignalImage()) - deviceBatteryView.text = device.cell + deviceBatteryView.text = if (device.cell.isNullOrBlank()) { + "0%" + } else { + device.cell + "%" + } } }) } diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index a5b43ab..848ddcf 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -7,6 +7,7 @@ import com.casic.smarttube.extensions.dateToMonthDay import com.casic.smarttube.extensions.getQuarterOfYear import com.casic.smarttube.utils.ChartViewHelper +import com.casic.smarttube.utils.LoadingDialogHub import com.casic.smarttube.vm.DeviceViewModel import com.casic.smarttube.widgets.DateSelectDialog import com.github.mikephil.charting.data.Entry @@ -16,6 +17,7 @@ import com.pengxh.kt.lite.extensions.* import com.pengxh.kt.lite.utils.Constant import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil +import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.activity_history_data.* import java.util.* @@ -43,7 +45,12 @@ } override fun observeRequestState() { - + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) } override fun initEvent() { @@ -51,8 +58,7 @@ periodSpinner.setSelection(3) periodSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected( - parent: AdapterView<*>?, view: View?, - position: Int, id: Long + parent: AdapterView<*>?, view: View?, position: Int, id: Long ) { val time = System.currentTimeMillis() val calendar = Calendar.getInstance() diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 116879a..4d8e265 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -59,14 +59,17 @@ beginTime: String?, endTime: String? ) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.obtainDeviceHistoryData(groupId, devcode, beginTime, endTime) val responseCode = response.separateResponseCode() if (responseCode == 200) { + loadState.value = LoadState.Success historyDataModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { + loadState.value = LoadState.Fail response.toErrorMessage().show(BaseApplication.obtainInstance()) } }, {