调整呼叫UI

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.kt

@@ -23,13 +23,14 @@ import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import com.bumptech.glide.request.RequestOptions
 import java.lang.ref.WeakReference
 import java.security.MessageDigest
+import com.adealink.weparty.R as APP_R
 
 object ImageLoader {
     private val radius: Int = 1
 
     @JvmStatic
     fun loadImage(context: Context?, imageView: ImageView?, url: Any?) {
-        loadImage(context, imageView, url, R.drawable.tuicallkit_ic_avatar)
+        loadImage(context, imageView, url, APP_R.drawable.common_default_avatar_ic)
     }
 
     @JvmStatic
@@ -58,10 +59,10 @@ object ImageLoader {
 
     fun loadBlurImage(context: Context?, imageView: ImageView?, url: Any?, radius: Float = 80f) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            loadImage(context, imageView, url, R.drawable.tuicallkit_ic_avatar)
+            loadImage(context, imageView, url, APP_R.drawable.common_default_avatar_ic)
             imageView?.setRenderEffect(RenderEffect.createBlurEffect(radius, radius, Shader.TileMode.MIRROR))
         } else {
-            Glide.with(context!!.applicationContext).load(url).error(R.drawable.tuicallkit_ic_avatar)
+            Glide.with(context!!.applicationContext).load(url).error(APP_R.drawable.common_default_avatar_ic)
                 .apply(RequestOptions.bitmapTransform(BlurTransformation(context))).into(imageView!!)
         }
         imageView?.setColorFilter(Color.parseColor("#8022262E"))
@@ -84,7 +85,7 @@ object ImageLoader {
         return if (imgUrl == null) {
             null
         } else Glide.with(context).asBitmap().load(imgUrl)
-            .apply(loadTransform(context, R.drawable.tuicallkit_ic_avatar, radius))
+            .apply(loadTransform(context, APP_R.drawable.common_default_avatar_ic, radius))
             .into(targetImageSize, targetImageSize)
             .get()
     }

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageSynthesizer.kt

@@ -18,6 +18,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.concurrent.ExecutionException
+import com.adealink.weparty.R as APP_R
 
 class GridImageSynthesizer(private val mContext: Context, private val mImageView: ImageView) {
     public var imageId = ""
@@ -76,7 +77,7 @@ class GridImageSynthesizer(private val mContext: Context, private val mImageView
         val imageUrlList = imageData.imageUrlList
         imageUrlList?.let {
             for (i in it.indices) {
-                val defaultIcon = BitmapFactory.decodeResource(mContext.resources, R.drawable.tuicallkit_ic_avatar)
+                val defaultIcon = BitmapFactory.decodeResource(mContext.resources, APP_R.drawable.common_default_avatar_ic)
                 try {
                     val bitmap = asyncLoadImage(it[i] ?: "", imageData.targetImageSize)
                     if (bitmap != null) {

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/CallWaitingHintView.kt

@@ -59,9 +59,9 @@ class CallWaitingHintView(context: Context) : androidx.appcompat.widget.AppCompa
             context.getString(R.string.tuicallkit_waiting_accept)
         } else {
             if (TUICallDefine.MediaType.Video == TUICallState.instance.mediaType.get()) {
-                context.getString(R.string.tuicallkit_invite_video_call)
+                context.getString(R.string.call_invite_video_call)
             } else {
-                context.getString(R.string.tuicallkit_invite_audio_call)
+                context.getString(R.string.call_invite_audio_call)
             }
         }
     }

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/floatview/FloatingWindowView.kt

@@ -17,6 +17,7 @@ import com.tencent.qcloud.tuikit.tuicallkit.view.component.videolayout.VideoView
 import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView
 import com.tencent.qcloud.tuikit.tuicallkit.viewmodel.component.floatview.FloatingWindowViewModel
 import com.trtc.tuikit.common.livedata.Observer
+import com.adealink.weparty.R as APP_R
 
 class FloatingWindowView(context: Context) : BaseCallView(context) {
 
@@ -127,7 +128,7 @@ class FloatingWindowView(context: Context) : BaseCallView(context) {
                         context,
                         imageAvatar,
 //                        viewModel.remoteUser?.avatar?.get(),
-                        R.drawable.tuicallkit_ic_avatar
+                        APP_R.drawable.common_default_avatar_ic
                     )
                 }
             } else {

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/incomingview/IncomingFloatView.kt

@@ -5,16 +5,16 @@ import android.content.Context.WINDOW_SERVICE
 import android.content.res.Configuration
 import android.graphics.PixelFormat
 import android.os.Build
+import android.util.AttributeSet
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.adealink.frame.log.Log
 import com.adealink.weparty.call.R
 import com.adealink.weparty.call.constant.TAG_CALL_INCOMING_VIEW
+import com.adealink.weparty.call.databinding.CallIncomingFloatViewBinding
 import com.tencent.cloud.tuikit.engine.call.TUICallDefine
 import com.tencent.qcloud.tuicore.TUICore
 import com.tencent.qcloud.tuicore.interfaces.ITUINotification
@@ -24,26 +24,26 @@ import com.tencent.qcloud.tuikit.tuicallkit.data.Constants
 import com.tencent.qcloud.tuikit.tuicallkit.data.User
 import com.tencent.qcloud.tuikit.tuicallkit.manager.EngineManager
 import com.tencent.qcloud.tuikit.tuicallkit.state.TUICallState
-import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader
 import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest
 import com.tencent.qcloud.tuikit.tuicallkit.view.component.videolayout.VideoViewFactory
 import com.trtc.tuikit.common.livedata.Observer
 
-class IncomingFloatView(context: Context) : RelativeLayout(context) {
+
+class IncomingFloatView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = CallIncomingFloatViewBinding.inflate(LayoutInflater.from(context), this, true)
 
     private var appContext: Context = context.applicationContext
     private var caller: User? = null
 
+    private lateinit var windowView: View
     private var windowManager: WindowManager? = null
     private var windowLayoutParams: WindowManager.LayoutParams? = null
 
-    private lateinit var layoutView: View
-    private var imageFloatAvatar: ImageView? = null
-    private var textFloatTitle: TextView? = null
-    private var textFloatDescription: TextView? = null
-    private var imageReject: ImageView? = null
-    private var imageAccept: ImageView? = null
-
     private val padding = 40
 
     private var callStatusObserver = Observer<TUICallDefine.Status> {
@@ -54,7 +54,8 @@ class IncomingFloatView(context: Context) : RelativeLayout(context) {
 
     private val notification = ITUINotification { key, subKey, param ->
         if (key == Constants.EVENT_VIEW_STATE_CHANGED &&
-            (subKey == Constants.EVENT_SHOW_FULL_VIEW || subKey == Constants.EVENT_SHOW_FLOAT_VIEW)) {
+            (subKey == Constants.EVENT_SHOW_FULL_VIEW || subKey == Constants.EVENT_SHOW_FLOAT_VIEW)
+        ) {
             cancelIncomingView()
         }
     }
@@ -68,8 +69,8 @@ class IncomingFloatView(context: Context) : RelativeLayout(context) {
 
     fun cancelIncomingView() {
         Log.d(TAG_CALL_INCOMING_VIEW, "cancelIncomingView")
-        if (layoutView.isAttachedToWindow) {
-            windowManager?.removeView(layoutView)
+        if (isAttachedToWindow) {
+            windowManager?.removeView(this)
         }
         removeObserver()
     }
@@ -86,38 +87,32 @@ class IncomingFloatView(context: Context) : RelativeLayout(context) {
     }
 
     private fun initWindow() {
-        layoutView = LayoutInflater.from(context).inflate(R.layout.tuicallkit_incoming_float_view, this)
-        imageFloatAvatar = layoutView.findViewById(R.id.img_float_avatar)
-        textFloatTitle = layoutView.findViewById(R.id.tv_float_title)
-        textFloatDescription = layoutView.findViewById(R.id.tv_float_desc)
-        imageReject = layoutView.findViewById(R.id.btn_float_decline)
-        imageAccept = layoutView.findViewById(R.id.btn_float_accept)
-
-//        ImageLoader.loadImage(appContext, imageFloatAvatar, caller?.avatar?.get(), R.drawable.tuicallkit_ic_avatar)
-//        textFloatTitle?.text = caller?.nickname?.get()
-
-        textFloatDescription?.text = if (TUICallState.instance.mediaType.get() == TUICallDefine.MediaType.Video) {
-            appContext.resources.getString(R.string.tuicallkit_invite_video_call)
+        windowView = binding.root
+        // TODO: zhangfei
+        //caller?.avatar?.get()
+        //binding.ivAvatar.setImageUrl()
+
+        binding.tvTips.text = if (TUICallState.instance.mediaType.get() == TUICallDefine.MediaType.Video) {
+            appContext.resources.getString(R.string.call_invite_video_call)
         } else {
-            appContext.resources.getString(R.string.tuicallkit_invite_audio_call)
+            appContext.resources.getString(R.string.call_invite_audio_call)
         }
 
-        imageReject?.setOnClickListener {
-            EngineManager.instance.reject(null)
+        binding.root.setOnClickListener {
             cancelIncomingView()
+            TUICore.notifyEvent(Constants.EVENT_TUICALLKIT_CHANGED, Constants.EVENT_START_ACTIVITY, HashMap())
         }
 
-        layoutView.setOnClickListener {
+        binding.rejectBtn.setOnClickListener {
+            EngineManager.instance.reject(null)
             cancelIncomingView()
-            TUICore.notifyEvent(Constants.EVENT_TUICALLKIT_CHANGED, Constants.EVENT_START_ACTIVITY, HashMap())
         }
-
         if (TUICallState.instance.mediaType.get() == TUICallDefine.MediaType.Video) {
-            imageAccept?.setBackgroundResource(R.drawable.tuicallkit_ic_dialing_video)
+            binding.acceptBtn.setImageResource(R.drawable.call_video_accept_ic)
         } else {
-            imageAccept?.setBackgroundResource(R.drawable.tuicallkit_bg_dialing)
+            binding.acceptBtn.setImageResource(R.drawable.call_chat_accept_ic)
         }
-        imageAccept?.setOnClickListener {
+        binding.acceptBtn.setOnClickListener {
             if (TUICallState.instance.selfUser.get().callStatus.get() == TUICallDefine.Status.None) {
                 Log.w(TAG_CALL_INCOMING_VIEW, "current status is None, ignore")
                 cancelIncomingView()
@@ -158,31 +153,32 @@ class IncomingFloatView(context: Context) : RelativeLayout(context) {
         }
 
         windowManager = appContext.getSystemService(WINDOW_SERVICE) as WindowManager
-        windowManager?.addView(layoutView, viewParams)
+        windowManager?.addView(windowView, viewParams)
     }
 
     private val viewParams: WindowManager.LayoutParams
         get() {
-            windowLayoutParams = WindowManager.LayoutParams()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                windowLayoutParams!!.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
-            } else {
-                windowLayoutParams!!.type = WindowManager.LayoutParams.TYPE_PHONE
+            windowLayoutParams = WindowManager.LayoutParams().apply {
+                type = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
+                } else {
+                    WindowManager.LayoutParams.TYPE_PHONE
+                }
+                flags = (WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                        or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                        or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
+                gravity = Gravity.START or Gravity.TOP
+                x = padding
+                y = 0
+                width = ScreenUtil.getScreenWidth(appContext) - padding * 2
+                height = WindowManager.LayoutParams.WRAP_CONTENT
+                format = PixelFormat.TRANSPARENT
             }
-            windowLayoutParams!!.flags = (WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                    or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-                    or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-            windowLayoutParams!!.gravity = Gravity.START or Gravity.TOP
-            windowLayoutParams!!.x = padding
-            windowLayoutParams!!.y = 0
-            windowLayoutParams!!.width = ScreenUtil.getScreenWidth(appContext) - padding * 2
-            windowLayoutParams!!.height = WindowManager.LayoutParams.WRAP_CONTENT
-            windowLayoutParams!!.format = PixelFormat.TRANSPARENT
             return windowLayoutParams as WindowManager.LayoutParams
         }
 
     override fun onConfigurationChanged(newConfig: Configuration?) {
         super.onConfigurationChanged(newConfig)
-        layoutView?.let { windowManager?.updateViewLayout(layoutView, viewParams) }
+        windowView?.let { windowManager?.updateViewLayout(windowView, viewParams) }
     }
 }

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/incomingview/IncomingNotificationView.kt

@@ -5,9 +5,6 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
@@ -15,12 +12,6 @@ import com.adealink.frame.log.Log
 import com.adealink.weparty.call.CallActivity
 import com.adealink.weparty.call.R
 import com.adealink.weparty.call.constant.TAG_CALL_INCOMING_VIEW
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.SimpleTarget
-import com.bumptech.glide.request.transition.Transition
 import com.tencent.cloud.tuikit.engine.call.TUICallDefine
 import com.tencent.cloud.tuikit.engine.call.TUICallDefine.MediaType
 import com.tencent.qcloud.tuikit.tuicallkit.data.Constants
@@ -28,6 +19,7 @@ import com.tencent.qcloud.tuikit.tuicallkit.data.User
 import com.tencent.qcloud.tuikit.tuicallkit.extensions.NotificationFeature
 import com.tencent.qcloud.tuikit.tuicallkit.state.TUICallState
 import com.trtc.tuikit.common.livedata.Observer
+import com.adealink.weparty.R as APP_R
 
 class IncomingNotificationView(context: Context) {
 
@@ -72,24 +64,24 @@ class IncomingNotificationView(context: Context) {
 
         val mediaType = TUICallState.instance.mediaType.get()
         if (mediaType == MediaType.Video) {
-            remoteViews?.setTextViewText(R.id.tv_desc, context.getString(R.string.tuicallkit_invite_video_call))
+            remoteViews?.setTextViewText(R.id.tv_desc, context.getString(R.string.call_invite_video_call))
             remoteViews?.setImageViewResource(R.id.img_media_type, R.drawable.tuicallkit_ic_video_incoming)
-            remoteViews?.setImageViewResource(R.id.btn_accept, R.drawable.tuicallkit_ic_dialing_video)
+            remoteViews?.setImageViewResource(R.id.btn_accept, R.drawable.call_video_accept_ic)
         } else {
-            remoteViews?.setTextViewText(R.id.tv_desc, context.getString(R.string.tuicallkit_invite_audio_call))
+            remoteViews?.setTextViewText(R.id.tv_desc, context.getString(R.string.call_invite_audio_call))
             remoteViews?.setImageViewResource(R.id.img_media_type, R.drawable.tuicallkit_ic_float)
-            remoteViews?.setImageViewResource(R.id.btn_accept, R.drawable.tuicallkit_bg_dialing)
+            remoteViews?.setImageViewResource(R.id.btn_accept, R.drawable.call_chat_accept_ic)
         }
 
 //        if (user.avatar.get().isNullOrEmpty()) {
-//            remoteViews?.setImageViewResource(R.id.img_incoming_avatar, R.drawable.tuicallkit_ic_avatar)
+//            remoteViews?.setImageViewResource(R.id.img_incoming_avatar, R.drawable.common_default_avatar_ic)
 //            notificationManager.notify(notificationId, notification)
 //        } else {
 //            val uri = Uri.parse(user.avatar.get())
 //
 //            Glide.with(context).asBitmap().load(uri)
 //                .diskCacheStrategy(DiskCacheStrategy.ALL)
-//                .placeholder(R.drawable.tuicallkit_ic_avatar)
+//                .placeholder(R.drawable.common_default_avatar_ic)
 //                .apply(RequestOptions.bitmapTransform(RoundedCorners(15)))
 //                .into(object : SimpleTarget<Bitmap>() {
 //                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
@@ -98,7 +90,7 @@ class IncomingNotificationView(context: Context) {
 //                    }
 //
 //                    override fun onLoadFailed(errorDrawable: Drawable?) {
-//                        remoteViews?.setImageViewResource(R.id.img_incoming_avatar, R.drawable.tuicallkit_ic_avatar)
+//                        remoteViews?.setImageViewResource(R.id.img_incoming_avatar, R.drawable.common_default_avatar_ic)
 //                        notificationManager.notify(notificationId, notification)
 //                    }
 //                })
@@ -126,13 +118,13 @@ class IncomingNotificationView(context: Context) {
 
         builder.setChannelId(channelId)
         builder.setTimeoutAfter(Constants.SIGNALING_MAX_TIME * 1000L)
-        builder.setSmallIcon(R.drawable.tuicallkit_ic_avatar)
+        builder.setSmallIcon(APP_R.drawable.ic_launcher)
         builder.setSound(null)
 
         builder.setContentIntent(getPendingIntent())
         builder.setFullScreenIntent(getPendingIntent(), true)
 
-        remoteViews = RemoteViews(context.packageName, R.layout.tuicallkit_incoming_notification_view)
+        remoteViews = RemoteViews(context.packageName, R.layout.call_incoming_notification_view)
         remoteViews?.setOnClickPendingIntent(R.id.btn_decline, getDeclineIntent())
         remoteViews?.setOnClickPendingIntent(R.id.btn_accept, getAcceptIntent())
 
@@ -142,8 +134,6 @@ class IncomingNotificationView(context: Context) {
     }
 
     private fun getPendingIntent(): PendingIntent {
-        // TODO: zhangfei
-        //val intent = Intent(context, CallKitActivity::class.java)
         val intent = Intent(context, CallActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
@@ -156,8 +146,6 @@ class IncomingNotificationView(context: Context) {
     }
 
     private fun getAcceptIntent(): PendingIntent {
-        // TODO: zhangfei
-        //val intent = Intent(context, CallKitActivity::class.java)
         val intent = Intent(context, CallActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         intent.action = Constants.ACCEPT_CALL_ACTION

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/userinfo/single/AudioCallUserInfoView.kt

@@ -10,6 +10,7 @@ import com.tencent.qcloud.tuikit.tuicallkit.state.TUICallState
 import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader
 import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView
 import com.trtc.tuikit.common.livedata.Observer
+import com.adealink.weparty.R as APP_R
 
 class AudioCallUserInfoView(context: Context) : BaseCallView(context) {
     private var imageBackground: ImageView? = null
@@ -19,7 +20,7 @@ class AudioCallUserInfoView(context: Context) : BaseCallView(context) {
 
     private var avatarObserver = Observer<String> {
         if (!TextUtils.isEmpty(it)) {
-            ImageLoader.loadImage(context.applicationContext, imageAvatar, it, R.drawable.tuicallkit_ic_avatar)
+            ImageLoader.loadImage(context.applicationContext, imageAvatar, it, APP_R.drawable.common_default_avatar_ic)
         }
         setBackground()
     }
@@ -40,7 +41,7 @@ class AudioCallUserInfoView(context: Context) : BaseCallView(context) {
         imageBackground = findViewById(R.id.img_user_background)
         imageAvatar = findViewById(R.id.img_avatar)
         textUserName = findViewById(R.id.tv_name)
-//        ImageLoader.loadImage(context, imageAvatar, userModel.avatar.get(), R.drawable.tuicallkit_ic_avatar)
+//        ImageLoader.loadImage(context, imageAvatar, userModel.avatar.get(), R.drawable.common_default_avatar_ic)
 //        textUserName!!.text = userModel.nickname.get()
 
         setBackground()

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/userinfo/single/VideoCallUserInfoView.kt

@@ -1,14 +1,12 @@
 package com.tencent.qcloud.tuikit.tuicallkit.view.component.userinfo.single
 
 import android.content.Context
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.widget.ImageView
 import android.widget.TextView
 import com.adealink.weparty.call.R
 import com.tencent.cloud.tuikit.engine.call.TUICallDefine
 import com.tencent.qcloud.tuikit.tuicallkit.state.TUICallState
-import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader
 import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView
 import com.trtc.tuikit.common.livedata.Observer
 
@@ -33,18 +31,6 @@ class VideoCallUserInfoView(context: Context) : BaseCallView(context) {
         }
     }
 
-    private var avatarObserver = Observer<String> {
-        if (!TextUtils.isEmpty(it)) {
-            ImageLoader.loadImage(context.applicationContext, imageAvatar, it, R.drawable.tuicallkit_ic_avatar)
-        }
-    }
-
-    private var nicknameObserver = Observer<String> {
-        if (!TextUtils.isEmpty(it)) {
-            textUserName?.text = it
-        }
-    }
-
     init {
         initView()
         addObserver()
@@ -54,7 +40,8 @@ class VideoCallUserInfoView(context: Context) : BaseCallView(context) {
         LayoutInflater.from(context).inflate(R.layout.tuicallkit_user_info_video, this)
         imageAvatar = findViewById(R.id.iv_user_avatar)
         textUserName = findViewById(R.id.tv_user_name)
-//        ImageLoader.loadImage(context, imageAvatar, userModel.avatar.get(), R.drawable.tuicallkit_ic_avatar)
+
+//        ImageLoader.loadImage(context, imageAvatar, userModel.avatar.get(), R.drawable.common_default_avatar_ic)
 //        textUserName!!.text = userModel.nickname.get()
 
         if (TUICallState.instance.selfUser.get().callStatus.get() == TUICallDefine.Status.Accept
@@ -69,14 +56,10 @@ class VideoCallUserInfoView(context: Context) : BaseCallView(context) {
     override fun addObserver() {
         TUICallState.instance.selfUser.get().callStatus.observe(callStatusObserver)
         TUICallState.instance.mediaType.observe(mediaTypeObserver)
-//        userModel.avatar.observe(avatarObserver)
-//        userModel.nickname.observe(nicknameObserver)
     }
 
     override fun removeObserver() {
         TUICallState.instance.selfUser.get().callStatus.removeObserver(callStatusObserver)
         TUICallState.instance.mediaType.removeObserver(mediaTypeObserver)
-//        userModel.avatar.removeObserver(avatarObserver)
-//        userModel.nickname.removeObserver(nicknameObserver)
     }
 }

module/call/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/videolayout/VideoView.kt

@@ -25,6 +25,7 @@ import com.tencent.qcloud.tuikit.tuicallkit.view.common.CustomLoadingView
 import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView
 import com.tencent.qcloud.tuikit.tuicallkit.viewmodel.component.videolayout.VideoViewModel
 import com.trtc.tuikit.common.livedata.Observer
+import com.adealink.weparty.R as APP_R
 
 
 /**
@@ -121,7 +122,7 @@ class VideoView(context: Context) : BaseCallView(context) {
 
     private var avatarObserver = Observer<String> {
         if (!TextUtils.isEmpty(it)) {
-            ImageLoader.loadImage(context.applicationContext, imageAvatar, it, R.drawable.tuicallkit_ic_avatar)
+            ImageLoader.loadImage(context.applicationContext, imageAvatar, it, APP_R.drawable.common_default_avatar_ic)
             ImageLoader.loadBlurImage(context, imageBackground, it)
         }
     }
@@ -282,7 +283,7 @@ class VideoView(context: Context) : BaseCallView(context) {
             layoutParams.height = ScreenUtil.dip2px(80.0f)
             imageAvatar?.round = 12f
         }
-//        ImageLoader.loadImage(context, imageAvatar, viewModel?.user?.avatar?.get(), R.drawable.tuicallkit_ic_avatar)
+//        ImageLoader.loadImage(context, imageAvatar, viewModel?.user?.avatar?.get(), R.drawable.common_default_avatar_ic)
         imageAvatar?.layoutParams = layoutParams
     }
 

module/call/src/main/res/drawable/tuicallkit_bg_incoming_view.xml → module/call/src/main/res/drawable/call_bg_incoming_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#22262E" />
+    <solid android:color="@color/white" />
     <corners android:radius="12dp" />
 </shape>

module/call/src/main/res/drawable/tuicallkit_bg_dialing.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tuicallkit_ic_dialing_pressed" android:state_pressed="true" android:state_enabled="true" />
-    <item android:drawable="@drawable/tuicallkit_ic_dialing" android:state_pressed="false" android:state_enabled="true" />
-</selector>

module/call/src/main/res/drawable/tuicallkit_bg_hangup.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/tuicallkit_ic_hangup_pressed" android:state_enabled="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/tuicallkit_ic_hangup" android:state_enabled="true" android:state_pressed="false" />
-</selector>

module/call/src/main/res/layout/call_incoming_float_view.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:background="@drawable/call_bg_incoming_view"
+        android:orientation="horizontal"
+        android:paddingHorizontal="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.adealink.weparty.commonui.imageview.AvatarView
+            android:id="@+id/iv_avatar"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/common_default_avatar_ic"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:round="8dp" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar"
+            app:srcCompat="@drawable/common_online_ic" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:ellipsize="end"
+            android:gravity="start"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:textColor="@color/color_222222"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toTopOf="@id/tv_tips"
+            app:layout_constraintEnd_toStartOf="@id/reject_btn"
+            app:layout_constraintStart_toEndOf="@id/iv_avatar"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="spread"
+            tools:text="name" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_tips"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:ellipsize="end"
+            android:gravity="start"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:textColor="@color/color_777777"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/reject_btn"
+            app:layout_constraintStart_toEndOf="@id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@id/tv_name"
+            tools:text="tips" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/reject_btn"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="16dp"
+            android:src="@drawable/call_reject_ic"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/accept_btn"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/accept_btn"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="@drawable/call_chat_accept_ic"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

module/call/src/main/res/layout/tuicallkit_incoming_notification_view.xml → module/call/src/main/res/layout/call_incoming_notification_view.xml

@@ -6,6 +6,7 @@
     android:background="@color/tuicallkit_color_transparent"
     android:orientation="horizontal">
 
+    <!--通知栏只能使用基础控件来实现-->
     <ImageView
         android:id="@+id/img_incoming_avatar"
         android:layout_width="40dp"
@@ -16,7 +17,7 @@
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="12dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/tuicallkit_ic_avatar" />
+        android:src="@drawable/common_default_avatar_ic" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -70,7 +71,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="12dp"
         android:layout_marginEnd="16dp"
-        android:src="@drawable/tuicallkit_bg_hangup" />
+        android:src="@drawable/call_reject_ic" />
 
     <ImageView
         android:id="@+id/btn_accept"
@@ -78,5 +79,5 @@
         android:layout_height="36dp"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="8dp"
-        android:src="@drawable/tuicallkit_bg_dialing" />
+        android:src="@drawable/call_chat_accept_ic" />
 </LinearLayout>

module/call/src/main/res/layout/layout_call_chat_called_waiting_function.xml

@@ -16,7 +16,7 @@
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/call_chat_reject_ic" />
+        app:srcCompat="@drawable/call_reject_ic" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/accept_btn"

module/call/src/main/res/layout/layout_call_chat_caller_waiting_function.xml

@@ -16,7 +16,7 @@
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/call_chat_reject_ic" />
+        app:srcCompat="@drawable/call_reject_ic" />
 
 
 </merge>

module/call/src/main/res/layout/layout_call_video_called_waiting_function.xml

@@ -60,7 +60,7 @@
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/barrier_bottom"
-        app:srcCompat="@drawable/call_chat_reject_ic" />
+        app:srcCompat="@drawable/call_reject_ic" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/accept_btn"

module/call/src/main/res/layout/layout_call_video_caller_waiting_function.xml

@@ -45,7 +45,7 @@
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/barrier_bottom"
-        app:srcCompat="@drawable/call_chat_reject_ic" />
+        app:srcCompat="@drawable/call_reject_ic" />
 
 
 </merge>

module/call/src/main/res/layout/tuicallkit_float_call_group_view.xml

@@ -28,7 +28,7 @@
                 android:id="@+id/iv_avatar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:src="@drawable/tuicallkit_ic_avatar"
+                android:src="@drawable/common_default_avatar_ic"
                 android:visibility="gone" />
 
             <ImageView

module/call/src/main/res/layout/tuicallkit_float_call_view.xml

@@ -35,7 +35,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
-                android:src="@drawable/tuicallkit_ic_avatar"
+                android:src="@drawable/common_default_avatar_ic"
                 android:visibility="visible" />
         </FrameLayout>
 

module/call/src/main/res/layout/tuicallkit_function_view_audio.xml

@@ -54,7 +54,7 @@
             android:id="@+id/img_hangup"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:src="@drawable/tuicallkit_bg_hangup" />
+            android:src="@drawable/call_reject_ic" />
 
         <TextView
             android:layout_width="wrap_content"

module/call/src/main/res/layout/tuicallkit_function_view_invited_waiting.xml

@@ -24,7 +24,7 @@
         <ImageView
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:src="@drawable/tuicallkit_bg_hangup" />
+            android:src="@drawable/call_reject_ic" />
 
         <TextView
             android:id="@+id/tv_reject"
@@ -52,7 +52,7 @@
         <ImageView
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:src="@drawable/tuicallkit_bg_dialing" />
+            android:src="@drawable/call_chat_accept_ic" />
 
         <TextView
             android:id="@+id/tv_dialing"

module/call/src/main/res/layout/tuicallkit_function_view_video.xml

@@ -87,7 +87,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:layout_marginTop="22dp"
-        android:src="@drawable/tuicallkit_bg_hangup"
+        android:src="@drawable/call_reject_ic"
         app:layout_constraintBottom_toBottomOf="@+id/iv_expanded"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

module/call/src/main/res/layout/tuicallkit_function_view_video_inviting.xml

@@ -25,7 +25,7 @@
         <ImageView
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:src="@drawable/tuicallkit_bg_hangup" />
+            android:src="@drawable/call_reject_ic" />
 
         <TextView
             android:layout_width="wrap_content"

module/call/src/main/res/layout/tuicallkit_incoming_float_view.xml

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/tuicallkit_bg_incoming_view"
-    android:orientation="horizontal">
-
-    <androidx.constraintlayout.utils.widget.ImageFilterView
-        android:id="@+id/img_float_avatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginBottom="16dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/tuicallkit_ic_avatar"
-        app:round="8dp" />
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/tv_float_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/tuicallkit_color_white"
-            android:textSize="18sp"
-            tools:hint="inviter" />
-
-        <TextView
-            android:id="@+id/tv_float_desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/tuicallkit_color_white"
-            android:textSize="12sp"
-            tools:hint="description" />
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/btn_float_decline"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:src="@drawable/tuicallkit_bg_hangup" />
-
-    <ImageView
-        android:id="@+id/btn_float_accept"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/tuicallkit_bg_dialing" />
-</LinearLayout>

module/call/src/main/res/layout/tuicallkit_list_item_group_user.xml

@@ -33,7 +33,7 @@
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
             android:scaleType="centerCrop"
-            android:src="@drawable/tuicallkit_ic_avatar"
+            android:src="@drawable/common_default_avatar_ic"
             app:corner_radius="12dp" />
 
         <TextView

module/call/src/main/res/layout/tuicallkit_user_info_audio.xml

@@ -16,7 +16,7 @@
         android:id="@+id/img_avatar"
         android:layout_width="100dp"
         android:layout_height="100dp"
-        android:src="@drawable/tuicallkit_ic_avatar"
+        android:src="@drawable/common_default_avatar_ic"
         app:corner_radius="6dp"
         app:layout_constraintBottom_toBottomOf="@id/tv_name"
         app:layout_constraintEnd_toEndOf="parent"

module/call/src/main/res/layout/tuicallkit_user_info_group_caller.xml

@@ -9,7 +9,7 @@
         android:id="@+id/img_avatar"
         android:layout_width="120dp"
         android:layout_height="120dp"
-        android:src="@drawable/tuicallkit_ic_avatar"
+        android:src="@drawable/common_default_avatar_ic"
         app:corner_radius="15dp"
         app:layout_constraintBottom_toBottomOf="@id/tv_name"
         app:layout_constraintEnd_toEndOf="parent"

module/call/src/main/res/layout/tuicallkit_user_info_video.xml

@@ -10,7 +10,7 @@
         android:id="@+id/iv_user_avatar"
         android:layout_width="100dp"
         android:layout_height="100dp"
-        android:src="@drawable/tuicallkit_ic_avatar"
+        android:src="@drawable/common_default_avatar_ic"
         app:corner_radius="6dp"
         app:layout_constraintBottom_toBottomOf="@id/tv_user_name"
         app:layout_constraintEnd_toEndOf="parent"

module/call/src/main/res/layout/tuicallkit_video_view.xml

@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitXY"
-        android:src="@drawable/tuicallkit_ic_avatar" />
+        android:src="@drawable/common_default_avatar_ic" />
 
     <com.tencent.qcloud.tuikit.tuicallkit.view.common.CustomLoadingView
         android:id="@+id/img_loading"

module/call/src/main/res/values-ar/strings.xml

@@ -16,8 +16,8 @@
     <string name="tuicallkit_toast_enable_camera">تشغيل الكاميرا</string>
     <string name="tuicallkit_toast_disable_camera">إيقاف الكاميرا</string>
     <string name="tuicallkit_waiting_accept">في انتظار قبول المستخدم...</string>
-    <string name="tuicallkit_invite_audio_call">دعوتك لمكالمة صوتية...</string>
-    <string name="tuicallkit_invite_video_call">دعوتك لمكالمة فيديو...</string>
+    <string name="call_invite_audio_call">دعوتك لمكالمة صوتية...</string>
+    <string name="call_invite_video_call">دعوتك لمكالمة فيديو...</string>
     <string name="tuicallkit_text_microphone">ميكروفون</string>
     <string name="tuicallkit_text_hangup">إنهاء المكالمة</string>
     <string name="tuicallkit_text_reject">رفض</string>

module/call/src/main/res/values-en/strings.xml

@@ -15,8 +15,8 @@
     <string name="tuicallkit_toast_enable_camera">Camera On</string>
     <string name="tuicallkit_toast_disable_camera">Camera Off</string>
     <string name="tuicallkit_waiting_accept">Awaiting response</string>
-    <string name="tuicallkit_invite_audio_call">Invited you to a voice call</string>
-    <string name="tuicallkit_invite_video_call">Invites you to a video call</string>
+    <string name="call_invite_audio_call">Invited you to a voice call</string>
+    <string name="call_invite_video_call">Invites you to a video call</string>
     <string name="tuicallkit_text_microphone">Mic</string>
     <string name="tuicallkit_text_hangup">Hang Up</string>
     <string name="tuicallkit_text_reject">Decline</string>

module/call/src/main/res/values-ja/strings.xml

@@ -15,8 +15,8 @@
     <string name="tuicallkit_toast_enable_camera">カメラオン</string>
     <string name="tuicallkit_toast_disable_camera">カメラオフ</string>
     <string name="tuicallkit_waiting_accept">応答を待っています</string>
-    <string name="tuicallkit_invite_audio_call">音声通話に招待されました</string>
-    <string name="tuicallkit_invite_video_call">ビデオ通話に招待されました</string>
+    <string name="call_invite_audio_call">音声通話に招待されました</string>
+    <string name="call_invite_video_call">ビデオ通話に招待されました</string>
     <string name="tuicallkit_text_microphone">マイク</string>
     <string name="tuicallkit_text_hangup">マイク</string>
     <string name="tuicallkit_text_reject">拒否</string>

module/call/src/main/res/values-zh-rHK/strings.xml

@@ -16,8 +16,8 @@
     <string name="tuicallkit_toast_enable_camera">攝像頭已開</string>
     <string name="tuicallkit_toast_disable_camera">攝像頭已關</string>
     <string name="tuicallkit_waiting_accept">等待對方接受邀請</string>
-    <string name="tuicallkit_invite_audio_call">邀請你語音通話</string>
-    <string name="tuicallkit_invite_video_call">邀請你視頻通話</string>
+    <string name="call_invite_audio_call">邀請你語音通話</string>
+    <string name="call_invite_video_call">邀請你視頻通話</string>
     <string name="tuicallkit_text_microphone">麥克風</string>
     <string name="tuicallkit_text_hangup">掛斷</string>
     <string name="tuicallkit_text_reject">拒接</string>

module/call/src/main/res/values-zh-rTW/strings.xml

@@ -16,8 +16,8 @@
     <string name="tuicallkit_toast_enable_camera">攝像頭已開</string>
     <string name="tuicallkit_toast_disable_camera">攝像頭已關</string>
     <string name="tuicallkit_waiting_accept">等待對方接受邀請</string>
-    <string name="tuicallkit_invite_audio_call">邀請你語音通話</string>
-    <string name="tuicallkit_invite_video_call">邀請你視頻通話</string>
+    <string name="call_invite_audio_call">邀請你語音通話</string>
+    <string name="call_invite_video_call">邀請你視頻通話</string>
     <string name="tuicallkit_text_microphone">麥克風</string>
     <string name="tuicallkit_text_hangup">掛斷</string>
     <string name="tuicallkit_text_reject">拒接</string>

module/call/src/main/res/values-zh/strings.xml

@@ -16,8 +16,8 @@
     <string name="tuicallkit_toast_enable_camera">摄像头已开</string>
     <string name="tuicallkit_toast_disable_camera">摄像头已关</string>
     <string name="tuicallkit_waiting_accept">等待对方接受邀请</string>
-    <string name="tuicallkit_invite_audio_call">邀请你语音通话</string>
-    <string name="tuicallkit_invite_video_call">邀请你视频通话</string>
+    <string name="call_invite_audio_call">邀请你语音通话</string>
+    <string name="call_invite_video_call">邀请你视频通话</string>
     <string name="tuicallkit_text_microphone">麦克风</string>
     <string name="tuicallkit_text_hangup">挂断</string>
     <string name="tuicallkit_text_reject">拒接</string>

module/call/src/main/res/values/strings.xml

@@ -20,8 +20,8 @@
     <string name="tuicallkit_toast_enable_camera">Camera On</string>
     <string name="tuicallkit_toast_disable_camera">Camera Off</string>
     <string name="tuicallkit_waiting_accept">Awaiting response</string>
-    <string name="tuicallkit_invite_audio_call">Invited you to a voice call</string>
-    <string name="tuicallkit_invite_video_call">Invites you to a video call</string>
+    <string name="call_invite_audio_call">Invited you to a voice call</string>
+    <string name="call_invite_video_call">Invites you to a video call</string>
     <string name="tuicallkit_text_microphone">Mic</string>
     <string name="tuicallkit_text_hangup">Hang Up</string>
     <string name="tuicallkit_text_reject">Decline</string>

module/room/src/main/res/layout/layout_room_apply_on_mic_list.xml

@@ -16,13 +16,12 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/room_apply_on_mic_ic" />
 
-    <com.adealink.frame.dot.DotView
+    <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="8dp"
         android:layout_height="8dp"
-        style="@style/CommonRedDot"
-        app:dot_size="8dp"
         app:layout_constraintEnd_toEndOf="@id/iv_apply_on_mic"
-        app:layout_constraintTop_toTopOf="@id/iv_apply_on_mic" />
+        app:layout_constraintTop_toTopOf="@id/iv_apply_on_mic"
+        app:srcCompat="@drawable/common_online_ic" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_title"