From 554bfa137a1a168b684990baa52ffcb627a875bc Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 22 Mar 2023 16:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B0=94=E6=B3=A1=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=85=B3=E6=B3=A8=E6=B6=88=E6=81=AF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=B6=88=E6=81=AF=EF=BC=8C=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/bean/NewLevelModel.java | 36 ++++++ .../common/manager/NewLevelManager.java | 2 + common/src/main/res/values-en/strings.xml | 2 +- common/src/main/res/values/strings.xml | 2 +- config.gradle | 4 +- live/src/main/assets/chat_message_bg.png | Bin 540 -> 712 bytes .../yunbao/live/adapter/LiveChatAdapter.java | 83 ++++++++----- .../com/yunbao/live/bean/LiveChatBean.java | 11 ++ .../com/yunbao/live/utils/LiveTextRender.java | 116 ++++++++++++++++-- .../live/views/LiveAudienceViewHolder.java | 14 +-- .../src/main/res/drawable/chat_message_bg.xml | 5 + live/src/main/res/layout/item_live_chat.xml | 48 ++++++-- .../main/res/mipmap-xxxhdpi/btn_attention.png | Bin 0 -> 28588 bytes .../yunbao/main/views/MainMeViewHolder.java | 12 +- 14 files changed, 272 insertions(+), 63 deletions(-) create mode 100644 live/src/main/res/drawable/chat_message_bg.xml create mode 100644 live/src/main/res/mipmap-xxxhdpi/btn_attention.png diff --git a/common/src/main/java/com/yunbao/common/bean/NewLevelModel.java b/common/src/main/java/com/yunbao/common/bean/NewLevelModel.java index abc884d0d..b477eba85 100644 --- a/common/src/main/java/com/yunbao/common/bean/NewLevelModel.java +++ b/common/src/main/java/com/yunbao/common/bean/NewLevelModel.java @@ -2,6 +2,7 @@ package com.yunbao.common.bean; import android.text.TextUtils; +import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; /** @@ -17,6 +18,17 @@ public class NewLevelModel extends BaseModel { private String levemax; @SerializedName("thumb") private String thumb; + @SerializedName("icon") + private String icon; + @SerializedName("colour") + private String colour; + @SerializedName("live_icon") + private String liveIcon; + + public static NewLevelModel objectFromData(String str) { + + return new Gson().fromJson(str, NewLevelModel.class); + } public String getId() { return id; @@ -67,4 +79,28 @@ public class NewLevelModel extends BaseModel { this.thumb = thumb; return this; } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getColour() { + return colour; + } + + public void setColour(String colour) { + this.colour = colour; + } + + public String getLiveIcon() { + return liveIcon; + } + + public void setLiveIcon(String liveIcon) { + this.liveIcon = liveIcon; + } } diff --git a/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java b/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java index 919da14af..51cb6f70a 100644 --- a/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java +++ b/common/src/main/java/com/yunbao/common/manager/NewLevelManager.java @@ -16,6 +16,8 @@ import java.util.List; public class NewLevelManager extends BaseCacheManager { private final String KEY_USER_LEVEL = "keyUserLevel"; private final String KEY_ANCHOR_LEVEL = "keyAnchorLevel"; + private final String KEY_LIVE_LEVEL = "keyLiveLevel"; + private List newLevelModels = new ArrayList<>(); private List keyAnchorLevel = new ArrayList<>(); diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index ba779e04e..b46fdb4e6 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -735,7 +735,7 @@ Exit User - If you don\'t take the initiative,how can we have a story?\nTell the anchor say hi~ + If you don\'t take the initiative,how can we have a story?Tell the anchor say hi~ + follow Enter activity diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 7d686fd4a..7906aafe9 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -780,7 +780,7 @@ 直接退出 用戶 - 你都不主動我們怎麼會有故事,\n跟主播Say Hi吧~ + 你都不主動我們怎麼會有故事,跟主播Say Hi吧~ + 關注 進入活動 diff --git a/config.gradle b/config.gradle index 59ac79f7b..2285dc3eb 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", //测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/assets/chat_message_bg.png b/live/src/main/assets/chat_message_bg.png index 3f1095d71b8a44219fff2c066968b35b60238126..4138e7e12289f519d646c632d70c9a0342b19291 100644 GIT binary patch delta 614 zcmV-s0-61s1jq%D7Ya-W1^@s673-Ncks%i$AOHXWAOHXW3;+NC3;+NC00000X#fBK zYXATMB>(^bCy`ksf2DDV#Q*>TFG)l}RCwC$-9c*ZE!*y>=ynI;b924+O+F>~-~Le|7qQ1+}Vvt{(X=*da&N ztLoF&4CZzF6VXNxibbs~nGJ`r06AOy!hc?`>*x&F2 zo{NbEu2iq9&!dC-rMhFrEHJ9Q>fM}!_cplHvzy0K{WLW&EU3q3%ECPy71XNphqka} z531`Ug1T##Hqfg2aYRtJ%o66cFej+*%@L~lZbVR?JHfew5kdI{Im~Qf&x~LkL4lw^ zP#`EkP#`D}6d)**aRDcP7!}l+F~PhR<^;7iN2uy_L{J~h5vuxUL{KN@2vxlw5!74v zQBc*J5kZ|*$7adG9ao=51XXopo-EuSa}Jst)Vli1Oj)R-X6|-x@?iH>Gqw$3$NXFU zKKJ1L4Nm-dx+%NYjDIf=JK(f>Ip^MKo1mIbd{W&J6$^;z*J*`u>av2W`e>zM0hf6% zH;rlApe|ObRCCSs{jB107*qoM6N<$f*g1n Ai~s-t literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^SAaN~gAGVN7Sy{6q(brvLXsJnm^guK7?1-plz>

_ly?}{HBmGvHT&DeB=U3KmpxTTY{@$&l(ep1h6X1qHm`{UtbzU^RB(TD^lclJG> zSN@8rUFp|5p*$njHgx~$v;VoWB4fjzKRerVC(Qh6*{KE7u71x--FN28kza;ttB#)F zUEdyWGh;FT)xxhE@*jTeIP3TKndAMo-_7RirHRu5-s(NRCv#<{rBi79a*k83EN|xc z2#Od?THp|%pdlav!W>*6%);8l1j3GtK->tFZU8HRD1#|MQr5VD0ZADalbUX_Z8cO| z@hY=x!Mn49tA3fg29!VJ2>p9&dxBxo)Z?^riKFS$d8oc)Gl$lZdyl=Kj z?0o3`H9g|}lB7KK%jdJK(>`8gl($&9Zq?Nf2dXz`mP?k0+e)#6Lr&(2sN6?IHR-#$ P${@a{tDnm{r-UW|zxk

models = new NewLevelManager(mContext).getNewLevelModels(); @@ -484,18 +483,76 @@ public class LiveTextRender { }); } + public void getLiveLevelImage(Context mContext, int userLevel, ImgLoader.DrawableCallback callback) { + if (mContext instanceof Activity) { + if (((Activity) mContext).isDestroyed()) { + mContext = CommonAppContext.getTopActivity(); + } + } + List models = new NewLevelManager(mContext).getNewLevelModels(); + String imgUrl = "https://downs.yaoulive.com/level1/img_1-9.png"; + for (NewLevelModel newLevelModel : models) { + if (newLevelModel.getLeveMin() <= userLevel && userLevel <= newLevelModel.getLeveMax()) { + imgUrl = newLevelModel.getLiveIcon(); + } + } + + Glide.with(mContext).asBitmap().load(imgUrl).into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + Observable.create(new ObservableOnSubscribe() { + @Override + public void subscribe(ObservableEmitter emitter) throws Exception { + emitter.onNext(AddTimeLiveWatermark(resource, String.valueOf(userLevel)));// + } + }).subscribeOn(Schedulers.newThread()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(Bitmap bitmap) { + BitmapDrawable drawable = new BitmapDrawable(bitmap); + if (callback != null) { + callback.onLoadSuccess(drawable); + } + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + if (callback != null) { + callback.onLoadFailed(); + } + } + }); + } private void renderTMP(Context context, final TextView textView, final LiveChatBean bean) { if (textView != null) { - getLevelImage(context, bean.getLevel(), new ImgLoader.DrawableCallback() { + getLiveLevelImage(context, bean.getLevel(), new ImgLoader.DrawableCallback() { @Override public void onLoadSuccess(Drawable drawable) { SpannableStringBuilder builder = createPrefix(drawable, bean); int color = Color.parseColor("#68F1F4"); if (bean.isAnchor()) { - color = 0xffffdd00; + color =Color.parseColor("#FBEABF"); } else { color = Color.parseColor("#68F1F4"); } @@ -535,6 +592,43 @@ public class LiveTextRender { } + /** + * bitmap添加文字 + * + * @param mBitmap + * @return + */ + private Bitmap AddTimeLiveWatermark(Bitmap mBitmap, String level) { + //获取原始图片与水印图片的宽与高 + int mBitmapWidth = mBitmap.getWidth(); + int mBitmapHeight = mBitmap.getHeight(); + Bitmap mNewBitmap = Bitmap.createBitmap(mBitmapWidth, mBitmapHeight, Bitmap.Config.ARGB_8888); + Canvas mCanvas = new Canvas(mNewBitmap); + //向位图中开始画入MBitmap原始图片 + mCanvas.drawBitmap(mBitmap, 0, 0, null); + //添加文字 + Paint mPaint = new Paint(); + Typeface font = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD); + mPaint.setColor(Color.WHITE); + if (level.length() == 3) { + mPaint.setTextSize(27); + mPaint.setTypeface(font); + mCanvas.drawText(level, 3, 38, mPaint); + } else if (level.length() == 2) { + mPaint.setTextSize(30 ); + mPaint.setTypeface(font); + mCanvas.drawText(level, 10, 38, mPaint); + }else if (level.length() == 1) { + mPaint.setTextSize(37 ); + mPaint.setTypeface(font); + mCanvas.drawText(level, 16, 38, mPaint); + } + + mCanvas.save(); + mCanvas.restore(); + return mNewBitmap; + } + /** * bitmap添加文字 * diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index c6ceacd3e..0b149102a 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -448,15 +448,11 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { if (!liveUid.equals(mLiveUid)) { return; } - if (isattention == 0) { - LiveChatBean lvBean = new LiveChatBean(); - lvBean.setType(-1); - lvBean.setId(url); - LiveRoomViewHolder.insertChat(lvBean, 1); - } - LiveChatBean lvBean2 = new LiveChatBean(); - lvBean2.setType(-2); - LiveRoomViewHolder.insertChat(lvBean2, 1); + LiveChatBean lvBean = new LiveChatBean(); + lvBean.setType(-2); + lvBean.setId(url); + lvBean.setAttention(isattention == 0); + LiveRoomViewHolder.insertChat(lvBean, 1); Log.i("chatMgs", liveUid + "|" + mLiveUid); } }, 10000);//3秒后执行Runnable中的run方法 diff --git a/live/src/main/res/drawable/chat_message_bg.xml b/live/src/main/res/drawable/chat_message_bg.xml new file mode 100644 index 000000000..debf06ab0 --- /dev/null +++ b/live/src/main/res/drawable/chat_message_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/item_live_chat.xml b/live/src/main/res/layout/item_live_chat.xml index 0bc47a2be..81dfffd9a 100644 --- a/live/src/main/res/layout/item_live_chat.xml +++ b/live/src/main/res/layout/item_live_chat.xml @@ -3,22 +3,20 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/bg" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center_vertical" android:orientation="vertical"> @@ -182,4 +180,40 @@ android:layout_width="90dp" android:layout_height="45dp" /> + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/mipmap-xxxhdpi/btn_attention.png b/live/src/main/res/mipmap-xxxhdpi/btn_attention.png new file mode 100644 index 0000000000000000000000000000000000000000..40db4e88fa8f8dd411bc0117d62f83e942573608 GIT binary patch literal 28588 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 Dpgol) literal 0 HcmV?d00001 diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java index dd8f49e3a..2bcaa5844 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java @@ -70,6 +70,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.List; +import java.util.Locale; /** * Created by cxf on 2018/9/22. @@ -302,8 +303,15 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text)); } String singnature = u.getSignature(); - if (TextUtils.equals(singnature, "這個人很懶,什麼也沒留下") ||TextUtils.equals(singnature, "这家伙很懒,什么都没留下") || TextUtils.isEmpty(singnature)) { - singnature ="The guy was lazy and didn't write anything."; + if (TextUtils.equals(singnature, "這個人很懶,什麼也沒留下") || TextUtils.equals(singnature, "这家伙很懒,什么都没留下") || TextUtils.isEmpty(singnature)) { + String ct = Locale.getDefault().getCountry(); + ct = TextUtils.equals("CN", ct) ? "HK" : ct; + if (TextUtils.equals(ct, "CN")) { + singnature = "這個人很懶,什麼也沒留下"; + } else { + singnature = "The guy was lazy and didn't write anything."; + } + } signature.setText(singnature); CommonAppConfig appConfig = CommonAppConfig.getInstance();