From e5663ff701ac4a24ef705e6cd138e9014849981c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 09 一月 2019 16:59:17 +0800
Subject: [PATCH] update 灵宝记物料

---
 Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java |   70 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 923341a..2b37fe2 100644
--- a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -33,7 +33,6 @@
 public class H2EngineSDK
 {
     private static final String TAG = "H2EngineSDK";
-    private static String APP_ID = "";
 
     private static boolean PushEnable = true;
 
@@ -50,7 +49,6 @@
             switch (_code)
             {
                 case CodeU2A.Init:
-                    APP_ID = _json.getString("appID");
                     init(_activity);
                     break;
                 case CodeU2A.CopyOneAsset:
@@ -99,18 +97,35 @@
                 case CodeU2A.FreePlatformPay:
 
                     JSONObject _extraData = new JSONObject();
-                    _extraData.put("appid", APP_ID);
+                    String _yjAppID = UniversalUtil.getMetaString(_activity, "yj_appid");
+                    _extraData.put("appid", _yjAppID);
                     _extraData.put("cpinfo", _json.getString("cpInfo"));
                     _extraData.put("cporderid", _json.getString("orderId"));
                     try
                     {
+//                        YJPlatformUtil.getInstance().payExtend(_activity,
+//                                                         _json.getString("title"),
+//                                                         _json.getString("cpInfo"),
+//                                                         (float) _json.getDouble("mount"),
+//                                                         URLEncoder.encode(_extraData.toString(),
+//                                                                           "utf-8"));
+                        if(_yjAppID.contains("mzgame"))
+                        {
+                            YJPlatformUtil.getInstance().pay(_activity,
+                                                             _json.getString("title"),
+                                                             _json.getString("cpInfo"),
+                                                             (float) _json.getDouble("mount"),
+                                                             URLEncoder.encode(_extraData.toString(),
+                                                                               "utf-8"));
+                        }else{
+                            YJPlatformUtil.getInstance().charge(_activity,
+                                                             _json.getString("title"),
+                                                             (float) _json.getDouble("mount"),
+                                                             URLEncoder.encode(_extraData.toString(),
+                                                                               "utf-8"));
+                        }
 
-                        YJPlatformUtil.getInstance().pay(_activity,
-                                                         _json.getString("title"),
-                                                         _json.getString("cpInfo"),
-                                                         (float) _json.getDouble("mount"),
-                                                         URLEncoder.encode( _extraData.toString(),"utf-8"));
-                    }catch (UnsupportedEncodingException e)
+                    } catch (UnsupportedEncodingException e)
                     {
                         e.printStackTrace();
                     }
@@ -124,15 +139,12 @@
                                                             _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("createTime"),
-                                                            _json.getString("levelUpTime"),
                                                             _json.getString("vipLevel"),
                                                             _json.getString("money"));
                     break;
@@ -141,15 +153,11 @@
                                                             _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("createTime"),
-                                                            _json.getString("levelUpTime"),
+                                                            _json.getString("familyName").trim()
+                                                                    .replace(" ", ""),
                                                             _json.getString("vipLevel"),
                                                             _json.getString("money"));
                     break;
@@ -158,12 +166,11 @@
                                                          _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("createTime"),
                                                          _json.getString("levelUpTime"),
                                                          _json.getString("vipLevel"),
@@ -389,8 +396,9 @@
                 _msgStruct.clear();
                 _msgStruct.put("code", CodeA2U.SdkInitComplete);
                 _msgStruct.put("channelPlatform", "yj");
-                _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity,"yj_appid"));
-                _msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity,"yj_spid"));
+                _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity, "yj_appid"));
+                _msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity, "yj_spid"));
+                _msgStruct.put("yj_branch", UniversalUtil.getMetaInt(activity, "yj_branch"));
                 UniversalUtil.sendMessageToUnity(_msgStruct);
 
                 LogUtil.i(TAG, "鍒濆鍖栨墽琛屽畬姣�");

--
Gitblit v1.8.0