Merge branch 'master_umeng'
# Conflicts: # app/proguard-rules.pro # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
This commit is contained in:
@@ -18,7 +18,8 @@ ext {
|
||||
//百度语音识别
|
||||
|
||||
baiduAppId : "23774720",
|
||||
baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB",
|
||||
baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnR B",
|
||||
|
||||
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
|
||||
// true表示谷歌支付 false
|
||||
isGooglePlay : false,
|
||||
|
||||
Reference in New Issue
Block a user