From e791cb84cc7b01b6d35df4d889d022e12105022a Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 24 Aug 2021 15:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E4=BF=A1=E5=8F=B7=E5=8A=A0tt?= =?UTF-8?q?s=E6=92=AD=E6=8A=A5=E6=8F=90=E7=A4=BA(=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE,=E9=9C=80=E6=B1=82=E6=97=A0tts=E6=92=AD?= =?UTF-8?q?=E6=8A=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/utils/NetworkStatusUtil.java | 40 +++++++++++++++---- .../mogo/module/check/view/CheckActivity.java | 29 ++++++-------- 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java index 1ab5967151..9dcc1b03d0 100644 --- a/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java +++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/network/utils/NetworkStatusUtil.java @@ -13,6 +13,7 @@ import android.util.Log; import com.mogo.utils.CommonUtils; +import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,12 +27,11 @@ public class NetworkStatusUtil { private static PhoneStatListener phoneStatListener; private static int mSignalStrength; private static SignalStrength signal; - + private static NetWorkStatus netWorkStatus1 = new NetWorkStatus(); /** * 监听网络强度 */ - public static String networkState(Context context) { - + public static NetWorkStatus networkState(Context context) { ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo info = connectivityManager.getActiveNetworkInfo(); if (info != null && info.isAvailable()) { @@ -48,7 +48,9 @@ public class NetworkStatusUtil { } else { Log.e("CheckActivity", "getNetWorkInfo: 信号强度弱"); } - return String.valueOf(mSignalStrength); + netWorkStatus1.status = "WiFi"; + netWorkStatus1.mSignalStrength = mSignalStrength; + return netWorkStatus1; case ConnectivityManager.TYPE_MOBILE: TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); if (telephonyManager == null) { @@ -86,12 +88,16 @@ public class NetworkStatusUtil { } mSignalStrength = signal.getGsmSignalStrength(); } - return String.valueOf(mSignalStrength); + netWorkStatus1.status = "移动网络"; + netWorkStatus1.mSignalStrength = mSignalStrength; + return netWorkStatus1; } } else { - return "UNKNOWN"; + netWorkStatus1.status = "UNKNOWN"; + return netWorkStatus1; } - return "UNKNOWN"; + netWorkStatus1.status = "UNKNOWN"; + return netWorkStatus1; } /** @@ -110,6 +116,26 @@ public class NetworkStatusUtil { } } + static public class NetWorkStatus implements Serializable { + String status; + int mSignalStrength; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public int getSignalStrength() { + return mSignalStrength; + } + + public void setSignalStrength(int signalStrength) { + mSignalStrength = signalStrength; + } + } } diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java index 350807400b..abf26d6971 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -11,11 +11,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Rect; import android.os.Bundle; -import android.os.Handler; import android.util.Log; import android.view.View; -import android.view.animation.AnimationSet; -import android.widget.Button; import android.widget.ImageView; import android.widget.ProgressBar; @@ -23,18 +20,13 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.check.R; import com.mogo.module.check.model.CheckItemInfo; -import com.mogo.module.check.net.CheckApiServices; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.MogoModulePaths; -import com.mogo.module.common.constants.HostConst; import com.mogo.module.common.view.ImageViewClipBounds; import com.mogo.module.common.view.SpacesItemDecoration; -import com.mogo.service.MogoServicePaths; +import com.mogo.utils.AssetsUtils; import com.mogo.utils.CommonUtils; -import com.mogo.utils.UiThreadHandler; import com.mogo.utils.network.utils.NetworkStatusUtil; import com.tencent.bugly.beta.Beta; import com.tencent.bugly.beta.UpgradeInfo; @@ -54,7 +46,7 @@ public class CheckActivity extends AppCompatActivity { private RecyclerView mRecyclerView; private ArrayList dataArrayList = new ArrayList(); private Context context; - private static String mSignalStrength; + private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus; private ImageView mImageView; private String packageName = "com.mogo.launcher.f"; //车模 @@ -316,7 +308,7 @@ public class CheckActivity extends AppCompatActivity { CheckItemInfo.DetailItem netItem = new CheckItemInfo.DetailItem(); netItem.setTitle("网络状态"); - netItem.setValue(mSignalStrength); + netItem.setValue(String.valueOf(sNetWorkStatus.getSignalStrength())); list.add(netItem); CheckItemInfo.DetailItem batteryItem = new CheckItemInfo.DetailItem(); @@ -343,17 +335,20 @@ public class CheckActivity extends AppCompatActivity { /** * 网络 */ - public String netStatus() { + public NetworkStatusUtil.NetWorkStatus netStatus() { //网络类型 String networkType = CommonUtils.getNetworkType(context); //网络强度 - if (mSignalStrength != "UNKNOWN") { - mSignalStrength = NetworkStatusUtil.networkState(context); - Log.d(TAG, "网络类型:" + networkType + "网络强度:" + mSignalStrength); + if (sNetWorkStatus.getStatus() != "UNKNOWN") { + Log.d(TAG, "网络类型:" + networkType + "网络强度:" + sNetWorkStatus.getSignalStrength()); + if (sNetWorkStatus.getSignalStrength() <= -90) { + AIAssist.getInstance(context).speakTTSVoice("网络信号差"); + } } else { Log.d(TAG, "网络未连接"); + AIAssist.getInstance(context).speakTTSVoice("网络未连接"); } - return mSignalStrength; + return sNetWorkStatus; }