yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整心愿单浮标大小

Browse Source 
修复注册默认值没香港标识
调整小助手图片位置
This commit is contained in:
zlzw 2023-04-07 15:37:51 +08:00
parent 9d38ff7c8f
commit 33034ce4d6
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
View File

@ -17,6 +17,7 @@ import android.text.style.AbsoluteSizeSpan;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.text.style.ImageSpan; import android.text.style.ImageSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.MeasureSpec; import android.view.View.MeasureSpec;
@ -177,6 +178,7 @@ public class LiveTextRender {
} }
public void aiAutomaticSpeech(Context activity, TextView textView, AiAutomaticSpeechModel model) { public void aiAutomaticSpeech(Context activity, TextView textView, AiAutomaticSpeechModel model) {
Log.i("AI小助手", "aiAutomaticSpeech: "+model.getIcon());
ImgLoader.displayDrawable(activity, model.getIcon(), new ImgLoader.DrawableCallback() { ImgLoader.displayDrawable(activity, model.getIcon(), new ImgLoader.DrawableCallback() {
@Override @Override
public void onLoadSuccess(Drawable drawable) { public void onLoadSuccess(Drawable drawable) {
@ -226,7 +228,7 @@ public class LiveTextRender {
} }
drawable.setBounds(0, 0, DpUtil.dp2px(39), DpUtil.dp2px(15)); drawable.setBounds(0, 0, DpUtil.dp2px(39), DpUtil.dp2px(15));
//用这个drawable对象代替字符串easy //用这个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); spannableStringBuilder.setSpan(span, 0, 3, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
textView.setText(spannableStringBuilder); textView.setText(spannableStringBuilder);
} }

2
live/src/main/res/layout/view_live_room.xml
View File

@ -699,7 +699,7 @@
<com.ms.banner.Banner <com.ms.banner.Banner
android:id="@+id/top_banner1" android:id="@+id/top_banner1"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="64dp" android:layout_height="76dp"
android:layout_below="@+id/live_rank_pk" android:layout_below="@+id/live_rank_pk"
android:layout_alignEnd="@+id/live_rank_pk" android:layout_alignEnd="@+id/live_rank_pk"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"

2
live/src/main/res/layout/view_live_top_banner_call_me.xml
View File

@ -30,7 +30,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="5dp"
android:background="@drawable/bg_live_top_banner_text" android:background="@drawable/bg_live_top_banner_text"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingTop="2dp" android:paddingTop="2dp"

2
live/src/main/res/layout/view_live_top_banner_wish.xml
View File

@ -6,7 +6,7 @@
<FrameLayout <FrameLayout
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="52dp" android:layout_height="64dp"
android:background="@mipmap/bg_xyd"> android:background="@mipmap/bg_xyd">
<ImageView <ImageView

2
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@ -195,7 +195,7 @@ public class RegisterActivity extends AbsActivity {
//String ct = Locale.getDefault().getCountry(); //String ct = Locale.getDefault().getCountry();
String ct = IMLoginManager.get(mContext).getString("sys_user_area"); 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++) { for (int i = 0; i < allCountries.size(); i++) {
if (allCountries.get(i).chs.equals(ct)) { if (allCountries.get(i).chs.equals(ct)) {
String countryName = allCountries.get(i).name; String countryName = allCountries.get(i).name;