diff --git a/app/src/main/assets/DeviceParameter.json b/app/src/main/assets/DeviceParameter.json index 203bc53..7226753 100644 --- a/app/src/main/assets/DeviceParameter.json +++ b/app/src/main/assets/DeviceParameter.json @@ -1,29 +1,29 @@ [ { - "deviceName": "AQS001", + "deviceName": "安全树一", "aiServerIp": "192.168.10.141", "wifi": "YTJ_010001_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.151" }, { - "deviceName": "AQS002", + "deviceName": "安全树二", "aiServerIp": "192.168.10.139", - "wifi": "YTJ010002_5G", + "wifi": "YTJ-010002_5G", "pwd": "zhsz20311hw", "cameraIp": "192.168.10.137" }, { - "deviceName": "AQS003", + "deviceName": "安全树三", "aiServerIp": "192.168.10.143", - "wifi": "YTJ010003_5G", + "wifi": "YTJ_010003_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.153" }, { - "deviceName": "AQS004", + "deviceName": "安全树四", "aiServerIp": "192.168.10.144", - "wifi": "YTJ010004_5G", + "wifi": "YTJ_010004_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.154" } diff --git a/app/src/main/assets/DeviceParameter.json b/app/src/main/assets/DeviceParameter.json index 203bc53..7226753 100644 --- a/app/src/main/assets/DeviceParameter.json +++ b/app/src/main/assets/DeviceParameter.json @@ -1,29 +1,29 @@ [ { - "deviceName": "AQS001", + "deviceName": "安全树一", "aiServerIp": "192.168.10.141", "wifi": "YTJ_010001_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.151" }, { - "deviceName": "AQS002", + "deviceName": "安全树二", "aiServerIp": "192.168.10.139", - "wifi": "YTJ010002_5G", + "wifi": "YTJ-010002_5G", "pwd": "zhsz20311hw", "cameraIp": "192.168.10.137" }, { - "deviceName": "AQS003", + "deviceName": "安全树三", "aiServerIp": "192.168.10.143", - "wifi": "YTJ010003_5G", + "wifi": "YTJ_010003_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.153" }, { - "deviceName": "AQS004", + "deviceName": "安全树四", "aiServerIp": "192.168.10.144", - "wifi": "YTJ010004_5G", + "wifi": "YTJ_010004_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.154" } diff --git a/app/src/main/res/layout/activity_device_control_by_native.xml b/app/src/main/res/layout/activity_device_control_by_native.xml index b491b9a..55ab9ce 100644 --- a/app/src/main/res/layout/activity_device_control_by_native.xml +++ b/app/src/main/res/layout/activity_device_control_by_native.xml @@ -87,7 +87,6 @@ android:orientation="vertical">