From a21ce438b27d577f410f09ecabeb831646ca3ace Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 19 一月 2019 11:04:57 +0800
Subject: [PATCH] 5963 多人 【前端】【1.5.0开始】各平台的注册数据同步为游戏后台统计的方式

---
 Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java   |    3 +
 ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar                     |    0 
 Project/app/src/game_813015059/java/com/secondworld/univeralsdk/FreePlatformUtil.java |   12 +++++-
 Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    3 +
 Project/app/src/game_904100357/java/com/secondworld/univeralsdk/FreePlatformUtil.java |    6 +++
 ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar                    |    0 
 Project/app/src/game_226114725/java/com/secondworld/univeralsdk/FreePlatformUtil.java |   11 ++++-
 Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java    |    3 +
 ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar                            |    0 
 Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    3 +
 Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java |   12 ++++-
 Project/app/src/game_815035853/java/com/secondworld/univeralsdk/FreePlatformUtil.java |   12 +++++-
 ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar                        |    0 
 Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java                 |    1 
 Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    3 +
 Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java                 |    1 
 Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java                    |    1 
 Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java |    4 ++
 Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    5 ++
 Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    3 +
 ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar                    |    0 
 ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar                      |    0 
 Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java      |    3 +
 23 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
index 67962ad..5a60a57 100644
--- a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
index 94c2bdd..78100e8 100644
--- a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
+++ b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
index 6b2f8e5..006b662 100644
--- a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
+++ b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
index 4960d7d..cd8ac38 100644
--- a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
+++ b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar b/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
index 69910d0..75b61dd 100644
--- a/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
+++ b/ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar b/ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar
index e69ea6e..07ece35 100644
--- a/ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar
+++ b/ChannelDiff/Android/yjgame/libs/yj_sdk-game_yj-release.aar
Binary files differ
diff --git a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index d92151d..ac2e18d 100644
--- a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -137,13 +137,20 @@
             @Override
             public void onResult(boolean b, String account)
             {
+                m_Account = account;
                 Map<String, Object> _registerMsg = new HashMap<>();
                 _registerMsg.put("code", CodeA2U.FreePlatformRegisterOk);
-                _registerMsg.put("account", account);
+                _registerMsg.put("account", m_Account);
                 UniversalUtil.sendMessageToUnity(_registerMsg);
-                Tracking.setRegisterWithAccountID(account);
+                Tracking.setRegisterWithAccountID(m_Account);
                 EventUtils.setRegister("mobile",true);
             }
         });
     }
+    private String m_Account;
+    public void SendRegisterEvent()
+    {
+        Tracking.setRegisterWithAccountID(m_Account);
+        EventUtils.setRegister("mobile",true);
+    }
 }
diff --git a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 063dbbf..8fb10d6 100644
--- a/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_226114725/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -123,6 +123,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    FreePlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index 69fe5a0..4ccde1d 100644
--- a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -139,13 +139,21 @@
             @Override
             public void onResult(boolean b, String account)
             {
+                m_Account = account;
                 Map<String, Object> _registerMsg = new HashMap<>();
                 _registerMsg.put("code", CodeA2U.FreePlatformRegisterOk);
-                _registerMsg.put("account", account);
+                _registerMsg.put("account", m_Account);
                 UniversalUtil.sendMessageToUnity(_registerMsg);
-                Tracking.setRegisterWithAccountID(account);
+                Tracking.setRegisterWithAccountID(m_Account);
                 EventUtils.setRegister("mobile",true);
             }
         });
     }
+
+    private String m_Account;
+    public void SendRegisterEvent()
+    {
+        Tracking.setRegisterWithAccountID(m_Account);
+        EventUtils.setRegister("mobile",true);
+    }
 }
diff --git a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 18ce941..862fb54 100644
--- a/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_813015059/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -131,6 +131,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    FreePlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index 69fe5a0..4ccde1d 100644
--- a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -139,13 +139,21 @@
             @Override
             public void onResult(boolean b, String account)
             {
+                m_Account = account;
                 Map<String, Object> _registerMsg = new HashMap<>();
                 _registerMsg.put("code", CodeA2U.FreePlatformRegisterOk);
-                _registerMsg.put("account", account);
+                _registerMsg.put("account", m_Account);
                 UniversalUtil.sendMessageToUnity(_registerMsg);
-                Tracking.setRegisterWithAccountID(account);
+                Tracking.setRegisterWithAccountID(m_Account);
                 EventUtils.setRegister("mobile",true);
             }
         });
     }
+
+    private String m_Account;
+    public void SendRegisterEvent()
+    {
+        Tracking.setRegisterWithAccountID(m_Account);
+        EventUtils.setRegister("mobile",true);
+    }
 }
diff --git a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 18ce941..862fb54 100644
--- a/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_815035853/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -131,6 +131,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    FreePlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index ecbde5c..ca6c675 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -143,13 +143,19 @@
             @Override
             public void onResult(boolean b, String account)
             {
+                m_Account = account;
                 Map<String, Object> _registerMsg = new HashMap<>();
                 _registerMsg.put("code", CodeA2U.FreePlatformRegisterOk);
-                _registerMsg.put("account", account);
+                _registerMsg.put("account", m_Account);
                 UniversalUtil.sendMessageToUnity(_registerMsg);
-                Tracking.setRegisterWithAccountID(account);
-                EventUtils.setRegister("mobile",true);
             }
         });
     }
+
+    private String m_Account;
+    public void SendRegisterEvent()
+    {
+        Tracking.setRegisterWithAccountID(m_Account);
+        EventUtils.setRegister("mobile",true);
+    }
 }
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
index f1ddd9f..23a216d 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -141,6 +141,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    FreePlatformUtil.getInstace().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index 44d388f..f88c8e2 100644
--- a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -145,4 +145,10 @@
             }
         });
     }
+
+    public void SendRegisterEvent()
+    {
+        Tracking.setRegisterWithAccountID(account);
+        EventUtils.setRegister("mobile",true);
+    }
 }
diff --git a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
index fcf4613..dcda331 100644
--- a/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_904100357/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -115,6 +115,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    FreePlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index 0089ebb..837d026 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
@@ -80,4 +80,5 @@
      * ClientPackage鍚憇dk鍙戦�佸垎鍖卛d
      */
     public static final int ClientPackage = 400;
+    public static final int SendRegistEvent = 500;
 }
diff --git a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 867a71c..4515a69 100644
--- a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -138,6 +138,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    JSPlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
index 0f14a96..2d9b423 100644
--- a/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
+++ b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
@@ -171,4 +171,8 @@
             payProcessing = false;
         }
     };
+
+    public void SendRegisterEvent()
+    {
+    }
 }
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index ef44ba0..1583ffa 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
@@ -81,4 +81,5 @@
      * ClientPackage鍚憇dk鍙戦�佸垎鍖卛d
      */
     public static final int ClientPackage = 400;
+    public static final int SendRegistEvent = 500;
 }
diff --git a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 18dbf74..dfa6a17 100644
--- a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -55,7 +55,7 @@
                     FileUtil.copyAssets(_activity);
                     break;
                 case CodeU2A.CopyOneAsset:
-                    FileUtil.copy(_activity,_json.getString("fileName"));
+                    FileUtil.copy(_activity, _json.getString("fileName"));
                     break;
                 case CodeU2A.BatteryListenStart:
                     BatteryUtil.getInstance().start(_activity);
@@ -150,6 +150,9 @@
                 case CodeU2A.JPushRemoveLocalMessage:
                     removeNotification(_activity, _json.getInt("id"));
                     break;
+                case CodeU2A.SendRegistEvent:
+                    MrPlatformUtil.getInstance().SendRegisterEvent();
+                    break;
             }
 
         } catch (JSONException e)
diff --git a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java b/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java
index e1267b6..5095558 100644
--- a/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java
+++ b/Project/mr_sdk/src/game_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java
@@ -241,4 +241,7 @@
         CommonMrSdk.getInstance().sendRoleLoginData(activity, _entity);
     }
 
+    public void SendRegisterEvent()
+    {
+    }
 }
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
index ef44ba0..1583ffa 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
+++ b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/CodeU2A.java
@@ -81,4 +81,5 @@
      * ClientPackage鍚憇dk鍙戦�佸垎鍖卛d
      */
     public static final int ClientPackage = 400;
+    public static final int SendRegistEvent = 500;
 }

--
Gitblit v1.8.0