diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c654d14..621c154 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.SafeTreeController"> + android:theme="@style/Theme.SafeTreeController" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c654d14..621c154 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.SafeTreeController"> + android:theme="@style/Theme.SafeTreeController" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt index df76f96..fcded27 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt @@ -14,7 +14,7 @@ */ suspend fun executeDeviceCommand(action: String, speed: Int): String { val httpConfig = SaveKeyValues.getValue( - LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, "" + LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, LocaleConstant.CAMERA_IP ) as String if (httpConfig == "") { Log.d(kTag, "executeDeviceCommand: httpConfig is null") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c654d14..621c154 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.SafeTreeController"> + android:theme="@style/Theme.SafeTreeController" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt index df76f96..fcded27 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt @@ -14,7 +14,7 @@ */ suspend fun executeDeviceCommand(action: String, speed: Int): String { val httpConfig = SaveKeyValues.getValue( - LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, "" + LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, LocaleConstant.CAMERA_IP ) as String if (httpConfig == "") { Log.d(kTag, "executeDeviceCommand: httpConfig is null") diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt index 215f307..5b536aa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt @@ -7,6 +7,5 @@ //相机IP const val CAMERA_IP = "192.168.10.137" - const val MAIN_RTSP_URL = "rtsp://${CAMERA_IP}:554" - const val SUB_RTSP_URL = "${MAIN_RTSP_URL}/h264/ch1/sub/av_stream" + const val SUB_RTSP_URL = "rtsp://${CAMERA_IP}:554/h264/ch1/sub/av_stream" } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c654d14..621c154 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.SafeTreeController"> + android:theme="@style/Theme.SafeTreeController" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt index df76f96..fcded27 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt @@ -14,7 +14,7 @@ */ suspend fun executeDeviceCommand(action: String, speed: Int): String { val httpConfig = SaveKeyValues.getValue( - LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, "" + LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, LocaleConstant.CAMERA_IP ) as String if (httpConfig == "") { Log.d(kTag, "executeDeviceCommand: httpConfig is null") diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt index 215f307..5b536aa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt @@ -7,6 +7,5 @@ //相机IP const val CAMERA_IP = "192.168.10.137" - const val MAIN_RTSP_URL = "rtsp://${CAMERA_IP}:554" - const val SUB_RTSP_URL = "${MAIN_RTSP_URL}/h264/ch1/sub/av_stream" + const val SUB_RTSP_URL = "rtsp://${CAMERA_IP}:554/h264/ch1/sub/av_stream" } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_other_settings.xml b/app/src/main/res/layout/fragment_other_settings.xml index 9f9b1a8..64d9a03 100644 --- a/app/src/main/res/layout/fragment_other_settings.xml +++ b/app/src/main/res/layout/fragment_other_settings.xml @@ -95,8 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:text="测试" - android:textSize="@dimen/sp_16" /> + android:text="测试" /> + android:theme="@style/Theme.SafeTreeController" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt index df76f96..fcded27 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/retrofit/RetrofitServiceManager.kt @@ -14,7 +14,7 @@ */ suspend fun executeDeviceCommand(action: String, speed: Int): String { val httpConfig = SaveKeyValues.getValue( - LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, "" + LocaleConstant.DEVICE_CONTROL_SERVER_CONFIG, LocaleConstant.CAMERA_IP ) as String if (httpConfig == "") { Log.d(kTag, "executeDeviceCommand: httpConfig is null") diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt index 215f307..5b536aa 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt @@ -7,6 +7,5 @@ //相机IP const val CAMERA_IP = "192.168.10.137" - const val MAIN_RTSP_URL = "rtsp://${CAMERA_IP}:554" - const val SUB_RTSP_URL = "${MAIN_RTSP_URL}/h264/ch1/sub/av_stream" + const val SUB_RTSP_URL = "rtsp://${CAMERA_IP}:554/h264/ch1/sub/av_stream" } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_other_settings.xml b/app/src/main/res/layout/fragment_other_settings.xml index 9f9b1a8..64d9a03 100644 --- a/app/src/main/res/layout/fragment_other_settings.xml +++ b/app/src/main/res/layout/fragment_other_settings.xml @@ -95,8 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_20" - android:text="测试" - android:textSize="@dimen/sp_16" /> + android:text="测试" />