hanjing %!s(int64=6) %!d(string=hai) anos
pai
achega
c8d64eb1f5

+ 7 - 0
app/src/main/java/com/sheep/gamegroup/event/ValueCallback.java

@@ -0,0 +1,7 @@
+package com.sheep.gamegroup.event;
+
+import rx.functions.Action1;
+
+public interface ValueCallback extends Action1<String> {
+
+}

+ 0 - 1
app/src/main/java/com/sheep/gamegroup/module/game/util/FocusGameHelper.java

@@ -72,7 +72,6 @@ public class FocusGameHelper {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        Log.e("-----------", baseMessage.getData().toString());
                         JSONObject mainjson = JSONObject.parseObject(baseMessage.getData().toString());
                         if (mainjson.containsKey("game_center_banner")) {
                             JSONObject json = mainjson.getJSONObject("game_center_banner");

+ 33 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -16,6 +16,7 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -30,6 +31,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.sdk.app.PayTask;
+import com.bumptech.glide.Glide;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.mdad.sdk.mdsdk.common.AdData;
@@ -39,6 +41,7 @@ import com.sheep.gamegroup.absBase.IJumpWeb;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.EventTypes;
+import com.sheep.gamegroup.event.ValueCallback;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.greendao.download.AcceptTaskRecord;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
@@ -1086,6 +1089,36 @@ public class CommonUtil {
         api.sendReq(request);
     }
 
+    public void getConfigValue(String name, ValueCallback callback) {
+        String value = DataUtil.getInstance().getAsString(name, "");
+        SheepApp.getInstance().getNetComponent().getApiService().getNameUrl(name)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        Log.e("getConfigValue", baseMessage.getMsg());
+                        JSONObject mainjson = JSONObject.parseObject(baseMessage.getData().toString());
+                        if (mainjson.containsKey(name)) {
+                            String v = mainjson.getString(name);
+                            if (TextUtils.isEmpty(value)) {
+                                callback.call(v);
+                            }
+                            DataUtil.getInstance().putData(name, v);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+
+                    }
+                });
+        if (!TextUtils.isEmpty(value)) {
+            callback.call(value);
+        }
+    }
+
     /**
      * ACache.get(context).put("url_config", (JSONObject) urlConfig);
      * JSONObject url_config = (JSONObject)ACache.get(context).get("url_config");

+ 7 - 10
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -2001,7 +2001,7 @@ public class Jump2View {
     //分享
     public void tryShare(final Activity activity, String shareUrlKey, final String idName, final int id, final String description) {
         try {
-            CommonUtil.getInstance().initUrlConfigByNet(shareUrlKey, find_share_url -> {
+            CommonUtil.getInstance().getConfigValue(shareUrlKey, find_share_url -> {
                 String url = String.format(Locale.CHINA, "%s?%s=%d&invitation_code=%s", find_share_url, idName, id, DataUtil.getInstance().getInvitationCode());
                 new ShareLinkConfig().setLink(url).setDes(description).toShare(activity);
             });
@@ -2013,12 +2013,9 @@ public class Jump2View {
     //分享
     public void tryShare(final Activity activity, String shareUrlKey, final String idName, final int id) {
         try {
-            CommonUtil.getInstance().initUrlConfigByNet(shareUrlKey, new Action1<String>() {
-                @Override
-                public void call(String find_share_url) {
-                    String url = String.format(Locale.CHINA, "%s?%s=%d&invitation_code=%s", find_share_url, idName, id, DataUtil.getInstance().getInvitationCode());
-                    new ShareLinkConfig().setLink(url).toShare(activity);
-                }
+            CommonUtil.getInstance().getConfigValue(shareUrlKey, (find_share_url) -> {
+                String url = String.format(Locale.CHINA, "%s?%s=%d&invitation_code=%s", find_share_url, idName, id, DataUtil.getInstance().getInvitationCode());
+                new ShareLinkConfig().setLink(url).toShare(activity);
             });
         } catch (Exception e) {
             e.printStackTrace();
@@ -2773,7 +2770,7 @@ public class Jump2View {
      */
     public boolean gotoLongMao(Context activity) {
         if (!PackageUtil.isAppInstalled(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME)) {
-            CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_LMJC_URL, url -> {
+            CommonUtil.getInstance().getConfigValue(Config.KEY_LMJC_URL, url -> {
                 if (TextUtils.isEmpty(url)) {
                     ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("安装提示").setMsg("点击确定将下载" + Config.LONG_MAO_APP_REAL_NAME)
                             .setBtnLeftText("取消").setBtnRightText("确定").setCancelable(false)
@@ -2814,7 +2811,7 @@ public class Jump2View {
      * @param activity
      */
     public void gotoYfShop(Context activity) {
-        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YF_SHOP_URL, url -> {
+        CommonUtil.getInstance().getConfigValue(Config.KEY_YF_SHOP_URL, url -> {
             if (TextUtils.isEmpty(url))
                 url = SheepApp.getInstance().getConnectAddress().getYfShotHomeSheep();
             goWeb(activity, new WebParams(url, Config.YF_SHOP_NAME).tokenFirstUpperCase());
@@ -2822,7 +2819,7 @@ public class Jump2View {
     }
 
     public void gotoYYShop(Context activity) {
-        CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YY_SHOP_URL, url -> {
+        CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_URL, url -> {
             if (TextUtils.isEmpty(url))
                 url = "http://smallstation.9yan.io/yy_shop/#/pages/index/index";
             goWeb(activity, new WebParams(url, Config.YY_SHOP_NAME));

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -252,7 +252,7 @@ public class ActMyMoney extends BaseActivity {
                 Jump2View.getInstance().goWeb(this, new WebParams(Config.getUrlByPath(Config.PATH_MY_GAME_COUPON, "authorization", SpUtils.getToken(this)), "代金券中心"));
                 break;
             case R.id.my_money_mall_coupon_tag: {
-                CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YF_SHOP_URL, url -> {
+                CommonUtil.getInstance().getConfigValue(Config.KEY_YF_SHOP_URL, url -> {
                     if (TextUtils.isEmpty(url))
                         url = SheepApp.getInstance().getConnectAddress().getYfShotHomeSheep();
                     url += "/user.php?act=mycoupon&pf=android.sheep.app";

+ 12 - 18
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -521,28 +521,22 @@ public class FgtPersonalCenter extends BaseFragment {
                 Jump2View.getInstance().goAuditTastList(activity, null);
                 break;
             case R.id.proxy_service_layout://代理
-                CommonUtil.getInstance().initUrlConfigByNet("agenturl", new Action1<String>() {
-                    @Override
-                    public void call(String url) {
-                        agentUrl = url;
-                        if (!TextUtils.isEmpty(agentUrl))
-                            Jump2View.getInstance().goWeb(activity, agentUrl, "代理服务");
-                        else
-                            G.showToast(R.string.loading_data);
-                    }
+                CommonUtil.getInstance().getConfigValue("agenturl", (url) -> {
+                    agentUrl = url;
+                    if (!TextUtils.isEmpty(agentUrl))
+                        Jump2View.getInstance().goWeb(activity, agentUrl, "代理服务");
+                    else
+                        G.showToast(R.string.loading_data);
                 });
                 USER_AGENT.onEvent();
                 break;
             case R.id.faq_layout://FAQ帮助
-                CommonUtil.getInstance().initUrlConfigByNet("faqurl", new Action1<String>() {
-                    @Override
-                    public void call(String url) {
-                        faqUrl = url;
-                        if (!TextUtils.isEmpty(faqUrl))
-                            Jump2View.getInstance().goWeb(activity, faqUrl, "FAQ帮助");
-                        else
-                            Jump2View.getInstance().goWeb(activity, "http://smallstation.9yan.io/h5_faq/#/faq", "FAQ帮助");
-                    }
+                CommonUtil.getInstance().getConfigValue("faqurl", (url) -> {
+                    faqUrl = url;
+                    if (!TextUtils.isEmpty(faqUrl))
+                        Jump2View.getInstance().goWeb(activity, faqUrl, "FAQ帮助");
+                    else
+                        Jump2View.getInstance().goWeb(activity, "http://smallstation.9yan.io/h5_faq/#/faq", "FAQ帮助");
                 });
                 USER_FAQ.onEvent();
                 break;