From 33034ce4d6ae96c4481ced868be175bd80575d0d Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Fri, 7 Apr 2023 15:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BF=83=E6=84=BF=E5=8D=95?=
 =?UTF-8?q?=E6=B5=AE=E6=A0=87=E5=A4=A7=E5=B0=8F=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=BB=98=E8=AE=A4=E5=80=BC=E6=B2=A1=E9=A6=99?=
 =?UTF-8?q?=E6=B8=AF=E6=A0=87=E8=AF=86=20=E8=B0=83=E6=95=B4=E5=B0=8F?=
 =?UTF-8?q?=E5=8A=A9=E6=89=8B=E5=9B=BE=E7=89=87=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 live/src/main/java/com/yunbao/live/utils/LiveTextRender.java  | 4 +++-
 live/src/main/res/layout/view_live_room.xml                   | 2 +-
 live/src/main/res/layout/view_live_top_banner_call_me.xml     | 2 +-
 live/src/main/res/layout/view_live_top_banner_wish.xml        | 2 +-
 .../main/java/com/yunbao/main/activity/RegisterActivity.java  | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
index bf274caca..b0340ed96 100644
--- a/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
+++ b/live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
@@ -17,6 +17,7 @@ import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
 import android.text.style.StyleSpan;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.MeasureSpec;
@@ -177,6 +178,7 @@ public class LiveTextRender {
     }
 
     public void aiAutomaticSpeech(Context activity, TextView textView, AiAutomaticSpeechModel model) {
+        Log.i("AI小助手", "aiAutomaticSpeech: "+model.getIcon());
         ImgLoader.displayDrawable(activity, model.getIcon(), new ImgLoader.DrawableCallback() {
             @Override
             public void onLoadSuccess(Drawable drawable) {
@@ -226,7 +228,7 @@ public class LiveTextRender {
                 }
                 drawable.setBounds(0, 0, DpUtil.dp2px(39), DpUtil.dp2px(15));
                 //用这个drawable对象代替字符串easy
-                ImageSpan span = new ImageSpan(drawable, ImageSpan.ALIGN_BASELINE);
+                ImageSpan span = new ImageSpan(drawable, ImageSpan.ALIGN_BOTTOM);
                 spannableStringBuilder.setSpan(span, 0, 3, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
                 textView.setText(spannableStringBuilder);
             }
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 79894a164..4aedb0d7a 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -699,7 +699,7 @@
     <com.ms.banner.Banner
         android:id="@+id/top_banner1"
         android:layout_width="52dp"
-        android:layout_height="64dp"
+        android:layout_height="76dp"
         android:layout_below="@+id/live_rank_pk"
         android:layout_alignEnd="@+id/live_rank_pk"
         android:layout_marginLeft="5dp"
diff --git a/live/src/main/res/layout/view_live_top_banner_call_me.xml b/live/src/main/res/layout/view_live_top_banner_call_me.xml
index 362dc435b..0f37b8cbf 100644
--- a/live/src/main/res/layout/view_live_top_banner_call_me.xml
+++ b/live/src/main/res/layout/view_live_top_banner_call_me.xml
@@ -30,7 +30,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="5dp"
         android:background="@drawable/bg_live_top_banner_text"
         android:paddingStart="5dp"
         android:paddingTop="2dp"
diff --git a/live/src/main/res/layout/view_live_top_banner_wish.xml b/live/src/main/res/layout/view_live_top_banner_wish.xml
index 7f3c7a9d9..01e7b3e51 100644
--- a/live/src/main/res/layout/view_live_top_banner_wish.xml
+++ b/live/src/main/res/layout/view_live_top_banner_wish.xml
@@ -6,7 +6,7 @@
 
     <FrameLayout
         android:layout_width="52dp"
-        android:layout_height="52dp"
+        android:layout_height="64dp"
         android:background="@mipmap/bg_xyd">
 
         <ImageView
diff --git a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
index 9d93487f5..d57b8abd9 100644
--- a/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
@@ -195,7 +195,7 @@ public class RegisterActivity extends AbsActivity {
 
         //String ct = Locale.getDefault().getCountry();
         String ct = IMLoginManager.get(mContext).getString("sys_user_area");
-        ct = TextUtils.equals("中国", ct) ? "HK" : ct;
+        ct = TextUtils.equals("中国", ct) ? "中国香港" : ct;
         for (int i = 0; i < allCountries.size(); i++) {
             if (allCountries.get(i).chs.equals(ct)) {
                 String countryName = allCountries.get(i).name;