|
@@ -8,9 +8,7 @@ import android.graphics.Color
|
|
|
import android.net.Uri
|
|
|
import android.os.*
|
|
|
import android.provider.Settings
|
|
|
-import android.telephony.PhoneStateListener
|
|
|
-import android.telephony.SignalStrength
|
|
|
-import android.telephony.TelephonyManager
|
|
|
+import android.telephony.*
|
|
|
import android.text.TextUtils
|
|
|
import android.util.Log
|
|
|
import android.view.View
|
|
@@ -19,7 +17,6 @@ import com.enation.javashop.net.engine.plugin.permission.RxPermissions
|
|
|
import com.enation.javashop.utils.base.tool.CommonTool
|
|
|
import com.enation.javashop.utils.base.widget.LoadingDialog
|
|
|
import com.google.common.base.Strings
|
|
|
-import com.wdkl.ncs.android.component.home.BuildConfig
|
|
|
import com.wdkl.ncs.android.component.home.R
|
|
|
import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
|
|
|
import com.wdkl.ncs.android.component.home.broadcast.MyMediaButtonReceiver
|
|
@@ -27,7 +24,6 @@ import com.wdkl.ncs.android.component.home.databinding.WatchActivityHome2Binding
|
|
|
import com.wdkl.ncs.android.component.home.launch.HomeLaunch
|
|
|
import com.wdkl.ncs.android.component.home.service.WdKeepAliveService
|
|
|
import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig
|
|
|
-import com.wdkl.ncs.android.component.home.ui.CallSingleActivity
|
|
|
import com.wdkl.ncs.android.component.home.util.*
|
|
|
import com.wdkl.ncs.android.lib.base.BaseApplication
|
|
|
import com.wdkl.ncs.android.lib.utils.Util
|
|
@@ -41,7 +37,6 @@ import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPre
|
|
|
import com.wdkl.ncs.android.middleware.model.ServerIpInfo
|
|
|
import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
|
|
|
import com.wdkl.ncs.android.middleware.model.dos.ChannelDO
|
|
|
-import com.wdkl.ncs.android.middleware.model.dos.ChannelImDO
|
|
|
import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
|
|
|
import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
|
|
|
import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
|
|
@@ -137,37 +132,21 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
-100 to -109 dBm, then it's generally considered poor signal (1 to 2 bars).
|
|
|
-110 to -120 dBm, then it's generally considered very poor signal (0 to 1 bar)
|
|
|
*/
|
|
|
- if (netType == NetHelper.NETWORK_4G) {
|
|
|
+ //if (netType == NetHelper.NETWORK_4G) {
|
|
|
if (teleManager != null) {
|
|
|
teleManager.listen(object : PhoneStateListener() {
|
|
|
override fun onSignalStrengthsChanged(signalStrength: SignalStrength) {
|
|
|
- if (NetHelper.getInstance()
|
|
|
- .getNetworkState(applicationContext) == NetHelper.NETWORK_NONE
|
|
|
- ) {
|
|
|
+ if (NetHelper.getInstance().getNetworkState(applicationContext) == NetHelper.NETWORK_NONE) {
|
|
|
tv_signal_strength.text = "网络断开"
|
|
|
} else {
|
|
|
- val signalinfo = signalStrength.toString()
|
|
|
- val parts = signalinfo.split(" ".toRegex()).toTypedArray()
|
|
|
- val ltedbm = parts[9].toInt()
|
|
|
- if (ltedbm >= -79) {
|
|
|
- tv_signal_strength.text = "网络极好"
|
|
|
- } else if (ltedbm >= -89 && ltedbm <= -80) {
|
|
|
- tv_signal_strength.text = "网络好"
|
|
|
- } else if (ltedbm >= -99 && ltedbm <= -90) {
|
|
|
- tv_signal_strength.text = "网络正常"
|
|
|
- } else if (ltedbm >= -109 && ltedbm <= -100) {
|
|
|
- tv_signal_strength.text = "网络较差"
|
|
|
- } else if (ltedbm >= -120 && ltedbm <= -110) {
|
|
|
- tv_signal_strength.text = "网络极差"
|
|
|
- }
|
|
|
+ tv_signal_strength.text = "网络正常"
|
|
|
}
|
|
|
- //Log.i(TAG, "网络:LTE 信号强度:$ltedbm======Detail:$signalinfo")
|
|
|
|
|
|
super.onSignalStrengthsChanged(signalStrength)
|
|
|
}
|
|
|
}, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
|
|
|
}
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
requestPermissions()
|
|
|
|