Merge pull request #11 from UnPourTous/master

修改Android QQ AppId的设置位置
iVanPan · Jul 2, 2017 · be1cda8 · be1cda8
2 parents d8a6ada + b49a53e
commit be1cda8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,10 @@ out/
 
 # Gradle files
 .gradle/
+gradle/
 build/
+gradlew
+gradlew.bat
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -41,6 +44,7 @@ captures/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/libraries
+.idea/
 
 # Keystore files
 *.jks

diff --git a/README.md b/README.md
@@ -129,14 +129,13 @@ npm install --save react-native-qqsdk@latest
         compile project(':react-native-qqsdk')
     }
     ```
-3. add App ID to `android/app/build.gradle` which locate in react-native-qqsdk node_modules folder
+3. add App ID to `$RNProjectRoot/package.json`
 
-    ```gradle
-    ...
-    manifestPlaceholders = [            
-             QQ_APP_ID: ${QQ_APP_ID}, //在此替换你的APPKey          
-    ]     
-    ```
+``` json
+{
+  "qq_app_id": "YOUR_QQ_APP_ID"
+}
+```
         
 4.Update the `MainApplication.java` file to use react-native-qqsdk via the following changes:
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,6 +6,12 @@ def computeVersionName() {
     def json = slurper.parse(file('../../../package.json'), "utf-8")
     return json.version
 }
+def computeQQAppId() {
+    // dynamically retrieve qq app id from package.json
+    def slurper = new JsonSlurper()
+    def json = slurper.parse(file('../../../package.json'), "utf-8")
+    return json.qq_app_id
+}
 apply plugin: 'com.android.library'
 
 android {
@@ -18,7 +24,7 @@ android {
         versionCode 1
         versionName computeVersionName()
         manifestPlaceholders = [
-                QQ_APP_ID: ${QQ_APP_ID}, //在此替换你的APPKey
+                QQ_APP_ID: computeQQAppId()
         ]
     }
     sourceSets.main {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-qqsdk",
-  "version": "0.7.9",
+  "version": "0.8.1",
   "description": "react-native wrapper for qq sdk",
   "main": "index.js",
   "scripts": {