ui

.idea/misc.xml

@@ -20,6 +20,7 @@
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.4015384615384615" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.39375" />
         <entry key="baseswago/src/main/res/drawable/shape_161722_top_20.xml" value="0.283" />
+        <entry key="baseswago/src/main/res/drawable/shape_20000000_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_20000000_41.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_2f3043_37.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_80000000_20.xml" value="0.13229166666666667" />
@@ -37,6 +38,7 @@
         <entry key="baseswago/src/main/res/drawable/shape_f7f8fa_5.xml" value="0.19895833333333332" />
         <entry key="baseswago/src/main/res/drawable/shape_fef0bf_30fef0bf_12.xml" value="0.20572916666666666" />
         <entry key="baseswago/src/main/res/drawable/shape_ff4747_ffe249_23.xml" value="0.20572916666666666" />
+        <entry key="baseswago/src/main/res/drawable/shape_ff56b7_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_37.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9300_20.xml" value="0.21927083333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_touming.xml" value="0.37333333333333335" />

baseswago/src/main/java/com/swago/baseswago/UserVm.kt

@@ -62,6 +62,7 @@ class UserVm(application: Application) : BaseViewModel(application) {
         requestData {
             val data = ApiManager.userApi.modifyUserInfo(uploadInfo)
             modifyInfoLiveData.value = data
+            SwagoLoading.cancelLoadingDialog()
         }
     }
 
@@ -164,6 +165,7 @@ class UserVm(application: Application) : BaseViewModel(application) {
                 .createFormData("file", file.name, fileRQ)
             val data = ApiManager.userApi.uploadPic(requestBody)
             uploadPicUrlLiveData.value = data
+            SwagoLoading.cancelLoadingDialog()
         }
     }
 

baseswago/src/main/res/drawable/shape_20000000_14.xml

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

baseswago/src/main/res/drawable/shape_ff56b7_14.xml

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

baseswago/src/main/res/layout/dialog_person_data.xml

@@ -230,18 +230,6 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-        <ImageView
-            android:id="@+id/ivSex"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="5dp"
-            android:src="@mipmap/info_female"
-            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-            app:layout_constraintEnd_toEndOf="@+id/ivAvatar" />
-
-
-
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/ivAvatar"
             android:layout_width="80dp"
@@ -252,6 +240,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <ImageView
+            android:id="@+id/ivSex"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            tools:src="@mipmap/info_female"
+            app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
+            app:layout_constraintEnd_toEndOf="@+id/ivAvatar" />
+
 
         <ImageView
             android:id="@+id/ivOnLive"
@@ -260,7 +258,7 @@
             android:src="@mipmap/onlive"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
-            app:layout_constraintEnd_toEndOf="@+id/ivAvatar"
+            app:layout_constraintStart_toStartOf="@+id/ivAvatar"
             tools:visibility="visible" />
 
 

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

@@ -56,20 +56,19 @@ class RoomChatAdapter :
             when (item.getMsgType()) {
                 RoomMsgType.ROOM_CHAT_TEXT -> {
                     val sb = StringBuffer()
-                    sb.append(item.getSenderName())
-                        .append("<img src='" + "file:///xx/")
-                        .append(LEVEL_KEY).append(".png")
-                        .append("'>")
 
                     if (item.getIsBenefit() == 1) {
                         count++
                         sb.append("<img src='" + "file:///android_asset/icon_chat_benefit.png")
                             .append("'>")
                     }
-                    sb.append("：")
-
 
-                    sb.append(item.getMsgContent())
+                    sb.append("<img src='" + "file:///xx/")
+                        .append(LEVEL_KEY).append(".png")
+                        .append("'>")
+                        .append(item.getSenderName())
+                        .append("：")
+                        .append(item.getMsgContent())
 
                     val glideImageGetter = HtmlImageGetter(mContext, tvContent, 14, localImageKey)
                     val fromHtml = Html.fromHtml(sb.toString(), glideImageGetter, null)
@@ -112,30 +111,27 @@ class RoomChatAdapter :
                     if (item.getIsBenefit() == 1) {
                         setBackgroundRes(R.id.tvContent, R.drawable.shape_e87230_ddb558_all_20)
                     } else {
-                        setBackgroundRes(R.id.tvContent, R.drawable.shape_white_20)
+                        setBackgroundRes(R.id.tvContent, R.drawable.shape_20000000_14)
                     }
                 }
 
                 RoomMsgType.SYSTEM_MESSAGE -> {
                     span = SpannableString(item.getMsgContent())
-                    setBackgroundRes(R.id.tvContent, R.drawable.shape_4bce98_20)
+                    setBackgroundRes(R.id.tvContent, R.drawable.shape_20000000_14)
                 }
                 RoomMsgType.USER_ENTER_ROOM -> {
                     val sb = StringBuffer()
-                    sb.append(item.getSenderName())
-                        .append("<img src='" + "file:///xx/")
-                        .append(LEVEL_KEY).append(".png")
-                        .append("'>")
-
                     if (item.getIsBenefit() == 1) {
                         count++
                         sb.append("<img src='" + "file:///android_asset/icon_chat_benefit.png")
                             .append("'>")
                     }
-                    sb.append("：")
-
-
-                    sb.append(item.getMsgContent())
+                    sb.append("<img src='" + "file:///xx/")
+                        .append(LEVEL_KEY).append(".png")
+                        .append("'>")
+                        .append(item.getSenderName())
+                        .append("：")
+                        .append(item.getMsgContent())
 
                     val glideImageGetter = HtmlImageGetter(mContext, tvContent, 14, localImageKey)
                     val fromHtml = Html.fromHtml(sb.toString(), glideImageGetter, null)
@@ -173,11 +169,11 @@ class RoomChatAdapter :
                     }
 
                     if (item.getIsBenefit() == 1) {
-                        setBackgroundRes(R.id.tvContent, R.drawable.shape_4bce98_20)
+                        setBackgroundRes(R.id.tvContent, R.drawable.shape_ff56b7_14)
                     } else {
                         when (item.getUserLevel()) {
                             in 0..37 -> {
-                                setBackgroundRes(R.id.tvContent, R.drawable.shape_4bce98_20)
+                                setBackgroundRes(R.id.tvContent, R.drawable.shape_20000000_14)
                             }
                             in 38..54 -> {
                                 setBackgroundRes(R.id.tvContent, R.drawable.shape_6c55ff_20)

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

@@ -13,7 +13,7 @@
         android:paddingTop="4dp"
         android:paddingEnd="12dp"
         android:paddingBottom="4dp"
-        android:textColor="#000"
+        android:textColor="#fff"
         android:textSize="14dp"
         android:gravity="start|center"
         android:background="@drawable/shape_white_20"

user/src/main/java/com/swago/user/EditInfoActivity.kt

@@ -1,6 +1,7 @@
 package com.swago.user
 
 import android.content.Intent
+import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -70,6 +71,12 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
 
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setImmersionBar(true,false)
+    }
+
+
     override fun initOther() {
         setBackView(binding.toolbar.ivBack)
         binding.toolbar.tvTitle.text =
@@ -188,6 +195,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
 
         binding.tvSave.setOnClickListener(object : NoDoubleClickListener() {
             override fun onClick() {
+                SwagoLoading.showLoadingDialog(this@EditInfoActivity)
                 val uploadInfo = UploadInfo()
                 uploadInfo.user_age = age
                 uploadInfo.user_constellation = constellation
@@ -226,6 +234,7 @@ class EditInfoActivity : BaseXActivity<ActivityUserEditBinding>() {
                                         }
 
                                         override fun onSuccess(file: File?) {
+                                            SwagoLoading.showLoadingDialog(this@EditInfoActivity)
                                             userVm.uploadFile(file.toString())
                                         }