diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java index c9c2cb1..2e8ec38 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainActivity.java @@ -166,7 +166,7 @@ public class MainActivity extends BaseActivity3 { StatusBarUtil.transparencyBar(MainActivity.this);//设置透明状态栏 //当选择外网时,并且网络连接不是wifi才会开启一键招回 if(Contans.IP.equals(Contans.network_type_extranet)){ - if(!NetworkUtil.isWifiNetWorkStatus(context)){ + if(NetworkUtil.canNetWorkConnect(context)&&NetworkUtil.isISPNetWorkConnect(context)){ initMqtt(); } } @@ -586,7 +586,7 @@ public class MainActivity extends BaseActivity3 { super.onResume(); if(Contans.IP.equals(Contans.network_type_extranet)){ - if(!NetworkUtil.isWifiNetWorkStatus(context)){ + if(NetworkUtil.canNetWorkConnect(context)&&NetworkUtil.isISPNetWorkConnect(context)){ if(mqttPublishServer==null){ mqttPublishServer = new MqttSSLPublishServer(this); } diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/MqttSSLPublishServer.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/MqttSSLPublishServer.java index a6b32fb..a17804f 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/MqttSSLPublishServer.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/MqttSSLPublishServer.java @@ -17,6 +17,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import com.bjzc.yfdxj.activity.MainActivity; import com.bjzc.yfdxj.bean.MemberCallBackBean; import com.bjzc.yfdxj.contans.Contans; import com.google.gson.Gson; @@ -160,6 +161,7 @@ public class MqttSSLPublishServer { String username =RSAUtils.decryptBASE64StrLocal(usernameTemp); String password = RSAUtils.decryptBASE64StrLocal(passwordTemp); String nfc = (String) SPUtils.get(context,Contans.NFCBM,String.valueOf("")); + String name = (String) SPUtils.get(context, Contans.USERNAME, String.valueOf("")); HashMap mapPush = new HashMap<>(); mapPush.put("username",username); @@ -167,6 +169,7 @@ public class MqttSSLPublishServer { mapPush.put("date",sd.format(new Date())); mapPush.put("appversion", getVersionName()); mapPush.put("nfc",nfc); + mapPush.put("name", name); Gson gson = new Gson(); try { //判断拦截状态,这里注意一下,如果没有这个判断,是非常坑的 diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NetworkUtil.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NetworkUtil.java index 1f2704e..0b485f4 100644 --- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NetworkUtil.java +++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/utils/NetworkUtil.java @@ -1,6 +1,7 @@ package com.bjzc.yfdxj.utils; + import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -38,7 +39,7 @@ public class NetworkUtil { * * @param context 上下文 */ - public static boolean isWifiNetWorkStatus(Context context) { + public static boolean isWifiNetWorkConnect(Context context) { NetworkInfo info = getActiveNetwork(context); if (info == null) { return false; @@ -49,6 +50,36 @@ public class NetworkUtil { return false; } + /** + * 当前网络是否连接的运营商网络 + * + * @param context 上下文 + */ + public static boolean isISPNetWorkConnect(Context context) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + if (info.getType() == ConnectivityManager.TYPE_WIFI) { + + }else{ + return true; + } + return false; + } + + /** + * 当前是否有网络连接 + * @param context 上下文 + */ + public static boolean canNetWorkConnect(Context context) { + NetworkInfo info = getActiveNetwork(context); + if (info == null) { + return false; + } + return true; + } + /** * 获取活动网络连接信息 *