tongmengxiao 11 månader sedan
förälder
incheckning
ef9cbea983

+ 1 - 6
baseswago/src/main/java/com/swago/baseswago/model/im/CloseAccountData.kt

@@ -1,10 +1,5 @@
 package com.swago.baseswago.model.im
 
 data class CloseAccountData(
-    val userId:String = "",
-    val agentId:String = "",
-    val agentName:String = "",
-    val agentNickName:String = "",
-    val logId:Int = 0,
-    val broadcastLevel:Int = 0
+    val userId:String = ""
 )

+ 5 - 11
baseswago/src/main/res/layout/dialog_close_account.xml

@@ -41,6 +41,9 @@
             android:textColor="#0F172A"
             android:textSize="14sp"
             android:gravity="center"
+            android:paddingStart="10dp"
+            android:paddingEnd="10dp"
+            android:lines="4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_invite_title" />
@@ -49,9 +52,10 @@
             android:id="@+id/tvOk"
             android:layout_width="match_parent"
             android:layout_height="44dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             android:layout_marginEnd="24dp"
             android:layout_marginStart="24dp"
+            android:layout_marginBottom="30dp"
             android:background="@drawable/shape_ff56b7_37"
             android:gravity="center"
             android:text="OK"
@@ -71,14 +75,4 @@
         android:background="@mipmap/bg_invite"
         app:layout_constraintTop_toTopOf="@+id/cl_content" />
 
-    <ImageView
-        android:id="@+id/iv_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:src="@mipmap/ic_finish_password"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cl_content" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 0 - 1
baseswago/src/main/res/layout/dialog_enter_password.xml

@@ -15,7 +15,6 @@
         android:layout_marginEnd="40dp"
         android:background="@drawable/shape_white_20"
         android:paddingBottom="30dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
 

+ 5 - 1
home/src/main/java/com/swago/home/innerhome/HomeVm.kt

@@ -60,7 +60,11 @@ class HomeVm(application: Application) : BaseViewModel(application) {
             close_account
         ){
             it.data?.let {
-                closeAccountFun?.invoke(it)
+                UserInfo.getUserInfo()?.let { userInfo ->
+                    if (it.userId == userInfo.id){
+                        closeAccountFun?.invoke(it)
+                    }
+                }
             }
         }
     }