From 01ea6997223054f916a19558262053363de4684a Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Wed, 8 Apr 2020 16:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7SDK=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=BA=91=E4=BF=A1secret=20key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       |  5 +++--
 app/src/main/AndroidManifest.xml                       |  5 ++++-
 app/src/main/res/layout/fragment_game_home.xml         |  2 +-
 app/src/main/res/values/ids.xml                        | 10 ++++++++++
 core/build.gradle                                      |  1 +
 .../xchat_android_constants/XChatConstants.java        |  6 ++++--
 library/build.gradle                                   |  1 +
 nim_uikit/build.gradle                                 |  2 +-
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1b3cfc721..12b2a623b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,8 +149,8 @@ android {
         }
 
         debug {
-//            buildConfigField "String", "BASE_URL", "\"http://120.79.211.243/\""
-            buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\""
+            buildConfigField "String", "BASE_URL", "\"http://192.168.63.108:8079/\""
+//            buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "\"https://preview.qxjiaoyou.com/\""
             buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.qxjiaoyou.com/\""
@@ -173,6 +173,7 @@ android {
         }
 
     }
+    buildToolsVersion = '28.0.3'
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a56fe258..11c9688a7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -112,7 +112,10 @@
         -->
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="ca46478c438dda51d25306f52fe7506b" /> <!-- 声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。 -->
+            android:value="09bde8b3d86b98a6612bc3fc92709799" /> <!-- 声明云信后台服务，如需保持后台推送，使用独立进程效果会更好。
+            ca46478c438dda51d25306f52fe7506b
+            09bde8b3d86b98a6612bc3fc92709799
+             -->
         <service
             android:name="com.netease.nimlib.service.NimService"
             android:process=":core" /> <!-- 运行后台辅助服务 -->
diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml
index 4cd6cc234..582c3af6f 100644
--- a/app/src/main/res/layout/fragment_game_home.xml
+++ b/app/src/main/res/layout/fragment_game_home.xml
@@ -95,7 +95,7 @@
                             <com.jude.rollviewpager.RollPagerView
                                 android:id="@+id/roll_view"
                                 android:layout_width="match_parent"
-                                android:layout_height="120dp"
+                                android:layout_height="80dp"
                                 android:layout_marginStart="@dimen/dp_20"
                                 android:layout_marginEnd="@dimen/dp_20"
                                 android:layout_marginTop="@dimen/dp_12"
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 91a2b47af..0eb46a760 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -14,4 +14,14 @@
     <item type="id" name="mic_item_head_wear" />
 
     <item type="id" name="guide_view" />
+
+    <item name="animator" type="id" />
+    <item name="date_picker_day" type="id"/>
+    <item name="date_picker_header" type="id"/>
+    <item name="date_picker_month" type="id"/>
+    <item name="date_picker_month_and_day" type="id"/>
+    <item name="date_picker_year" type="id"/>
+    <item name="day_picker_selected_date_layout" type="id"/>
+    <item name="done" type="id"/>
+    <item name="month_text_view" type="id"/>
 </resources>
\ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index 253e14413..6c7d47464 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -83,6 +83,7 @@ android {
         }
 
     }
+    buildToolsVersion = '28.0.3'
 
 }
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
index a64627ef5..867ae8700 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
@@ -51,12 +51,14 @@ public class XChatConstants {
     /**
      * 云信 key (DEBUG)
      */
-    public static final String NIM_KEY_DEBUG = "2c375581f900a7b4ea3922fa7643f307";
+//    public static final String NIM_KEY_DEBUG = "2c375581f900a7b4ea3922fa7643f307";
+    public static final String NIM_KEY_DEBUG = "09bde8b3d86b98a6612bc3fc92709799";
 
     /**
      * 云信 key (RELEASE)
      */
-    public static final String NIM_KEY_RELEASE = "ca46478c438dda51d25306f52fe7506b";
+//    public static final String NIM_KEY_RELEASE = "ca46478c438dda51d25306f52fe7506b";
+    public static final String NIM_KEY_RELEASE = "09bde8b3d86b98a6612bc3fc92709799";
 
     /**
      * 网易易盾 productNumber
diff --git a/library/build.gradle b/library/build.gradle
index 816b99b37..9b1d2658e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -30,6 +30,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion = '28.0.3'
 }
 
 dependencies {
diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle
index d2b999882..0399d800f 100644
--- a/nim_uikit/build.gradle
+++ b/nim_uikit/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 19