Merge pull request 'Доработка новых запросов для АПИ' (#12) from request-entities into master

Reviewed-on: #12

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/SensorEntity.kt

@@ -0,0 +1,16 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities
+
+
+data class SensorEntity(
+    val changed: Int,
+    val fav: Int,
+    val id: Int,
+    val mac: String,
+    val name: String,
+    val pub: Int,
+    val time: Int,
+    val trend: Int,
+    val type: Int,
+    val unit: String,
+    val value: Double
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/addLike/AddLikeRequestEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.addLike
+
+data class AddLikeRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/addLike/AddLikeResponseEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.addLike
+
+data class AddLikeResponseEntity(
+    val id: Int,
+    val liked: Int,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/appInit/AppInitRequestEntity.kt

@@ -0,0 +1,11 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.appInit
+
+data class AppInitRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val platform: String,
+    val utc: Int,
+    val uuid: String,
+    val version: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/appInit/AppInitResponseEntity.kt

@@ -0,0 +1,14 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.appInit
+
+data class AppInitResponseEntity(
+    val addr: String,
+    val favorites: List<Any>,
+    val lat: Double,
+    val latest: String,
+    val login: String,
+    val lon: Double,
+    val timestamp: Int,
+    val types: List<AppInitTypeEntity>,
+    val url: String,
+    val vip: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/appInit/AppInitTypeEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.appInit
+
+data class AppInitTypeEntity(
+    val name: String,
+    val type: Int,
+    val unit: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/bugReport/BugReportRequestEntity.kt

@@ -0,0 +1,12 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.bugReport
+
+data class BugReportRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val email: String,
+    val logs: String,
+    val mess: String,
+    val name: String,
+    val time: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/disLike/DisLikeRequestEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.disLike
+
+data class DisLikeRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/disLike/DisLikeResponseEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.disLike
+
+data class DisLikeResponseEntity(
+    val id: Int,
+    val liked: Int,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/mapBounds/MapBoundsDeviceEntity.kt

@@ -0,0 +1,12 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.mapBounds
+
+data class MapBoundsDeviceEntity(
+    val id: Int,
+    val lat: Double,
+    val lon: Double,
+    val name: String,
+    val time: Int,
+    val type: Int,
+    val unit: String,
+    val value: Double
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/mapBounds/MapBoundsRequestEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.mapBounds
+
+data class MapBoundsRequestEntity(
+    val api_key: String,
+    val bounds: List<Int>,
+    val cmd: String,
+    val lang: String,
+    val limit: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/mapBounds/MapBoundsResponseEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.mapBounds
+
+data class MapBoundsResponseEntity(
+    val devices: List<MapBoundsDeviceEntity>,
+    val webcams: List<MapBoundsWebcamEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/mapBounds/MapBoundsWebcamEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.mapBounds
+
+data class MapBoundsWebcamEntity(
+    val id: Int,
+    val image: String,
+    val lat: Double,
+    val lon: Double,
+    val name: String,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/nameSensor/NameSensorRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.nameSensor
+
+data class NameSensorRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val name: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/pubSensor/PubSensorRequestEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.pubSensor
+
+data class PubSensorRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/pubSensor/PubSensorResponseEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.pubSensor
+
+data class PubSensorResponseEntity(
+    val code: Int,
+    val id: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sendCommand/SendCommandRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sendCommand
+
+data class SendCommandRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val command: String,
+    val id: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sendComplaint/SendComplaintRequestEntity.kt

@@ -0,0 +1,13 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sendComplaint
+
+data class SendComplaintRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val email: String,
+    val id: Int,
+    val name: String,
+    val problem: String,
+    val time: Int,
+    val uuid: String,
+    val value: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sendMessage/SendMessageRequestEntity.kt

@@ -0,0 +1,12 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sendMessage
+
+data class SendMessageRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val email: String,
+    val mess: String,
+    val name: String,
+    val subj: String,
+    val uid: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsHistory/HistoryDataEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsHistory
+
+data class HistoryDataEntity(
+    val id: Int,
+    val time: Int,
+    val value: Double
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsHistory/HistorySensorEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsHistory
+
+data class HistorySensorEntity(
+    val id: Int,
+    val name: String,
+    val type: Int,
+    val unit: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsHistory/SensorsHistoryRequestEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsHistory
+
+data class SensorsHistoryRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val offset: Int,
+    val period: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsHistory/SensorsHistoryResponseEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsHistory
+
+data class SensorsHistoryResponseEntity(
+    val `data`: List<HistoryDataEntity>,
+    val sensors: List<HistorySensorEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsNearby/NearbyDeviceEntity.kt

@@ -0,0 +1,19 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsNearby
+
+import ru.nm17.narodmon.appNarodMonApiClient.entities.SensorEntity
+
+
+data class NearbyDeviceEntity(
+    val cmd: Int,
+    val distance: Double,
+    val id: Int,
+    val lat: Double,
+    val location: String,
+    val lon: Double,
+    val mac: String,
+    val my: Int,
+    val name: String,
+    val owner: String,
+    val sensors: List<SensorEntity>,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsNearby/SensorsNearbyRequestEntity.kt

@@ -0,0 +1,12 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsNearby
+
+data class SensorsNearbyRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val lat: Double,
+    val lon: Double,
+    val radius: Int,
+    val types: List<Int>,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsNearby/SensorsNearbyResponseEntity.kt

@@ -0,0 +1,5 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsNearby
+
+data class SensorsNearbyResponseEntity(
+    val devices: List<NearbyDeviceEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsOnDevice/SensorOnDeviceEntity.kt

@@ -0,0 +1,19 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsOnDevice
+
+import ru.nm17.narodmon.ui.entities.SensorEntity
+
+data class SensorOnDeviceEntity(
+    val cmd: Int,
+    val distance: Double,
+    val id: Int,
+    val info: String,
+    val location: String,
+    val mac: String,
+    val my: Int,
+    val name: String,
+    val owner: String,
+    val photo: String,
+    val sensors: List<SensorEntity>,
+    val site: String,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsOnDevice/SensorsOnDeviceRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsOnDevice
+
+data class SensorsOnDeviceRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val devices: List<Int>,
+    val lang: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsOnDevice/SensorsOnDeviceResponseEntity.kt

@@ -0,0 +1,5 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsOnDevice
+
+data class SensorsOnDeviceResponseEntity(
+    val devices: List<SensorOnDeviceEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsValues/SensorValueEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsValues
+
+data class SensorValueEntity(
+    val changed: Int,
+    val id: Int,
+    val time: Int,
+    val trend: Int,
+    val type: Int,
+    val value: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsValues/SensorsValuesRequestEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsValues
+
+data class SensorsValuesRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val sensors: List<Int>,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/sensorsValues/SensorsValuesResponseEntity.kt

@@ -0,0 +1,5 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.sensorsValues
+
+data class SensorsValuesResponseEntity(
+    val sensors: List<SensorValueEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userFavorites/FavoriteSensorEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userFavorites
+
+data class FavoriteSensorEntity(
+    val id: Int,
+    val name: String,
+    val time: Int,
+    val type: Int,
+    val value: Double
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userFavorites/FavoriteWebcamEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userFavorites
+
+data class FavoriteWebcamEntity(
+    val id: Int,
+    val image: String,
+    val name: String,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userFavorites/UserFavoritesRequestEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userFavorites
+
+data class UserFavoritesRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val sensors: List<Int>,
+    val uuid: String,
+    val webcams: List<Int>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userFavorites/UserFavoritesResponseEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userFavorites
+
+data class UserFavoritesResponseEntity(
+    val sensors: List<FavoriteSensorEntity>,
+    val webcams: List<FavoriteWebcamEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/CellEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class CellEntity(
+    val bssid: String,
+    val rssi: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/UserLocationByAddrRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class UserLocationByAddrRequestEntity(
+    val addr: String,
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/UserLocationByCellRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class UserLocationByCellRequestEntity(
+    val api_key: String,
+    val cells: List<CellEntity>,
+    val cmd: String,
+    val lang: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/UserLocationByCoordRequestEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class UserLocationByCoordRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val lat: Double,
+    val lon: Double,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/UserLocationByWifiRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class UserLocationByWifiRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val uuid: String,
+    val wifi: List<WifiEntity>
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/UserLocationResponseEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class UserLocationResponseEntity(
+    val addr: String,
+    val lat: Double,
+    val lon: Double
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLocation/WifiEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLocation
+
+data class WifiEntity(
+    val bssid: String,
+    val rssi: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLogon/UserLogonRequestEntity.kt

@@ -0,0 +1,10 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLogon
+
+data class UserLogonRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val hash: String,
+    val lang: String,
+    val login: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLogon/UserLogonResponseEntity.kt

@@ -0,0 +1,8 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLogon
+
+data class UserLogonResponseEntity(
+    val login: String,
+    val tz: Int,
+    val uid: Int,
+    val vip: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLogout/UserLogoutRequestEntity.kt

@@ -0,0 +1,7 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLogout
+
+data class UserLogoutRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/userLogout/UserLogoutResponseEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.userLogout
+
+data class UserLogoutResponseEntity(
+    val login: String,
+    val uid: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/weatherReport/WeatherReportRequestEntity.kt

@@ -0,0 +1,14 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.weatherReport
+
+data class WeatherReportRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val humid: String,
+    val lang: String,
+    val lat: Double,
+    val lon: Double,
+    val press: String,
+    val temp: String,
+    val uuid: String,
+    val wind: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/weatherReport/WeatherReportResponseEntity.kt

@@ -0,0 +1,5 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.weatherReport
+
+data class WeatherReportResponseEntity(
+    val result: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamImages/WebcamImageEntity.kt

@@ -0,0 +1,6 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamImages
+
+data class WebcamImageEntity(
+    val image: String,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamImages/WebcamImagesRequestEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamImages
+
+data class WebcamImagesRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val id: Int,
+    val limit: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamImages/WebcamImagesResponseEntity.kt

@@ -0,0 +1,9 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamImages
+
+data class WebcamImagesResponseEntity(
+    val distance: Double,
+    val id: Int,
+    val images: List<WebcamImageEntity>,
+    val location: String,
+    val name: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamsNearby/WebcamNearbyEntity.kt

@@ -0,0 +1,15 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamsNearby
+
+data class WebcamNearbyEntity(
+    val distance: Double,
+    val fav: Int,
+    val id: Int,
+    val image: String,
+    val lat: Double,
+    val location: String,
+    val lon: Double,
+    val my: Int,
+    val name: String,
+    val owner: String,
+    val time: Int
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamsNearby/WebcamsNearbyRequestEntity.kt

@@ -0,0 +1,11 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamsNearby
+
+data class WebcamsNearbyRequestEntity(
+    val api_key: String,
+    val cmd: String,
+    val lang: String,
+    val lat: Double,
+    val lon: Double,
+    val radius: Int,
+    val uuid: String
+)

app/src/main/java/ru/nm17/narodmon/appNarodMonApiClient/entities/webcamsNearby/WebcamsResponseEntity.kt

@@ -0,0 +1,5 @@
+package ru.nm17.narodmon.appNarodMonApiClient.entities.webcamsNearby
+
+data class WebcamsResponseEntity(
+    val webcams: List<WebcamNearbyEntity>
+)