开启鸿途信达广告；

正式服禁用wifi代理

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -34,7 +34,7 @@ public abstract class SheepSubscriber<T> implements Observer<T> {
 
     @Override
     public void onSubscribe(Disposable d) {
-        if (!NetUtil.isConnected(context)) {
+        if (!NetUtil.isConnected(context) || NetUtil.isWifiProxy()) {
             if (SheepApp.getInstance().getCurrentActivity() != null) {
                 SheepApp.getInstance().getCurrentActivity().runOnUiThread(this::showNoNetView);
             }

app/src/main/java/com/sheep/gamegroup/module/ad_htxd/model/ArticleAd.java

@@ -18,7 +18,7 @@ public class ArticleAd extends Article {
 
     public static final String FEED = "1D0JLRMA102V277730B60000552042FE";
     public static final int INDEX = 4;//放在position为4的位置，即第5个
-    public static final boolean showAd = false;//是否显示广告
+    public static final boolean showAd = true;//是否显示广告
 
     private NativeADDataInfo nativeADDataInfo;
     private PNative pNative;

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

@@ -6,6 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.os.Build;
+import android.text.TextUtils;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -86,4 +88,27 @@ public class NetUtil {
         intent.setAction("android.intent.action.VIEW");
         activity.startActivityForResult(intent, 0);
     }
+
+    /**
+     * 判断是否使用代理
+     * @return
+     */
+    public static boolean isWifiProxy() {
+        if(TestUtil.isTest()){
+            return false;
+        }
+        Context context = SheepApp.getInstance();
+        final boolean IS_ICS_OR_LATER = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
+        String proxyAddress;
+        int proxyPort;
+        if (IS_ICS_OR_LATER) {
+            proxyAddress = System.getProperty("http.proxyHost");
+            String portStr = System.getProperty("http.proxyPort");
+            proxyPort = Integer.parseInt((portStr != null ? portStr : "-1"));
+        } else {
+            proxyAddress = android.net.Proxy.getHost(context);
+            proxyPort = android.net.Proxy.getPort(context);
+        }
+        return (!TextUtils.isEmpty(proxyAddress)) && (proxyPort != -1);
+    }
 }