修改举报按钮

.idea/.name

@@ -0,0 +1 @@
+Swago

app/src/main/java/com/swago/app/SplashVm.kt

@@ -112,9 +112,9 @@ class SplashVm(application: Application) : BaseViewModel(application) {
 
     private fun setBaseUrl(baseUrl: String) {
         if (BuildConfig.DEBUG) {
-//            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
+            UrlConstant.BASE_URL =   "http:test-api.swago.cn"
 //            UrlConstant.BASE_URL =   "http:huawei.swago.cn"
-            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
+//            UrlConstant.BASE_URL =   "https://pro-api.swago.cn"
         } else {
             UrlConstant.BASE_URL = baseUrl
         }

baseswago/src/main/java/com/swago/baseswago/constant/UrlConstant.kt

@@ -14,9 +14,9 @@ import java.io.File
 object UrlConstant {
 
     var BASE_URL = if (BuildConfig.DEBUG) {
-//            "http:test-api.swago.cn"
+            "http:test-api.swago.cn"
 //            "http:huawei.swago.cn"
-        "https://pro-api.swago.cn"
+//        "https://pro-api.swago.cn"
     } else {
             "https://pro-api.swago.cn"
         }

room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -32,6 +32,7 @@ import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.cusview.MediumTextView
 import com.swago.baseswago.cusview.SwagoImageView
 import com.swago.baseswago.dialog.ChoiceDialogFragment
+import com.swago.baseswago.dialog.ReportDialog
 import com.swago.baseswago.fragment.BaseXFragment
 import com.swago.baseswago.im.IRoomChat
 import com.swago.baseswago.model.im.GamePrize
@@ -420,6 +421,13 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
             }
         }
 
+        (iHeader as ComHeaderView).reportAnchorFun = {
+            SwagoRoomManager.iRoomInfo?.let {
+                ReportDialog.newInstance(it.getAnchorCode())
+                    .show(childFragmentManager, "ReportDialog")
+            }
+        }
+
         (iHeader as ComHeaderView).openAudienceListDialog = {
             AudienceListDialog.newInstance().show(childFragmentManager, "AudienceListDialog")
         }

room/src/main/java/com/swago/room/user/UserRoomFragment.kt

@@ -62,16 +62,6 @@ class UserRoomFragment : BaseComFragment<FragmentBaseComBinding>() {
                 dialog.show(childFragmentManager, "BenefitBagDialog")
             }
         })
-
-        binding.ivReport.visibility = ConstraintLayout.VISIBLE
-        binding.ivReport.setOnClickListener(object : NoDoubleClickListener() {
-            override fun onClick() {
-                SwagoRoomManager.iRoomInfo?.let {
-                    ReportDialog.newInstance(it.getAnchorCode())
-                        .show(childFragmentManager, "ReportDialog")
-                }
-            }
-        })
     }
 
 

room/src/main/java/com/swago/room/widget/ComHeaderView.kt

@@ -39,6 +39,7 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader, RoomTimer
     var openAudienceListDialog:(()->Unit)? = null
     var showAudioUserNoticeFun:(()->Unit)? = null
     var showFanClubFun:(()->Unit)? = null
+    var reportAnchorFun:(()->Unit)? = null
 
     //钻石收入
     private var localIncome = 0L
@@ -116,6 +117,12 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader, RoomTimer
                 showFanClubFun?.invoke()
             }
         })
+
+        binding.ivReport.setOnClickListener(object:NoDoubleClickListener() {
+            override fun onClick() {
+                reportAnchorFun?.invoke()
+            }
+        })
     }
 
 
@@ -155,6 +162,7 @@ class ComHeaderView  : ConstraintLayout, IRoomActiveListener, IHeader, RoomTimer
             binding.ivFans.visibility = View.VISIBLE
             binding.tvTime.visibility = View.VISIBLE
         }else{
+            binding.ivReport.visibility = View.VISIBLE
             if (iRoomInfo.getIsFollow()==1){
                 binding.tvFollow.visibility = View.GONE
                 binding.ivFans.visibility = View.VISIBLE

room/src/main/res/layout/fragment_base_com.xml

@@ -117,19 +117,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-
-    <ImageView
-        android:id="@+id/ivReport"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="@+id/rv"
-        android:padding="5dp"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_marginEnd="10dp"
-        android:src="@mipmap/icon_report"
-        android:layout_width="40dp"
-        android:layout_height="40dp"/>
-
     <com.swago.room.giftdandao.GiftDanDaoView
         android:id="@+id/danDaoView"
         app:layout_constraintBottom_toBottomOf="parent"

room/src/main/res/layout/layout_user_header_view.xml

@@ -247,5 +247,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <ImageView
+        android:id="@+id/ivReport"
+        app:layout_constraintStart_toEndOf="@+id/tvAnnouncement"
+        app:layout_constraintTop_toBottomOf="@+id/cl"
+        android:layout_marginTop="12dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_marginStart="10dp"
+        android:src="@mipmap/live_icon_report"
+        android:layout_width="20dp"
+        android:layout_height="20dp"/>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>