From 61ab56a86eb853a849830c126c83012ac68cb347 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 10 十月 2018 15:11:07 +0800
Subject: [PATCH] update 极速sdk相关
---
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_r.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_btn.xml | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/en.lproj/Root.strings | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_forget_view.xml | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_seletedBtn_icon@2x.png | 0
ChannelDiff/iOS/jisugameios/Opus/lib.meta | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_auth_view.xml | 0
Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml | 0
Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_line_blue.xml | 0
ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h | 3 ++-
ChannelDiff/iOS/jisugameios/SDK/libXHAuxiliary.a | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_terms_view.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_icon.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gray_border.xml | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_no_top.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include.meta | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back2.png | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_register_view.xml | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.h | 0
Project/js_sdk/src/game_jisugame/AndroidManifest.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h.meta | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_floating_view.xml | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_pay_view.xml | 0
Project/js_sdk/build.gradle | 18 +++++++++---------
ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a.meta | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_change_view.xml | 0
ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus.meta | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h.meta | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Back_Icon.png | 0
ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jpush-ios-3.0.9.a | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_green_border.xml | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_l.png | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_pre.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_white_nor.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_left.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_nor.xml | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_down.png | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jcore-ios-1.1.9.a | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_close.png | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_NormalBtn_icon@2x.png | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/Root.plist | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back.png | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_gray_input.xml | 0
ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h.meta | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_include_title.xml | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_view.xml | 0
Project/js_sdk/src/game_jisugame/res/values/llsdk_colors.xml | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/userIcon.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_nor.xml | 0
ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryUserAccount.h | 0
Project/js_sdk/src/game_jisugame/res/anim/llsdk_view_hide.xml | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/TY_AN_34.png | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_nor.png | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_forget_pwd.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h.meta | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_delete.png | 0
Project/js_sdk/src/game_jisugame/res/layout/llsdk_login_view.xml | 0
Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist | 0
ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Close_Icon.png | 0
Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java | 2 +-
ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a | 0
ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a.meta | 0
/dev/null | 0
Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_blue.xml | 0
ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryHeader.h | 0
Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_right.png | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/The2thWorldSDKConfig.plist | 0
ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h.meta | 0
ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/JPUSHService.h | 0
ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a | 0
Project/js_sdk/src/game_jisugame/assets/llsdk_config.xml | 0
80 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
similarity index 95%
rename from ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar
rename to ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
index bc182f3..7496655 100644
--- a/ChannelDiff/Android/jisugame/libs/js_sdk-game_jsgame-release.aar
+++ b/ChannelDiff/Android/jisugame/libs/js_sdk-game_jisugame-release.aar
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/BuglyBridge/BuglyBridge.h b/ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/BuglyBridge/BuglyBridge.h
rename to ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h
diff --git a/ChannelDiff/iOS/jsgameios/BuglyBridge/BuglyBridge.h.meta b/ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/BuglyBridge/BuglyBridge.h.meta
rename to ChannelDiff/iOS/jisugameios/BuglyBridge/BuglyBridge.h.meta
diff --git a/ChannelDiff/iOS/jsgameios/BuglyBridge/libBuglyBridge.a b/ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/BuglyBridge/libBuglyBridge.a
rename to ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/BuglyBridge/libBuglyBridge.a.meta b/ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/BuglyBridge/libBuglyBridge.a.meta
rename to ChannelDiff/iOS/jisugameios/BuglyBridge/libBuglyBridge.a.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include.meta b/ChannelDiff/iOS/jisugameios/Opus/include.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus.meta b/ChannelDiff/iOS/jisugameios/Opus/include/opus.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus.h b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus.h
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus.h.meta b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus.h.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus.h.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_defines.h b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_defines.h
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_defines.h.meta b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_defines.h.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_defines.h.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_multistream.h b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_multistream.h
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_multistream.h.meta b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_multistream.h.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_multistream.h.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_types.h b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_types.h
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h
diff --git a/ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_types.h.meta b/ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/include/opus/opus_types.h.meta
rename to ChannelDiff/iOS/jisugameios/Opus/include/opus/opus_types.h.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/lib.meta b/ChannelDiff/iOS/jisugameios/Opus/lib.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/lib.meta
rename to ChannelDiff/iOS/jisugameios/Opus/lib.meta
diff --git a/ChannelDiff/iOS/jsgameios/Opus/lib/libopus.a b/ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/lib/libopus.a
rename to ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/Opus/lib/libopus.a.meta b/ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a.meta
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/Opus/lib/libopus.a.meta
rename to ChannelDiff/iOS/jisugameios/Opus/lib/libopus.a.meta
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/Root.plist b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/Root.plist
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/Root.plist
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/Root.plist
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliaryConfig.plist
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Back_Icon.png b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Back_Icon.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Back_Icon.png
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Back_Icon.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Close_Icon.png b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Close_Icon.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Close_Icon.png
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_Close_Icon.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_NormalBtn_icon@2x.png b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_NormalBtn_icon@2x.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_NormalBtn_icon@2x.png
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_NormalBtn_icon@2x.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_seletedBtn_icon@2x.png b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_seletedBtn_icon@2x.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_seletedBtn_icon@2x.png
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/XHAuxiliary_seletedBtn_icon@2x.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/en.lproj/Root.strings b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/en.lproj/Root.strings
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/en.lproj/Root.strings
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/en.lproj/Root.strings
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/userIcon.png b/ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/userIcon.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/XHAuxiliaryResource.bundle/userIcon.png
rename to ChannelDiff/iOS/jisugameios/SDK/XHAuxiliaryResource.bundle/userIcon.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliaryHeader.h b/ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryHeader.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliaryHeader.h
rename to ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryHeader.h
diff --git a/ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h b/ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h
similarity index 92%
rename from ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h
rename to ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h
index bc61b82..ad56507 100644
--- a/ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h
+++ b/ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliarySDK.h
@@ -30,6 +30,7 @@
@interface XHAuxiliarySDK : NSObject
@property (strong,nonatomic,readonly)NSString *APPID;
+@property (assign,nonatomic)BOOL show;
+ (XHAuxiliarySDK *)defaultXHAuxiliary;
@@ -43,7 +44,7 @@
@brief SDK搴旂敤鍒濆鍖栧嚱鏁�,寮傛鍑芥暟锛宺esult 0琛ㄧず鎴愬姛锛�1琛ㄧず缃戠粶寮傚父锛�2琛ㄧずappid銆乻ecret閿欒
@param appid 鐢宠鐨凙PPID
*/
-- (void)XHAuxiliarySDKInitWithCompletion:(XHAuxiliaryInitErrorCodeBlock)completion;
+- (void)XHAuxiliarySDKInitWithAPPID:(NSString *)appid Completion:(XHAuxiliaryInitErrorCodeBlock)completion;
- (void)XHAuxiliaryUploadLoacationWithLatitude:(NSString*)latitude longitude:(NSString*)longitude Completion:(XHAuxiliaryStatusBlock)completion;
diff --git a/ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliaryUserAccount.h b/ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryUserAccount.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/SDK/include/XHAuxiliary/XHAuxiliaryUserAccount.h
rename to ChannelDiff/iOS/jisugameios/SDK/include/XHAuxiliary/XHAuxiliaryUserAccount.h
diff --git a/ChannelDiff/iOS/jisugameios/SDK/libXHAuxiliary.a b/ChannelDiff/iOS/jisugameios/SDK/libXHAuxiliary.a
new file mode 100644
index 0000000..0a934c6
--- /dev/null
+++ b/ChannelDiff/iOS/jisugameios/SDK/libXHAuxiliary.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/JPUSHService.h b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/JPUSHService.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/JPUSHService.h
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/JPUSHService.h
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/jcore-ios-1.1.9.a b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jcore-ios-1.1.9.a
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/jcore-ios-1.1.9.a
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jcore-ios-1.1.9.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/jpush-ios-3.0.9.a b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jpush-ios-3.0.9.a
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/JPush/jpush-ios-3.0.9.a
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/JPush/jpush-ios-3.0.9.a
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/The2thWorldRES.bundle/TY_AN_34.png b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/TY_AN_34.png
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/The2thWorldRES.bundle/TY_AN_34.png
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/TY_AN_34.png
Binary files differ
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/The2thWorldRES.bundle/The2thWorldSDKConfig.plist b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/The2thWorldSDKConfig.plist
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/The2thWorldRES.bundle/The2thWorldSDKConfig.plist
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/The2thWorldRES.bundle/The2thWorldSDKConfig.plist
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/UniversalSDK.h b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.h
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/UniversalSDK.h
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.h
diff --git a/ChannelDiff/iOS/jsgameios/The2thWorldSDK/UniversalSDK.mm b/ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm
similarity index 100%
rename from ChannelDiff/iOS/jsgameios/The2thWorldSDK/UniversalSDK.mm
rename to ChannelDiff/iOS/jisugameios/The2thWorldSDK/UniversalSDK.mm
diff --git a/ChannelDiff/iOS/jsgameios/SDK/libXHAuxiliary.a b/ChannelDiff/iOS/jsgameios/SDK/libXHAuxiliary.a
deleted file mode 100644
index fc5bbe0..0000000
--- a/ChannelDiff/iOS/jsgameios/SDK/libXHAuxiliary.a
+++ /dev/null
Binary files differ
diff --git a/Project/js_sdk/build.gradle b/Project/js_sdk/build.gradle
index c300746..1cfc15d 100644
--- a/Project/js_sdk/build.gradle
+++ b/Project/js_sdk/build.gradle
@@ -25,7 +25,7 @@
flavorDimensions "default"
productFlavors {
- game_jsgame {
+ game_jisugame {
dimension "default"
manifestPlaceholders.put("appId", "com.lingleigame.shaonianqixiachuan")
manifestPlaceholders.put("JpushAppKey", "803d5cb73efe51a59968bf52")
@@ -48,16 +48,16 @@
implementation files('libs/lingleisdk-2.1.0.jar')
}
-task autoCopy_jsgame_Manifest(type: Copy) {
- dependsOn 'assembleGame_jsgameRelease'
- from zipTree("build/outputs/aar/js_sdk-game_jsgame-release.aar")
+task autoCopy_jisugame_Manifest(type: Copy) {
+ dependsOn 'assembleGame_jisugameRelease'
+ from zipTree("build/outputs/aar/js_sdk-game_jisugame-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\jsgame\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\jisugame\\"
}
-task autoCopy_jsgame(type: Copy) {
- dependsOn autoCopy_jsgame_Manifest
+task autoCopy_jisugame(type: Copy) {
+ dependsOn autoCopy_jisugame_Manifest
from "build/outputs/aar/"
- include "js_sdk-game_jsgame-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\jsgame\\libs\\"
+ include "js_sdk-game_jisugame-release.aar"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\jisugame\\libs\\"
}
diff --git a/Project/js_sdk/src/game_jsgame/AndroidManifest.xml b/Project/js_sdk/src/game_jisugame/AndroidManifest.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/AndroidManifest.xml
rename to Project/js_sdk/src/game_jisugame/AndroidManifest.xml
diff --git a/Project/js_sdk/src/game_jsgame/assets/llsdk_config.xml b/Project/js_sdk/src/game_jisugame/assets/llsdk_config.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/assets/llsdk_config.xml
rename to Project/js_sdk/src/game_jisugame/assets/llsdk_config.xml
diff --git a/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
similarity index 99%
rename from Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
rename to Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 28bc5e2..94eb3e4 100644
--- a/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -99,7 +99,7 @@
JSPlatformUtil.getInstance().pay(_activity,
_json.getString("orderId"),
- _json.getInt("mount"),
+ _json.getInt("mount") * 100,
_json.getString("title"),
_extraData.toString());
diff --git a/Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/JSPlatformUtil.java b/Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
rename to Project/js_sdk/src/game_jisugame/java/com/secondworld/univeralsdk/JSPlatformUtil.java
diff --git a/Project/js_sdk/src/game_jsgame/res/anim/llsdk_view_hide.xml b/Project/js_sdk/src/game_jisugame/res/anim/llsdk_view_hide.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/anim/llsdk_view_hide.xml
rename to Project/js_sdk/src/game_jisugame/res/anim/llsdk_view_hide.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back2.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back2.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back2.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back2.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back_big_left.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_left.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back_big_left.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_left.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back_big_right.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_right.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_back_big_right.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_back_big_right.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_close.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_close.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_close.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_close.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_delete.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_delete.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_delete.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_delete.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_down.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_down.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_down.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_down.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_arrow_l.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_l.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_arrow_l.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_l.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_arrow_r.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_r.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_arrow_r.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_arrow_r.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_icon.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_icon.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_floating_icon.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_floating_icon.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_forget_pwd_nor.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_nor.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_forget_pwd_nor.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_nor.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_forget_pwd_pre.png b/Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_pre.png
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable-xhdpi/llsdk_ic_forget_pwd_pre.png
rename to Project/js_sdk/src/game_jisugame/res/drawable-xhdpi/llsdk_ic_forget_pwd_pre.png
Binary files differ
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_floating_view.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_floating_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_floating_view.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_floating_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gary_no_top.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_no_top.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gary_no_top.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_no_top.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gary_nor.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_nor.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gary_nor.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gary_nor.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gray_border.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gray_border.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_gray_border.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_gray_border.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_green_border.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_green_border.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_green_border.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_green_border.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_nor.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_nor.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_nor.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_nor.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_white_nor.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_white_nor.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_bg_white_nor.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_bg_white_nor.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_line_blue.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_line_blue.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_line_blue.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_line_blue.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_selector_btn.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_btn.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_selector_btn.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_btn.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_selector_forget_pwd.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_forget_pwd.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_selector_forget_pwd.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_selector_forget_pwd.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_shape_blue.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_blue.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_shape_blue.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_blue.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/drawable/llsdk_shape_gray_input.xml b/Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_gray_input.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/drawable/llsdk_shape_gray_input.xml
rename to Project/js_sdk/src/game_jisugame/res/drawable/llsdk_shape_gray_input.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_auth_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_auth_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_auth_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_auth_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_forget_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_forget_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_forget_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_forget_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_include_title.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_include_title.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_include_title.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_include_title.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_login_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_login_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_login_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_login_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_pay_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_pay_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_pay_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_pay_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_register_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_register_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_register_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_register_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_terms_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_terms_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_terms_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_terms_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_verify_change_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_change_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_verify_change_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_change_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/layout/llsdk_verify_view.xml b/Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_view.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/layout/llsdk_verify_view.xml
rename to Project/js_sdk/src/game_jisugame/res/layout/llsdk_verify_view.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/values/llsdk_colors.xml b/Project/js_sdk/src/game_jisugame/res/values/llsdk_colors.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/values/llsdk_colors.xml
rename to Project/js_sdk/src/game_jisugame/res/values/llsdk_colors.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/values/llsdk_strings.xml b/Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/values/llsdk_strings.xml
rename to Project/js_sdk/src/game_jisugame/res/values/llsdk_strings.xml
diff --git a/Project/js_sdk/src/game_jsgame/res/values/llsdk_styles.xml b/Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml
similarity index 100%
rename from Project/js_sdk/src/game_jsgame/res/values/llsdk_styles.xml
rename to Project/js_sdk/src/game_jisugame/res/values/llsdk_styles.xml
--
Gitblit v1.8.0