删除提示信息

app/src/main/java/com/sheep/gamegroup/util/ApiJSONUtil.java

@@ -57,7 +57,7 @@ public class ApiJSONUtil {
                             .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                                 @Override
                                 public void onNext(BaseMessage baseMessage) {
-
+                                    G.showToast(baseMessage);
                                 }
 
                                 @Override

app/src/main/java/com/sheep/gamegroup/util/MacDeviceUtil.java

@@ -7,8 +7,8 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.Toast;
 
+import android.widget.Toast;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.InputStreamReader;
@@ -25,34 +25,39 @@ import java.util.Enumeration;
  */
 public class MacDeviceUtil {
     public static String getMac(Context context) {
-        String strMac = null;
+        String strMac;
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             Log.e("=====", "6.0以下");
-            Toast.makeText(context, "6.0以下", Toast.LENGTH_SHORT).show();
+            if (TestUtil.isDev())
+                Toast.makeText(context, "6.0以下", Toast.LENGTH_SHORT).show();
             strMac = getLocalMacAddressFromWifiInfo(context);
             return strMac;
         } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
                 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             Log.e("=====", "6.0以上7.0以下");
-            Toast.makeText(context, "6.0以上7.0以下", Toast.LENGTH_SHORT).show();
+            if (TestUtil.isDev())
+                Toast.makeText(context, "6.0以上7.0以下", Toast.LENGTH_SHORT).show();
             strMac = getMacAddress(context);
             return strMac;
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             Log.e("=====", "7.0以上");
             if (!TextUtils.isEmpty(getMacAddress())) {
                 Log.e("=====", "7.0以上1");
-                Toast.makeText(context, "7.0以上1", Toast.LENGTH_SHORT).show();
+                if (TestUtil.isDev())
+                    Toast.makeText(context, "7.0以上1", Toast.LENGTH_SHORT).show();
                 strMac = getMacAddress();
                 return strMac;
             } else if (!TextUtils.isEmpty(getMachineHardwareAddress())) {
                 Log.e("=====", "7.0以上2");
-                Toast.makeText(context, "7.0以上2", Toast.LENGTH_SHORT).show();
+                if (TestUtil.isDev())
+                    Toast.makeText(context, "7.0以上2", Toast.LENGTH_SHORT).show();
                 strMac = getMachineHardwareAddress();
                 return strMac;
             } else {
                 Log.e("=====", "7.0以上3");
-                Toast.makeText(context, "7.0以上3", Toast.LENGTH_SHORT).show();
+                if (TestUtil.isDev())
+                    Toast.makeText(context, "7.0以上3", Toast.LENGTH_SHORT).show();
                 strMac = getLocalMacAddressFromBusybox();
                 return strMac;
             }
@@ -63,15 +68,17 @@ public class MacDeviceUtil {
 
     /**
      * 根据wifi信息获取本地mac
+     *
      * @param context
      * @return
      */
-    public static String getLocalMacAddressFromWifiInfo(Context context){
+    public static String getLocalMacAddressFromWifiInfo(Context context) {
         WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         WifiInfo winfo = wifi.getConnectionInfo();
-        String mac =  winfo.getMacAddress();
+        String mac = winfo.getMacAddress();
         return mac;
     }
+
     /**
      * android 6.0及以上、7.0以下 获取mac地址
      *
@@ -169,6 +176,7 @@ public class MacDeviceUtil {
         }
         return builder.toString();
     }
+
     /**
      * 根据IP地址获取MAC地址
      *
@@ -194,6 +202,7 @@ public class MacDeviceUtil {
         }
         return strMacAddr;
     }
+
     /**
      * 获取移动设备本地IP
      *