U3DRepository.git

parent: e44ac571 | 补丁 | 提交 | show whitespace

client_Hale

2018-10-12 1a9012be7aff5b5cf1d03795fcfa1740c6a6f9cf

4163 【前端】支持有登记包名的才启动推送功能

6个文件已修改

	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	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Project/sp_sdk/src/game_spxjgame/java/com/secondworld/univeralsdk/H2EngineSDK.java	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| 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,6 +147,8 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        if (PushEnable)
        {
        try
        {
            JPushLocalNotification ln = new JPushLocalNotification();
@@ -160,10 +164,14 @@
            e.printStackTrace();
        }
    }
    }

    public static void removeNotification(Activity activity, int 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,6 +308,9 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);

                // ------------------------------- 极光推送 -------------------------------
                String _registrationID = "0";
                if (PushEnable)
                {
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);

@@ -308,6 +321,7 @@
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                        break;
                    }

@@ -319,10 +333,11 @@
                        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,6 +159,8 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        if (PushEnable)
        {
        try
        {
            JPushLocalNotification ln = new JPushLocalNotification();
@@ -167,10 +176,14 @@
            e.printStackTrace();
        }
    }
    }

    public static void removeNotification(Activity activity, int 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,6 +320,9 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);

                // ------------------------------- 极光推送 -------------------------------
                String _registrationID = "0";
                if (PushEnable)
                {
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);

@@ -315,6 +333,7 @@
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                        break;
                    }

@@ -326,10 +345,10 @@
                        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);
@@ -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,6 +179,8 @@
    public static void addLocalNotification(Activity activity, int id, String title, String content,
                                            long fireTime)
    {
        if (PushEnable)
        {
        try
        {
            JPushLocalNotification ln = new JPushLocalNotification();
@@ -181,10 +196,14 @@
            e.printStackTrace();
        }
    }
    }

    public static void removeNotification(Activity activity, int 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,6 +340,9 @@
                UniversalUtil.sendMessageToUnity(_msgStruct);

                // ------------------------------- 极光推送 -------------------------------
                String _registrationID = "0";
                if (PushEnable)
                {
                JPushInterface.setDebugMode(true);
                JPushInterface.init(activity);

@@ -329,6 +353,7 @@
                    // 等待获取极光registrationID
                    if (!JPushInterface.getRegistrationID(activity).equals(""))
                    {
                            _registrationID = JPushInterface.getRegistrationID(activity);
                        break;
                    }

@@ -340,10 +365,11 @@
                        break;
                    }
                }
                }

                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.PushClientID);
                _msgStruct.put("clientID", JPushInterface.getRegistrationID(activity));
                _msgStruct.put("clientID", _registrationID);
                UniversalUtil.sendMessageToUnity(_msgStruct);

                _msgStruct.clear();

			@@ -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,6 +147,8 @@
			public static void addLocalNotification(Activity activity, int id, String title, String content,
			long fireTime)
			{
			if (PushEnable)
			{
			try
			{
			JPushLocalNotification ln = new JPushLocalNotification();
			@@ -160,10 +164,14 @@
			e.printStackTrace();
			}
			}
			}

			public static void removeNotification(Activity activity, int 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,6 +308,9 @@
			UniversalUtil.sendMessageToUnity(_msgStruct);

			// ------------------------------- 极光推送 -------------------------------
			String _registrationID = "0";
			if (PushEnable)
			{
			JPushInterface.setDebugMode(true);
			JPushInterface.init(activity);

			@@ -308,6 +321,7 @@
			// 等待获取极光registrationID
			if (!JPushInterface.getRegistrationID(activity).equals(""))
			{
			_registrationID = JPushInterface.getRegistrationID(activity);
			break;
			}

			@@ -319,10 +333,11 @@
			break;
			}
			}
			}

			_msgStruct.clear();
			_msgStruct.put("code", CodeA2U.PushClientID);
			_msgStruct.put("clientID", JPushInterface.getRegistrationID(activity));
			_msgStruct.put("clientID", _registrationID);
			UniversalUtil.sendMessageToUnity(_msgStruct);

			_msgStruct.clear();