Merge branch 'google' into qiye

baseswago/src/main/java/com/swago/baseswago/http/SwagoInterceptor.kt

@@ -54,6 +54,7 @@ class SwagoInterceptor : Interceptor {
             .addHeader("app-time", "$time")
             .addHeader("app-secret", secret)
             .addHeader("app-client-device-id",SwagoInfo.getIMEI())
+            .addHeader("app-os",SwagoInfo.getAndroidOS())
             .build()
         return chain.proceed(finalRequest)
     }

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -95,6 +95,10 @@ object SwagoInfo {
         return imei
     }
 
+    fun getAndroidOS(): String {
+        return "Android ${Build.VERSION.RELEASE}"
+    }
+
     private fun getUniqueDeviceId():String{
         if (PermissionX.isGranted(AppContext.getContext(), Manifest.permission.READ_EXTERNAL_STORAGE)){
            if (AppContext.getContext().getExternalFilesDir(null) == null){

room/src/main/java/com/swago/room/adapter/RoomChatAdapter.kt

@@ -49,7 +49,7 @@ class RoomChatAdapter :
     companion object {
         const val LEVEL_KEY = "level"
         const val PRETTY_KEY = "pretty"//靓号
-        const val VIP_KEY = "pretty"//每日首冲
+        const val VIP_KEY = "vip"//每日首冲
         const val IS_OFFICIAL = "official"
         const val IS_SERVICE = "service"
         const val IS_CROWN = "crown"
@@ -310,7 +310,7 @@ class RoomChatAdapter :
                 RoomMsgType.USER_ENTER_ROOM -> {
                     val sb = StringBuffer()
 
-                    if (item is UserJoinRoomBean&&item.isAdmin==1) {
+                    if (item is UserJoinRoomBean&&item.isAdmin==0) {
                         count++
                         sb.append("<img src='" + "file:///xx/")
                             .append(IS_ADMIN).append(".png")