merge

.idea/gradle.xml

@@ -74,6 +74,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

config.gradle

@@ -131,7 +131,7 @@ ext {
             jetbrainsannotationsjava5  : "org.jetbrains:annotations-java5:15.0",
 
             // 统一登录
-            accountsdk                 : "com.zhidao.accountservice:account-sdk:1.0.17",
+            accountsdk                 : "com.zhidao.accountservice:account-sdk:1.0.18",
             // crash
             crashSdk                   : "com.zhidaoauto.crash.log:library:1.0.5",
             kotlinstdlibjdk7           : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",

skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="module_carchatting_nick_color_light">#333333</color>
+    <color name="module_carchatting_white_color_light">#333333</color>
     <color name="module_carchatting_status_color_light">#999999</color>
 
     <color name="module_carchatting_user_call_light">#333333</color>