diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java new file mode 100644 index 0000000..cab34bc --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java @@ -0,0 +1,229 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class DeviceListModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private Integer total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RowsModel { + private String carId; + private String description; + private String deviceCode; + private String deviceIp; + private String deviceModel; + private String deviceName; + private String devicePassword; + private String devicePort; + private String deviceStatus; + private String deviceUser; + private String id; + private String nvrChannel; + private String nvrIp; + private String nvrPassword; + private String nvrPort; + private String nvrUser; + private String setupDate; + private String ts; + private String valid; + + public String getCarId() { + return carId; + } + + public void setCarId(String carId) { + this.carId = carId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceIp() { + return deviceIp; + } + + public void setDeviceIp(String deviceIp) { + this.deviceIp = deviceIp; + } + + public String getDeviceModel() { + return deviceModel; + } + + public void setDeviceModel(String deviceModel) { + this.deviceModel = deviceModel; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDevicePassword() { + return devicePassword; + } + + public void setDevicePassword(String devicePassword) { + this.devicePassword = devicePassword; + } + + public String getDevicePort() { + return devicePort; + } + + public void setDevicePort(String devicePort) { + this.devicePort = devicePort; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceUser() { + return deviceUser; + } + + public void setDeviceUser(String deviceUser) { + this.deviceUser = deviceUser; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNvrChannel() { + return nvrChannel; + } + + public void setNvrChannel(String nvrChannel) { + this.nvrChannel = nvrChannel; + } + + public String getNvrIp() { + return nvrIp; + } + + public void setNvrIp(String nvrIp) { + this.nvrIp = nvrIp; + } + + public String getNvrPassword() { + return nvrPassword; + } + + public void setNvrPassword(String nvrPassword) { + this.nvrPassword = nvrPassword; + } + + public String getNvrPort() { + return nvrPort; + } + + public void setNvrPort(String nvrPort) { + this.nvrPort = nvrPort; + } + + public String getNvrUser() { + return nvrUser; + } + + public void setNvrUser(String nvrUser) { + this.nvrUser = nvrUser; + } + + public String getSetupDate() { + return setupDate; + } + + public void setSetupDate(String setupDate) { + this.setupDate = setupDate; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java new file mode 100644 index 0000000..cab34bc --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java @@ -0,0 +1,229 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class DeviceListModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private Integer total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RowsModel { + private String carId; + private String description; + private String deviceCode; + private String deviceIp; + private String deviceModel; + private String deviceName; + private String devicePassword; + private String devicePort; + private String deviceStatus; + private String deviceUser; + private String id; + private String nvrChannel; + private String nvrIp; + private String nvrPassword; + private String nvrPort; + private String nvrUser; + private String setupDate; + private String ts; + private String valid; + + public String getCarId() { + return carId; + } + + public void setCarId(String carId) { + this.carId = carId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceIp() { + return deviceIp; + } + + public void setDeviceIp(String deviceIp) { + this.deviceIp = deviceIp; + } + + public String getDeviceModel() { + return deviceModel; + } + + public void setDeviceModel(String deviceModel) { + this.deviceModel = deviceModel; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDevicePassword() { + return devicePassword; + } + + public void setDevicePassword(String devicePassword) { + this.devicePassword = devicePassword; + } + + public String getDevicePort() { + return devicePort; + } + + public void setDevicePort(String devicePort) { + this.devicePort = devicePort; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceUser() { + return deviceUser; + } + + public void setDeviceUser(String deviceUser) { + this.deviceUser = deviceUser; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNvrChannel() { + return nvrChannel; + } + + public void setNvrChannel(String nvrChannel) { + this.nvrChannel = nvrChannel; + } + + public String getNvrIp() { + return nvrIp; + } + + public void setNvrIp(String nvrIp) { + this.nvrIp = nvrIp; + } + + public String getNvrPassword() { + return nvrPassword; + } + + public void setNvrPassword(String nvrPassword) { + this.nvrPassword = nvrPassword; + } + + public String getNvrPort() { + return nvrPort; + } + + public void setNvrPort(String nvrPort) { + this.nvrPort = nvrPort; + } + + public String getNvrUser() { + return nvrUser; + } + + public void setNvrUser(String nvrUser) { + this.nvrUser = nvrUser; + } + + public String getSetupDate() { + return setupDate; + } + + public void setSetupDate(String setupDate) { + this.setupDate = setupDate; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 25c0b4e..9211b3a 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -82,6 +82,16 @@ ): String /** + * 获取车载云台列表 + */ + @POST("/system/busDeviceInfo/listPage") + suspend fun getDevices( + @Header("token") token: String, + @QueryMap limit: Map, + @QueryMap offset: Map, + ): String + + /** * 新增巡检过程点详情 */ @POST("/system/busPatrolTrack/add") diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java new file mode 100644 index 0000000..cab34bc --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java @@ -0,0 +1,229 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class DeviceListModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private Integer total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RowsModel { + private String carId; + private String description; + private String deviceCode; + private String deviceIp; + private String deviceModel; + private String deviceName; + private String devicePassword; + private String devicePort; + private String deviceStatus; + private String deviceUser; + private String id; + private String nvrChannel; + private String nvrIp; + private String nvrPassword; + private String nvrPort; + private String nvrUser; + private String setupDate; + private String ts; + private String valid; + + public String getCarId() { + return carId; + } + + public void setCarId(String carId) { + this.carId = carId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceIp() { + return deviceIp; + } + + public void setDeviceIp(String deviceIp) { + this.deviceIp = deviceIp; + } + + public String getDeviceModel() { + return deviceModel; + } + + public void setDeviceModel(String deviceModel) { + this.deviceModel = deviceModel; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDevicePassword() { + return devicePassword; + } + + public void setDevicePassword(String devicePassword) { + this.devicePassword = devicePassword; + } + + public String getDevicePort() { + return devicePort; + } + + public void setDevicePort(String devicePort) { + this.devicePort = devicePort; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceUser() { + return deviceUser; + } + + public void setDeviceUser(String deviceUser) { + this.deviceUser = deviceUser; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNvrChannel() { + return nvrChannel; + } + + public void setNvrChannel(String nvrChannel) { + this.nvrChannel = nvrChannel; + } + + public String getNvrIp() { + return nvrIp; + } + + public void setNvrIp(String nvrIp) { + this.nvrIp = nvrIp; + } + + public String getNvrPassword() { + return nvrPassword; + } + + public void setNvrPassword(String nvrPassword) { + this.nvrPassword = nvrPassword; + } + + public String getNvrPort() { + return nvrPort; + } + + public void setNvrPort(String nvrPort) { + this.nvrPort = nvrPort; + } + + public String getNvrUser() { + return nvrUser; + } + + public void setNvrUser(String nvrUser) { + this.nvrUser = nvrUser; + } + + public String getSetupDate() { + return setupDate; + } + + public void setSetupDate(String setupDate) { + this.setupDate = setupDate; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 25c0b4e..9211b3a 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -82,6 +82,16 @@ ): String /** + * 获取车载云台列表 + */ + @POST("/system/busDeviceInfo/listPage") + suspend fun getDevices( + @Header("token") token: String, + @QueryMap limit: Map, + @QueryMap offset: Map, + ): String + + /** * 新增巡检过程点详情 */ @POST("/system/busPatrolTrack/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 416d99e..0f109db 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -142,6 +142,18 @@ } /** + * 获取车载云台列表 + */ + suspend fun getDevices(): String { + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = 1 + return api.getDevices(AuthenticationHelper.token, limitMap, offsetMap) + } + + /** * 新增巡检过程点详情 */ suspend fun uploadPointDetail( diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java new file mode 100644 index 0000000..cab34bc --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java @@ -0,0 +1,229 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class DeviceListModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private Integer total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RowsModel { + private String carId; + private String description; + private String deviceCode; + private String deviceIp; + private String deviceModel; + private String deviceName; + private String devicePassword; + private String devicePort; + private String deviceStatus; + private String deviceUser; + private String id; + private String nvrChannel; + private String nvrIp; + private String nvrPassword; + private String nvrPort; + private String nvrUser; + private String setupDate; + private String ts; + private String valid; + + public String getCarId() { + return carId; + } + + public void setCarId(String carId) { + this.carId = carId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceIp() { + return deviceIp; + } + + public void setDeviceIp(String deviceIp) { + this.deviceIp = deviceIp; + } + + public String getDeviceModel() { + return deviceModel; + } + + public void setDeviceModel(String deviceModel) { + this.deviceModel = deviceModel; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDevicePassword() { + return devicePassword; + } + + public void setDevicePassword(String devicePassword) { + this.devicePassword = devicePassword; + } + + public String getDevicePort() { + return devicePort; + } + + public void setDevicePort(String devicePort) { + this.devicePort = devicePort; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceUser() { + return deviceUser; + } + + public void setDeviceUser(String deviceUser) { + this.deviceUser = deviceUser; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNvrChannel() { + return nvrChannel; + } + + public void setNvrChannel(String nvrChannel) { + this.nvrChannel = nvrChannel; + } + + public String getNvrIp() { + return nvrIp; + } + + public void setNvrIp(String nvrIp) { + this.nvrIp = nvrIp; + } + + public String getNvrPassword() { + return nvrPassword; + } + + public void setNvrPassword(String nvrPassword) { + this.nvrPassword = nvrPassword; + } + + public String getNvrPort() { + return nvrPort; + } + + public void setNvrPort(String nvrPort) { + this.nvrPort = nvrPort; + } + + public String getNvrUser() { + return nvrUser; + } + + public void setNvrUser(String nvrUser) { + this.nvrUser = nvrUser; + } + + public String getSetupDate() { + return setupDate; + } + + public void setSetupDate(String setupDate) { + this.setupDate = setupDate; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 25c0b4e..9211b3a 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -82,6 +82,16 @@ ): String /** + * 获取车载云台列表 + */ + @POST("/system/busDeviceInfo/listPage") + suspend fun getDevices( + @Header("token") token: String, + @QueryMap limit: Map, + @QueryMap offset: Map, + ): String + + /** * 新增巡检过程点详情 */ @POST("/system/busPatrolTrack/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 416d99e..0f109db 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -142,6 +142,18 @@ } /** + * 获取车载云台列表 + */ + suspend fun getDevices(): String { + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = 1 + return api.getDevices(AuthenticationHelper.token, limitMap, offsetMap) + } + + /** * 新增巡检过程点详情 */ suspend fun uploadPointDetail( diff --git a/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt new file mode 100644 index 0000000..6213e1a --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt @@ -0,0 +1,36 @@ +package com.casic.br.ktd.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.br.ktd.base.BaseApplication +import com.casic.br.ktd.extensions.separateResponseCode +import com.casic.br.ktd.extensions.toErrorMessage +import com.casic.br.ktd.model.DeviceListModel +import com.casic.br.ktd.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +/** + * Device（车载云台）相关 VM + * */ +class DeviceViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val deviceList = MutableLiveData() + + fun getDevices() = launch({ + val response = RetrofitServiceManager.getDevices() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + deviceList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index dcbd65c..606d691 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import com.casic.br.ktd.utils.LocaleConstant import com.casic.br.ktd.utils.RSAUtils import com.casic.br.ktd.view.LoginActivity +import com.casic.br.ktd.vm.DeviceViewModel import com.casic.br.ktd.vm.UserViewModel import com.casic.br.ktd.widgets.AlertControlDialog import com.casic.br.ktd.widgets.AlertMessageDialog @@ -29,6 +30,7 @@ class MinePageFragment : KotlinBaseFragment() { private lateinit var userViewModel: UserViewModel + private lateinit var deviceViewModel: DeviceViewModel private lateinit var rootDir: File override fun initViewBinding( @@ -79,6 +81,13 @@ binding.userRoleView.text = userRoleBuilder.toString() } } + + deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] + deviceViewModel.deviceList.observe(this) { + if (it.code == 200) { + binding.deviceModelView.text = it.data.rows[0].deviceModel + } + } } override fun initEvent() { @@ -159,6 +168,8 @@ val value = SaveKeyValues.getValue(LocaleConstant.CAR_NUMBER, "") as String binding.carNumberView.text = value + deviceViewModel.getDevices() + //计算本地缓存，TODO 后期需要考虑视频本地缓存清除 binding.clearCacheView.text = rootDir.calculateSize().formatFileSize() } diff --git a/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java new file mode 100644 index 0000000..cab34bc --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/DeviceListModel.java @@ -0,0 +1,229 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class DeviceListModel { + + private Integer code; + private DataModel data; + private String message; + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private Integer total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public static class RowsModel { + private String carId; + private String description; + private String deviceCode; + private String deviceIp; + private String deviceModel; + private String deviceName; + private String devicePassword; + private String devicePort; + private String deviceStatus; + private String deviceUser; + private String id; + private String nvrChannel; + private String nvrIp; + private String nvrPassword; + private String nvrPort; + private String nvrUser; + private String setupDate; + private String ts; + private String valid; + + public String getCarId() { + return carId; + } + + public void setCarId(String carId) { + this.carId = carId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceIp() { + return deviceIp; + } + + public void setDeviceIp(String deviceIp) { + this.deviceIp = deviceIp; + } + + public String getDeviceModel() { + return deviceModel; + } + + public void setDeviceModel(String deviceModel) { + this.deviceModel = deviceModel; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDevicePassword() { + return devicePassword; + } + + public void setDevicePassword(String devicePassword) { + this.devicePassword = devicePassword; + } + + public String getDevicePort() { + return devicePort; + } + + public void setDevicePort(String devicePort) { + this.devicePort = devicePort; + } + + public String getDeviceStatus() { + return deviceStatus; + } + + public void setDeviceStatus(String deviceStatus) { + this.deviceStatus = deviceStatus; + } + + public String getDeviceUser() { + return deviceUser; + } + + public void setDeviceUser(String deviceUser) { + this.deviceUser = deviceUser; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNvrChannel() { + return nvrChannel; + } + + public void setNvrChannel(String nvrChannel) { + this.nvrChannel = nvrChannel; + } + + public String getNvrIp() { + return nvrIp; + } + + public void setNvrIp(String nvrIp) { + this.nvrIp = nvrIp; + } + + public String getNvrPassword() { + return nvrPassword; + } + + public void setNvrPassword(String nvrPassword) { + this.nvrPassword = nvrPassword; + } + + public String getNvrPort() { + return nvrPort; + } + + public void setNvrPort(String nvrPort) { + this.nvrPort = nvrPort; + } + + public String getNvrUser() { + return nvrUser; + } + + public void setNvrUser(String nvrUser) { + this.nvrUser = nvrUser; + } + + public String getSetupDate() { + return setupDate; + } + + public void setSetupDate(String setupDate) { + this.setupDate = setupDate; + } + + public String getTs() { + return ts; + } + + public void setTs(String ts) { + this.ts = ts; + } + + public String getValid() { + return valid; + } + + public void setValid(String valid) { + this.valid = valid; + } + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index 25c0b4e..9211b3a 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -82,6 +82,16 @@ ): String /** + * 获取车载云台列表 + */ + @POST("/system/busDeviceInfo/listPage") + suspend fun getDevices( + @Header("token") token: String, + @QueryMap limit: Map, + @QueryMap offset: Map, + ): String + + /** * 新增巡检过程点详情 */ @POST("/system/busPatrolTrack/add") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 416d99e..0f109db 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -142,6 +142,18 @@ } /** + * 获取车载云台列表 + */ + suspend fun getDevices(): String { + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = 1 + return api.getDevices(AuthenticationHelper.token, limitMap, offsetMap) + } + + /** * 新增巡检过程点详情 */ suspend fun uploadPointDetail( diff --git a/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt new file mode 100644 index 0000000..6213e1a --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/vm/DeviceViewModel.kt @@ -0,0 +1,36 @@ +package com.casic.br.ktd.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.br.ktd.base.BaseApplication +import com.casic.br.ktd.extensions.separateResponseCode +import com.casic.br.ktd.extensions.toErrorMessage +import com.casic.br.ktd.model.DeviceListModel +import com.casic.br.ktd.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel + +/** + * Device（车载云台）相关 VM + * */ +class DeviceViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val deviceList = MutableLiveData() + + fun getDevices() = launch({ + val response = RetrofitServiceManager.getDevices() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + deviceList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + it.printStackTrace() + }) +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index ac2a394..51c0c2f 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -187,13 +187,13 @@ android:textSize="@dimen/sp_16" />