Merge pull request #47 from froyomu/master

支持配置厂商push参数

Author: froyomu

README.md

@@ -75,6 +75,15 @@ flavorDimensions "qim"
             manifestPlaceholders = [
                     PACKAGE_NAME : "sdk.im.qunar.com.qtalksdkdemo",//替换成自己项目的applicationId
                     serverDoMain  : true,
+                    baiduMap :"xxxxx",//百度地图key 用于发送位置消息
+                    HUAWEI_APPID : "123",//华为push
+                    OPPO_APP_ID : "123",//OPPOpush
+                    OPPO_APP_KEY : "123",
+                    OPPO_APP_SECRET : "123",
+                    MIPUSH_APP_ID : "123",//小米push
+                    MIPUSH_APP_KEY : "123",
+                    MEIZU_APP_ID : "123",//魅族push
+                    MEIZU_APP_KEY : "123",
                     SCHEME : "qtalkaphone",
                     currentPlat  : "QTalk",
                     MAIN_SCHEMA : "start_qtalk_activity"
@@ -87,6 +96,15 @@ flavorDimensions "qim"
             manifestPlaceholders = [
                     PACKAGE_NAME : "sdk.im.qunar.com.qtalksdkdemo",//替换成自己项目的applicationId
                     serverDoMain  : false,
+                    baiduMap :"xxxxx",//百度地图key 用于发送位置消息
+                    HUAWEI_APPID : "123",//华为push
+                    OPPO_APP_ID : "123",//OPPOpush
+                    OPPO_APP_KEY : "123",
+                    OPPO_APP_SECRET : "123",
+                    MIPUSH_APP_ID : "123",//小米push
+                    MIPUSH_APP_KEY : "123",
+                    MEIZU_APP_ID : "123",//魅族push
+                    MEIZU_APP_KEY : "123",
                     SCHEME : "qchataphone",
                     currentPlat  : "QChat",
                     MAIN_SCHEMA : "start_qchat_activity",

app/build.gradle

@@ -44,6 +44,14 @@ android {
                     PACKAGE_NAME : "sdk.im.qunar.com.qtalksdkdemo",
                     serverDoMain  : true,
                     baiduMap :"xxxxx",//百度地图key 用于发送位置消息
+                    HUAWEI_APPID : "123",//华为push
+                    OPPO_APP_ID : "123",//OPPOpush
+                    OPPO_APP_KEY : "123",
+                    OPPO_APP_SECRET : "123",
+                    MIPUSH_APP_ID : "123",//小米push
+                    MIPUSH_APP_KEY : "123",
+                    MEIZU_APP_ID : "123",//魅族push
+                    MEIZU_APP_KEY : "123",
                     SCHEME : "qtalkaphone",
                     currentPlat  : "Startalk",
                     MAIN_SCHEMA : "start_qtalk_activity"
@@ -57,6 +65,14 @@ android {
                     PACKAGE_NAME : "sdk.im.qunar.com.qtalksdkdemo",
                     serverDoMain  : false,
                     baiduMap :"xxxxx",//百度地图key 用于发送位置消息
+                    HUAWEI_APPID : "123",//华为push
+                    OPPO_APP_ID : "123",//OPPOpush
+                    OPPO_APP_KEY : "123",
+                    OPPO_APP_SECRET : "123",
+                    MIPUSH_APP_ID : "123",//小米push
+                    MIPUSH_APP_KEY : "123",
+                    MEIZU_APP_ID : "123",//魅族push
+                    MEIZU_APP_KEY : "123",
                     SCHEME : "qchataphone",
                     currentPlat  : "QChat",
                     MAIN_SCHEMA : "start_qchat_activity",

app/src/main/AndroidManifest.xml

@@ -98,6 +98,33 @@
         <meta-data
             android:name="currentPlat"
             android:value="${currentPlat}" />
+        <!--                       push相关   start                           -->
+        <meta-data
+            android:name="com.huawei.hms.client.appid"
+            android:value="appid=${HUAWEI_APPID}">
+        </meta-data>
+        <meta-data
+            android:name="OPPO_APP_ID"
+            android:value="appid=${OPPO_APP_ID}"/>
+        <meta-data
+            android:name="OPPO_APP_KEY"
+            android:value="appkey=${OPPO_APP_KEY}"/>
+        <meta-data
+            android:name="OPPO_APP_SECRET"
+            android:value="${OPPO_APP_SECRET}"/>
+        <meta-data
+            android:name="MIPUSH_APP_ID"
+            android:value="appid=${MIPUSH_APP_ID}"/>
+        <meta-data
+            android:name="MIPUSH_APP_KEY"
+            android:value="appkey=${MIPUSH_APP_KEY}"/>
+        <meta-data
+            android:name="MEIZU_APP_ID"
+            android:value="appid=${MEIZU_APP_ID}"/>
+        <meta-data
+            android:name="MEIZU_APP_KEY"
+            android:value="appkey=${MEIZU_APP_KEY}"/>
+        <!--                       push相关   end                           -->
 
         <activity
             android:name="com.qunar.im.ui.activity.TabMainActivity"

imlib/src/main/java/com/qunar/im/ui/sdk/QIMSdk.java

@@ -166,6 +166,13 @@ private void initDoMain(Application application) {
             CommonConfig.isQtalk = applicationInfo.metaData.getBoolean("serverDoMain");
             CommonConfig.schema = applicationInfo.metaData.getString("SCHEME");
             CommonConfig.currentPlat = applicationInfo.metaData.getString("currentPlat");
+            QTPushConfiguration.OPPO_APP_ID = applicationInfo.metaData.getString("OPPO_APP_ID");
+            QTPushConfiguration.OPPO_APP_KEY = applicationInfo.metaData.getString("OPPO_APP_KEY");
+            QTPushConfiguration.OPPO_APP_SECRET = applicationInfo.metaData.getString("OPPO_APP_SECRET");
+            QTPushConfiguration.MIPUSH_APP_ID = applicationInfo.metaData.getString("MIPUSH_APP_ID");
+            QTPushConfiguration.MIPUSH_APP_KEY = applicationInfo.metaData.getString("MIPUSH_APP_KEY");
+            QTPushConfiguration.MEIZU_APP_ID = applicationInfo.metaData.getString("MEIZU_APP_ID");
+            QTPushConfiguration.MEIZU_APP_KEY = applicationInfo.metaData.getString("MEIZU_APP_KEY");
         }
     }