Ver código fonte

new game center

hanjing 6 anos atrás
pai
commit
da2e65bc5f

+ 6 - 1
app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -80,9 +80,14 @@ public class FgtGameCenter extends BaseFragment {
     private void initView() {
 //        backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
         TitleFragmentListAdapter mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
-        mAdapter.add(new FgtPlayGame(), "玩转游戏");
+//        mAdapter.add(new FgtPlayGame(), "玩转游戏");
 //        mAdapter.add(new com.sheep.gamegroup.view.fragment.FgtGiftCenter(), "礼包中心");
         if (EmulatorDetectUtil.isEmulator()) {
+            mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_HOME))), "玩转游戏");
+        } else {
+            mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_HOME))), "玩转游戏");
+        }
+        if (EmulatorDetectUtil.isEmulator()) {
             mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
         } else {
             mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");

+ 5 - 5
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -263,7 +263,7 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"协议跳转", "复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
+        final String[] items = {"测试内部h5", "协议跳转", "复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
                 "测试跳转","support包尝试创建桌面快捷方式","判断Launcher是否支持创建桌面快捷方式","判断是否添加快捷入口","判断是否添加商城快捷入口","显示快捷方式设置对话框",
                 "跳转QQ", "跳转QQ群", "尝试获取通讯录", "测试有范","测试有范6.0","测试有范7.0","测试有范8.0", "测试设备信息", "下载视频测试", "爱奇艺VIP会员", "分享我的签名的小绵羊apk", "分享当前小绵羊apk",
                 "测试升级对话框", "少数民族姓名", "开启皮肤", "不开启皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
@@ -272,7 +272,7 @@ public class TestUtil {
                 "跳转QQ1", "跳转QQ2", "跳转白白QQ", "龙猫竞猜", "龙猫竞猜-scheme",
                 "有米科技", "手机型号测试", "测试通知栏", "测试自定义通知栏", "测试自定义通知栏2",
                 "开启通知栏权限0", "开启通知栏权限1", "开启通知栏权限2", "开启通知栏权限3",
-                "开启通知栏权限", "通知栏权限1", "通知栏权限2", "通知栏权限8.0", "测试支付", "测试内部h5", "测试外部h5",
+                "开启通知栏权限", "通知栏权限1", "通知栏权限2", "通知栏权限8.0", "测试支付", "测试外部h5",
                 "会长推广游戏", "移动积分兑换", "审核中心", "检查正版", "crc32", "loading", "progress", "查看截图",
                 "复制IMEI", "小米游戏", "测试可用金额", "测试定位信息", "测试apk的渠道", "幂动科技",
                 "游戏帐号", "游戏代充", "尝试开启第三方应用使用情况", "测试代理页面", "第三方应用使用情况",
@@ -514,9 +514,9 @@ public class TestUtil {
                 break;
             case "测试内部h5": {
 //                Jump2View.getInstance().goWeb(activity, StringUtils.getCopyText().toString(), "小绵羊官网");
-//                String url = "http://10.8.240.193:8082/#/payment?authorization=64239%40e90a3bf5f9cfd223%40024e900d3cc2db1c2c064d5bb0d52a95&order=6557891279164801024&ssnocache=1";
-                String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_PAY + "?authorization=64239@e90a3bf5f9cfd223@d01420837e0fefd74c4ab9374a201bd8&order=6557891279164801024&ssnocache=1");
-                Jump2View.getInstance().goWeb(activity, url, "支付");
+                String url = "http://10.8.240.193:8082/#/game-center?pf=android.sheep.app&device_id=e90a3bf5f9cfd223";
+//                String url = Config.getUrlByPath(Config.PATH_DIRECTIONAL_PAY + "?authorization=64239@e90a3bf5f9cfd223@d01420837e0fefd74c4ab9374a201bd8&order=6557891279164801024&ssnocache=1");
+                Jump2View.getInstance().goWeb(activity, url, "玩转游戏");
             }
                 break;
             case "测试外部h5":

+ 52 - 2
app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -18,6 +18,8 @@ import com.sheep.gamegroup.event.WebViewEvent;
 import com.sheep.gamegroup.model.api.IWeb;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
+import com.sheep.gamegroup.model.entity.GameListType;
+import com.sheep.gamegroup.model.entity.Release_task;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.find.activity.ActFind;
@@ -29,9 +31,11 @@ import com.sheep.gamegroup.util.ApiJSONUtil;
 import com.sheep.gamegroup.util.ApiUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ContactUtil;
+import com.sheep.gamegroup.util.DataKey;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MainTab;
 import com.sheep.gamegroup.util.QQUtil;
@@ -45,6 +49,7 @@ import com.sheep.gamegroup.view.activity.ChangeWxOrTelAct;
 import com.sheep.gamegroup.view.activity.RealNameAuthenAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -305,6 +310,22 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public void gotoTask(final int type, final int id) {
+        activity.runOnUiThread(() -> {
+            Release_task rt = new Release_task();
+            rt.setId(id);
+            rt.setTask(new TaskEty());
+            rt.getTask().setTask_type(type);
+            Jump2View.getInstance().goEntity(rt);
+        });
+    }
+
+    @JavascriptInterface
+    public void goTryplayView() {
+        Jump2View.getInstance().goTryplayView(activity, null);
+    }
+
+    @JavascriptInterface
     public void setH5Type(final String h5Type) {
         if (h5Type == null)
             return;
@@ -503,6 +524,22 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
+    public void goActPlayGameList(int type) {
+        GameListType gameListType = new GameListType();
+        gameListType.setPort_type(type);
+        gameListType.setTitle("");
+        Jump2View.getInstance().goActPlayGameList(activity, gameListType);
+    }
+
+    @JavascriptInterface
+    public void goZoneGameList(int id, String name) {
+        GameListType type = new GameListType();
+        type.setSpecial_id(id);
+        type.setTitle(name);
+        Jump2View.getInstance().goActPlayGameList(activity, type);
+    }
+
+    @JavascriptInterface
     public void gotoGameGroupDetail(int id) {
         Jump2View.getInstance().goActGameGroupDetail(id);
     }
@@ -546,6 +583,19 @@ public class KFZSJs {
         });
     }
 
-//    @JavascriptInterface
-//    public void put
+    @JavascriptInterface
+    public void putIntData(String key, int value) {
+        DataUtil.putAsInt(key, value);
+    }
+
+    @JavascriptInterface
+    public int getIntData(String key, int def) {
+        return DataUtil.getAsInt(key, 1);
+    }
+
+    @JavascriptInterface
+    public void goNativeFromUser(String jsonStr) {
+        UserCenterModule module = JSONObject.parseObject(jsonStr, UserCenterModule.class);
+        CommonUtil.getInstance().goNative(activity, module, "个人中心");
+    }
 }

+ 1 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -83,6 +83,7 @@ public class Config {
     public static final String PATH_SBD_HOME = STATION_SUI_BIAN_DA + "/";
     //福利
     public static final String PATH_WELFARE_HOME = STATION_WELFARE + "/home";
+    public static final String PATH_GAME_HOME = STATION_WELFARE + "/game-center";
     public static final String PATH_WELFARE_DETAIL = STATION_WELFARE + "/detail";
     //游戏商城
     public static final String PATH_GAME_SHOP_HOME = STATION_GAME_SHOP + "/gameMallHome";

+ 2 - 2
app/src/main/res/layout/fgt_home.xml

@@ -61,8 +61,8 @@
 
         <ImageView
             android:id="@+id/iv_flag_vip"
-            android:layout_width="22dp"
-            android:layout_height="9dp"
+            android:layout_width="28dp"
+            android:layout_height="13dp"
             android:layout_marginLeft="@dimen/content_padding_4"
             android:layout_marginTop="4dp"
             android:layout_toRightOf="@+id/tv_nickname"

BIN
app/src/main/res/mipmap-xxhdpi/level_vip.png