Commit Graph

5 Commits

Author SHA1 Message Date
Martin
152848a04f Merge branch 'master' into dev_680_礼物展馆
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
2024-07-17 09:53:22 +08:00
18142669586
4618c0a4f1 升级34 grd8.0 2024-07-13 10:37:37 +08:00
Martin
eb9f615f70 将支付相关的异常抛出,改为异常输出 2024-07-09 11:11:05 +08:00
hch
9dba41c22f 修复支付问题 2023-11-30 16:15:23 +08:00
hch
238181deca lib_google
lib_huawei
2023-11-27 17:12:27 +08:00