Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/sheep/gamegroup/view/activity/ActXinwanWeb.java

@@ -11,10 +11,13 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.TextView;
 
+import com.google.gson.JsonObject;
 import com.kfzs.duanduan.BaseCompatActivity;
+import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
@@ -124,7 +127,21 @@ public class ActXinwanWeb extends BaseCompatActivity {
             }
         });
         webViewSettings.setJavaScriptEnabled(true);
-        mWebView.loadUrl(assemblyData());
+        String url = SheepApp.getInstance().getConnectAddress().getAppUrl()+"v1/app/common_config/?type_name=xianwan";
+        OkHttpUtils.get()
+                .url(url)
+                .build()
+                .execute(new StringCallback() {
+                    @Override
+                    public void onError(Call call, Exception e, int i) {
+
+                    }
+
+                    @Override
+                    public void onResponse(String s, int i) {
+                        // mWebView.loadUrl(assemblyData());
+                    }
+                });
     }
 
     @Override