Bladeren bron
Merge branch 'master' into release
* master: v1.0.0开发：版本发布 v1.0.0开发：增加正式环境域名 v1.0.0开发：修改publish.gradle依赖的publish插件 v1.0.0开发： 1）修改选择登陆方式展示逻辑 2）公共参数增加aid字段 v1.0.0开发： 1）谷歌账号登录切增加注销操作 2）修复通知发货接口由于iap服务问题导致重复调用 v1.0.0-alpha2开发：修改客户端接入文档 # Conflicts: # library_core/publish.gradle
63 gewijzigde bestanden met toevoegingen van 915 en 613 verwijderingen
-
3 0.gitignore
-
21 20build.gradle
-
14 14demo/build.gradle
-
BINdemo/libs/library_core-release.aar
-
8 8demo/src/main/AndroidManifest.xml
-
52 0demo/src/main/assets/test.html
-
9 11demo/src/main/assets/yyxx_game/sdk_log.json
-
2 2demo/src/main/assets/yyxx_game/yyxx_cfg.properties
-
8 9demo/src/main/java/com/eyuangame/demo/DemoActivity.kt
-
0 1demo/src/main/java/com/eyuangame/demo/WelcomeActivity.kt
-
2 2demo/src/main/res/values/strings.xml
-
1 1gradle.properties
-
1 1gradle/wrapper/gradle-wrapper.properties
-
0 11keystore.properties
-
0 1library_base/build.gradle
-
1 1library_base/src/main/java/cn/yyxx/eyuangame/Version.kt
-
18 3library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGame.kt
-
2 0library_base/src/main/java/cn/yyxx/eyuangame/base/entity/Function.kt
-
9 18library_core/build.gradle
-
2 0library_core/proguard-rules.pro
-
79 51library_core/publish.gradle
-
82 0library_core/publish_old.gradle
-
5 0library_core/src/main/AndroidManifest.xml
-
3 3library_core/src/main/cpp/aes.cpp
-
2 1library_core/src/main/cpp/comm_map.cpp
-
2 0library_core/src/main/cpp/include/toolkit.h
-
11 52library_core/src/main/cpp/sdk_drive.cpp
-
16 21library_core/src/main/cpp/toolkit.cpp
-
4 0library_core/src/main/java/cn/yyxx/eyuangame/core/SdkBridge.kt
-
10 1library_core/src/main/java/cn/yyxx/eyuangame/core/entity/SdkBackLoginInfo.kt
-
60 34library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkBridgeImpl.kt
-
1 11library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkDrive.kt
-
18 0library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkJsImpl.kt
-
237 29library_core/src/main/java/cn/yyxx/eyuangame/core/impl/center/HybridActivity.kt
-
41 33library_core/src/main/java/cn/yyxx/eyuangame/core/impl/floatball/FloatCenterService.kt
-
6 2library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/ChargeImpl.kt
-
16 9library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/LoginActivity.kt
-
4 3library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/UserSignInImpl.kt
-
2 2library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/fragment/LauncherFragment.kt
-
0 1library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/fragment/RegisterFragment.kt
-
67 0library_core/src/main/java/cn/yyxx/eyuangame/core/impl/share/ShareImpl.kt
-
2 2library_core/src/main/java/cn/yyxx/eyuangame/core/internal/IEventObserver.kt
-
5 0library_core/src/main/java/cn/yyxx/eyuangame/core/internal/IJsCallback.kt
-
12 15library_core/src/main/java/cn/yyxx/eyuangame/core/linking/Linking.kt
-
8 39library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingAdjustImpl.kt
-
4 30library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFacebookImpl.kt
-
1 28library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFirebaseImpl.kt
-
2 2library_core/src/main/java/cn/yyxx/eyuangame/core/network/Host.kt
-
5 8library_core/src/main/java/cn/yyxx/eyuangame/core/network/VolleyRequest.kt
-
0 2library_core/src/main/java/cn/yyxx/eyuangame/core/ui/floatview/FloatingBall.kt
-
12 5library_core/src/main/java/cn/yyxx/eyuangame/core/ui/floatview/FloatingBallMenu.kt
-
25 0library_core/src/main/java/cn/yyxx/eyuangame/core/utils/LocalCacheUtils.kt
-
4 0library_core/src/main/java/cn/yyxx/eyuangame/core/utils/MMKVUtils.kt
-
7 62library_core/src/main/res/layout-land/yyxx_hybrid.xml
-
2 0library_core/src/main/res/layout/yyxx_account_list_item.xml
-
7 62library_core/src/main/res/layout/yyxx_hybrid.xml
-
BINlibs/dolin_zap_1.0.0.jar
-
BINlibs/eyuangamesdk_base_1.0.0.jar
-
BINlibs/mmkv-static-1.2.8.jar
-
BINlibs/yyxx_support_1.0.1.jar
-
0 2settings.gradle
-
BINzkeystore/demo_yyxx.keystore
-
BINzkeystore/demo_yyxx_backup.keystore