client_Hale
2018-10-12 1a9012be7aff5b5cf1d03795fcfa1740c6a6f9cf
4163 【前端】支持有登记包名的才启动推送功能
6个文件已修改
254 ■■■■■ 已修改文件
ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
Binary files differ
ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
Binary files differ
ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
Binary files differ
Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -33,6 +33,8 @@
    private static final String TAG = "H2EngineSDK";
    private static String APP_ID = "";
    private static boolean PushEnable = true;
    public static void HandleUnityMessage(String json)
    {
        LogUtil.i(TAG, "收到Unity发来的信息: " + json);
@@ -145,25 +147,31 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        try
        if (PushEnable)
        {
            JPushLocalNotification ln = new JPushLocalNotification();
            ln.setBuilderId(0);// 设置样式
            ln.setNotificationId(id);// id
            ln.setTitle(title);// 标题
            try
            {
                JPushLocalNotification ln = new JPushLocalNotification();
                ln.setBuilderId(0);// 设置样式
                ln.setNotificationId(id);// id
                ln.setTitle(title);// 标题
            ln.setContent(content);// 内容
            ln.setBroadcastTime(fireTime);// 等待时间
            JPushInterface.addLocalNotification(activity, ln);
        } catch (Exception e)
        {
            e.printStackTrace();
                ln.setContent(content);// 内容
                ln.setBroadcastTime(fireTime);// 等待时间
                JPushInterface.addLocalNotification(activity, ln);
            } catch (Exception e)
            {
                e.printStackTrace();
            }
        }
    }
    public static void removeNotification(Activity activity, int id)
    {
        JPushInterface.removeLocalNotification(activity, id);
        if (PushEnable)
        {
            JPushInterface.removeLocalNotification(activity, id);
        }
    }
    public static void GetExternalStorage()
@@ -275,6 +283,8 @@
            return;
        }
        PushEnable = activity.getPackageName().equals("com.lingleigame.shaonianqixiachuan");
        new Thread(new Runnable()
        {
            @Override
@@ -298,31 +308,36 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);
                // ------------------------------- 极光推送 -------------------------------
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);
                final long _waitingTime = System.currentTimeMillis();
                while (true)
                String _registrationID = "0";
                if (PushEnable)
                {
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                        break;
                    }
                    JPushInterface.setDebugMode(true);
                    JPushInterface.init(activity);
                    long _escapeTime = System.currentTimeMillis() - _waitingTime;
                    final long _waitingTime = System.currentTimeMillis();
                    if (_escapeTime > 3000)
                    while (true)
                    {
                        LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                        break;
                        // 等待获取极光registrationID
                        if (!JPushInterface.getRegistrationID(activity).equals(""))
                        {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                            break;
                        }
                        long _escapeTime = System.currentTimeMillis() - _waitingTime;
                        if (_escapeTime > 3000)
                        {
                            LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                            break;
                        }
                    }
                }
                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.PushClientID);
                _msgStruct.put("clientID", JPushInterface.getRegistrationID(activity));
                _msgStruct.put("clientID", _registrationID);
                UniversalUtil.sendMessageToUnity(_msgStruct);
                _msgStruct.clear();
Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -33,6 +33,8 @@
    private static final String TAG = "H2EngineSDK";
    private static String APP_ID = "";
    private static boolean PushEnable = true;
    public static void HandleUnityMessage(String json)
    {
        LogUtil.i(TAG, "收到Unity发来的信息: " + json);
@@ -100,7 +102,8 @@
                    MrPlatformUtil.getInstance().pay(_activity,
                                                     _json.getString("cpInfo"),
                                                     _json.getString("roleID"),
                                                     _json.getString("roleName").trim().replace(" ",""),
                                                     _json.getString("roleName").trim().replace(" ",
                                                                                                ""),
                                                     _json.getString("level"),
                                                     _extraData.toString(),
                                                     _json.getString("sid"),
@@ -116,7 +119,9 @@
                    MrPlatformUtil.getInstance().createRole(_activity,
                                                            _json.getString("roleID"),
                                                            _json.getString("sid"),
                                                            _json.getString("roleName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            "1",
                                                            "0");
                    break;
@@ -124,7 +129,9 @@
                    MrPlatformUtil.getInstance().enterWorld(_activity,
                                                            _json.getString("roleID"),
                                                            _json.getString("sid"),
                                                            _json.getString("roleName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            _json.getString("level"),
                                                            _json.getString("vipLevel"));
                    break;
@@ -152,25 +159,31 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        try
        if (PushEnable)
        {
            JPushLocalNotification ln = new JPushLocalNotification();
            ln.setBuilderId(0);// 设置样式
            ln.setNotificationId(id);// id
            ln.setTitle(title);// 标题
            try
            {
                JPushLocalNotification ln = new JPushLocalNotification();
                ln.setBuilderId(0);// 设置样式
                ln.setNotificationId(id);// id
                ln.setTitle(title);// 标题
            ln.setContent(content);// 内容
            ln.setBroadcastTime(fireTime);// 等待时间
            JPushInterface.addLocalNotification(activity, ln);
        } catch (Exception e)
        {
            e.printStackTrace();
                ln.setContent(content);// 内容
                ln.setBroadcastTime(fireTime);// 等待时间
                JPushInterface.addLocalNotification(activity, ln);
            } catch (Exception e)
            {
                e.printStackTrace();
            }
        }
    }
    public static void removeNotification(Activity activity, int id)
    {
        JPushInterface.removeLocalNotification(activity, id);
        if (PushEnable)
        {
            JPushInterface.removeLocalNotification(activity, id);
        }
    }
    public static void GetExternalStorage()
@@ -282,6 +295,8 @@
            return;
        }
        PushEnable = activity.getPackageName().equals("com.ziyouyouxi08.snxxz");
        new Thread(new Runnable()
        {
            @Override
@@ -305,31 +320,35 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);
                // ------------------------------- 极光推送 -------------------------------
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);
                final long _waitingTime = System.currentTimeMillis();
                while (true)
                String _registrationID = "0";
                if (PushEnable)
                {
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                        break;
                    }
                    JPushInterface.setDebugMode(true);
                    JPushInterface.init(activity);
                    long _escapeTime = System.currentTimeMillis() - _waitingTime;
                    final long _waitingTime = System.currentTimeMillis();
                    if (_escapeTime > 3000)
                    while (true)
                    {
                        LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                        break;
                        // 等待获取极光registrationID
                        if (!JPushInterface.getRegistrationID(activity).equals(""))
                        {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                            break;
                        }
                        long _escapeTime = System.currentTimeMillis() - _waitingTime;
                        if (_escapeTime > 3000)
                        {
                            LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                            break;
                        }
                    }
                }
                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.PushClientID);
                _msgStruct.put("clientID", JPushInterface.getRegistrationID(activity));
                _msgStruct.put("clientID", _registrationID);
                UniversalUtil.sendMessageToUnity(_msgStruct);
                _msgStruct.clear();
Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -33,6 +33,8 @@
    private static final String TAG = "H2EngineSDK";
    private static String APP_ID = "";
    private static boolean PushEnable = true;
    public static void HandleUnityMessage(String json)
    {
        LogUtil.i(TAG, "收到Unity发来的信息: " + json);
@@ -87,7 +89,7 @@
                case CodeU2A.FreePlatformSwitchAccount:
                    break;
                case CodeU2A.FreePlatformLogout:
                   SpPlatformUtil.getInstance().logout();
                    SpPlatformUtil.getInstance().logout();
                    break;
                case CodeU2A.FreePlatformPay:
@@ -99,7 +101,7 @@
                    SpPlatformUtil.getInstance().pay(_activity,
                                                     _json.getString("title"),
                                                     _json.getString("cpInfo"),
                                                     (float)_json.getDouble("mount"),
                                                     (float) _json.getDouble("mount"),
                                                     _extraData.toString());
                    break;
@@ -110,9 +112,13 @@
                    SpPlatformUtil.getInstance().createRole(_json.getString("sid"),
                                                            _json.getString("serverName"),
                                                            _json.getString("roleID"),
                                                            _json.getString("roleName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            _json.getString("level"),
                                                            _json.getString("familyName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "familyName").trim().replace(
                                                                    " ", ""),
                                                            _json.getString("gameName"),
                                                            _json.getString("job"),
                                                            _json.getString("vipLevel"),
@@ -122,9 +128,13 @@
                    SpPlatformUtil.getInstance().enterWorld(_json.getString("sid"),
                                                            _json.getString("serverName"),
                                                            _json.getString("roleID"),
                                                            _json.getString("roleName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "roleName").trim().replace(" ",
                                                                                               ""),
                                                            _json.getString("level"),
                                                            _json.getString("familyName").trim().replace(" ",""),
                                                            _json.getString(
                                                                    "familyName").trim().replace(
                                                                    " ", ""),
                                                            _json.getString("gameName"),
                                                            _json.getString("job"),
                                                            _json.getString("vipLevel"),
@@ -134,9 +144,12 @@
                    SpPlatformUtil.getInstance().levelUp(_json.getString("sid"),
                                                         _json.getString("serverName"),
                                                         _json.getString("roleID"),
                                                         _json.getString("roleName").trim().replace(" ",""),
                                                         _json.getString("roleName").trim().replace(
                                                                 " ", ""),
                                                         _json.getString("level"),
                                                         _json.getString("familyName").trim().replace(" ",""),
                                                         _json.getString(
                                                                 "familyName").trim().replace(" ",
                                                                                              ""),
                                                         _json.getString("gameName"),
                                                         _json.getString("job"),
                                                         _json.getString("vipLevel"),
@@ -166,25 +179,31 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        try
        if (PushEnable)
        {
            JPushLocalNotification ln = new JPushLocalNotification();
            ln.setBuilderId(0);// 设置样式
            ln.setNotificationId(id);// id
            ln.setTitle(title);// 标题
            try
            {
                JPushLocalNotification ln = new JPushLocalNotification();
                ln.setBuilderId(0);// 设置样式
                ln.setNotificationId(id);// id
                ln.setTitle(title);// 标题
            ln.setContent(content);// 内容
            ln.setBroadcastTime(fireTime);// 等待时间
            JPushInterface.addLocalNotification(activity, ln);
        } catch (Exception e)
        {
            e.printStackTrace();
                ln.setContent(content);// 内容
                ln.setBroadcastTime(fireTime);// 等待时间
                JPushInterface.addLocalNotification(activity, ln);
            } catch (Exception e)
            {
                e.printStackTrace();
            }
        }
    }
    public static void removeNotification(Activity activity, int id)
    {
        JPushInterface.removeLocalNotification(activity, id);
        if (PushEnable)
        {
            JPushInterface.removeLocalNotification(activity, id);
        }
    }
    public static void GetExternalStorage()
@@ -296,6 +315,8 @@
            return;
        }
        PushEnable = activity.getPackageName().equals("com.xjaz.sp");
        new Thread(new Runnable()
        {
            @Override
@@ -319,31 +340,36 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);
                // ------------------------------- 极光推送 -------------------------------
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);
                final long _waitingTime = System.currentTimeMillis();
                while (true)
                String _registrationID = "0";
                if (PushEnable)
                {
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                        break;
                    }
                    JPushInterface.setDebugMode(true);
                    JPushInterface.init(activity);
                    long _escapeTime = System.currentTimeMillis() - _waitingTime;
                    final long _waitingTime = System.currentTimeMillis();
                    if (_escapeTime > 3000)
                    while (true)
                    {
                        LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                        break;
                        // 等待获取极光registrationID
                        if (!JPushInterface.getRegistrationID(activity).equals(""))
                        {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                            break;
                        }
                        long _escapeTime = System.currentTimeMillis() - _waitingTime;
                        if (_escapeTime > 3000)
                        {
                            LogUtil.w(TAG, "等待获取极光推送registrationID超时: 3秒");
                            break;
                        }
                    }
                }
                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.PushClientID);
                _msgStruct.put("clientID", JPushInterface.getRegistrationID(activity));
                _msgStruct.put("clientID", _registrationID);
                UniversalUtil.sendMessageToUnity(_msgStruct);
                _msgStruct.clear();
@@ -412,7 +438,7 @@
    {
        SPGameController.getInstance().onResume(activity);
        if(SpPlatformUtil.getInstance().payProcessing)
        if (SpPlatformUtil.getInstance().payProcessing)
        {
            Map<String, Object> _msgStruct = new HashMap<>();
            _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);