Merge remote-tracking branch 'origin/dev_poyo_6.8.4' into dev_poyo_6.8.4

This commit is contained in:
zlzw 2024-11-13 10:53:53 +08:00
commit caf748f5f2

View File

@ -4,8 +4,8 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 906, versionCode : 904,
versionName : "6.8.4" versionName : "6.8.3"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
// //
@ -32,7 +32,7 @@ ext {
isPluginModel : false, isPluginModel : false,
facebook_app_id : "2011402032399020", facebook_app_id : "2011402032399020",
facebook_client_token : "959584e054a33614996361f0044e5253", facebook_client_token : "959584e054a33614996361f0044e5253",
lineChannelId : "1656399535", lineChannelId : "1657514693",
isHideGoogleLogin : false, // isHideGoogleLogin : false, //
isHideFacebookLogin : false,//facebook登陆 isHideFacebookLogin : false,//facebook登陆
isHideLineLogin : false, //line登陆 isHideLineLogin : false, //line登陆