diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 76497ce..f40c29f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -25,6 +25,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -36,7 +37,7 @@ private val kTag = "HikVisionActivity" private val context = this@HikVisionActivity private val hkSDK by lazy { HCNetSDK.getInstance() } - private val wifiManager by lazy { applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager } + private val wifiManager by lazy { applicationContext.getSystemService() } private val wifiModels = ArrayList() private var previewHandle = -1 private var selectChannel = -1 @@ -68,7 +69,7 @@ //获取wifi列表 wifiModels.clear() - wifiManager.scanResults.forEach { res -> + wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { wifiModels.add(res) diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 76497ce..f40c29f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -25,6 +25,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -36,7 +37,7 @@ private val kTag = "HikVisionActivity" private val context = this@HikVisionActivity private val hkSDK by lazy { HCNetSDK.getInstance() } - private val wifiManager by lazy { applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager } + private val wifiManager by lazy { applicationContext.getSystemService() } private val wifiModels = ArrayList() private var previewHandle = -1 private var selectChannel = -1 @@ -68,7 +69,7 @@ //获取wifi列表 wifiModels.clear() - wifiManager.scanResults.forEach { res -> + wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { wifiModels.add(res) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index c8223fa..e3f6d3f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.content.Context import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities @@ -20,6 +19,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController @@ -36,7 +36,7 @@ private val kTag = "MethaneActivity" private val context = this@MethaneActivity - private val wifiManager by lazy { applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager } + private val wifiManager by lazy { applicationContext.getSystemService() } private val wifiModels = ArrayList() private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -70,7 +70,7 @@ //获取wifi列表 wifiModels.clear() - wifiManager.scanResults.forEach { res -> + wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { wifiModels.add(res) @@ -119,9 +119,7 @@ .setNetworkSpecifier(specifier) .build() - connectivityManager = context.getSystemService( - Context.CONNECTIVITY_SERVICE - ) as ConnectivityManager + connectivityManager = context.getSystemService() connectivityManager?.requestNetwork(request, networkCallback) } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 76497ce..f40c29f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -25,6 +25,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController import com.pengxh.kt.lite.widget.dialog.BottomActionSheet @@ -36,7 +37,7 @@ private val kTag = "HikVisionActivity" private val context = this@HikVisionActivity private val hkSDK by lazy { HCNetSDK.getInstance() } - private val wifiManager by lazy { applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager } + private val wifiManager by lazy { applicationContext.getSystemService() } private val wifiModels = ArrayList() private var previewHandle = -1 private var selectChannel = -1 @@ -68,7 +69,7 @@ //获取wifi列表 wifiModels.clear() - wifiManager.scanResults.forEach { res -> + wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { wifiModels.add(res) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index c8223fa..e3f6d3f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.view -import android.content.Context import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities @@ -20,6 +19,7 @@ import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController @@ -36,7 +36,7 @@ private val kTag = "MethaneActivity" private val context = this@MethaneActivity - private val wifiManager by lazy { applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager } + private val wifiManager by lazy { applicationContext.getSystemService() } private val wifiModels = ArrayList() private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -70,7 +70,7 @@ //获取wifi列表 wifiModels.clear() - wifiManager.scanResults.forEach { res -> + wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { wifiModels.add(res) @@ -119,9 +119,7 @@ .setNetworkSpecifier(specifier) .build() - connectivityManager = context.getSystemService( - Context.CONNECTIVITY_SERVICE - ) as ConnectivityManager + connectivityManager = context.getSystemService() connectivityManager?.requestNetwork(request, networkCallback) } } diff --git a/app/src/main/res/layout/activity_methane.xml b/app/src/main/res/layout/activity_methane.xml index afbacbd..1ab0ffc 100644 --- a/app/src/main/res/layout/activity_methane.xml +++ b/app/src/main/res/layout/activity_methane.xml @@ -111,7 +111,7 @@ android:id="@+id/lightStateView" android:layout_width="@dimen/dp_15" android:layout_height="@dimen/dp_15" - app:qmui_backgroundColor="@color/red" + app:qmui_backgroundColor="@color/green" app:qmui_borderWidth="0dp" />