改版直播准备间UI

修复心愿单多出一个的BUG

common/src/main/java/com/yunbao/common/glide/ImgLoader.java

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.yunbao.common.R;
@@ -128,7 +129,8 @@ public class ImgLoader {
         if (!contextIsExist(context)) {
             return;
         }
-        Glide.with(context).asDrawable().load(url).skipMemoryCache(SKIP_MEMORY_CACHE).into(new SimpleTarget<Drawable>() {
+        Glide.with(context).asDrawable().load(url).skipMemoryCache(SKIP_MEMORY_CACHE).into(new CustomTarget<Drawable>() {
+
             @Override
             public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
                 if (callback != null) {
@@ -137,12 +139,29 @@ public class ImgLoader {
             }
 
             @Override
-            public void onLoadFailed(@Nullable Drawable errorDrawable) {
+            public void onLoadCleared(@Nullable Drawable placeholder) {
+
+            }
+        });
+    }
+    public static void displayFileDrawable(Context context, File file, final DrawableCallback callback) {
+        if (!contextIsExist(context)) {
+            return;
+        }
+        Glide.with(context).asDrawable().load(file).skipMemoryCache(SKIP_MEMORY_CACHE).into(new CustomTarget<Drawable>() {
+
+
+            @Override
+            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
                 if (callback != null) {
-                    callback.onLoadFailed();
+                    callback.onLoadSuccess(resource);
                 }
             }
 
+            @Override
+            public void onLoadCleared(@Nullable Drawable placeholder) {
+
+            }
         });
     }
 

common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java

@@ -35,9 +35,9 @@ import static com.yunbao.common.CommonAppContext.isReady;
  */
 public class RongcloudIMManager {
     //融云开发者平台注册app唯一识别符
-    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
+//    public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
     //测试环境
-//    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
+    public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
 
     private static final String CLASSNAME = "RongcloudIMManager";
 

common/src/main/res/values-en/strings.xml

@@ -264,7 +264,7 @@
     <string name="live_title_hint">Write a title for the live broadcast</string>
     <string name="live_class">channel</string>
     <string name="live_class_choose">Select live channel</string>
-    <string name="live_class_tip">Pay attention to the channel that suits you. During the live broadcast, if the operator finds that the selected channel does not match the live content, he / she will adjust your live channel.</string>
+    <string name="live_class_tip">During the live broadcast, if the operator finds that the selected channel does not match the live content, he / she will adjust your live channel.</string>
     <string name="live_set_pwd">Please set room password</string>
     <string name="live_set_fee">Please set the charge amount (the revenue is subject to the end of live broadcast)</string>
     <string name="live_set_pwd_empty">Please set room password</string>
@@ -872,4 +872,5 @@ Limited ride And limited avatar frame</string>
     <string name="current_live_room">You are in the current live room</string>
     <string name="live_room_air_ticket">has recommended an anchor to you!</string>
     <string name="bonus_message">has sent you a reward, come and get it!</string>
+    <string name="live_class_tip_title">Pay attention to the channel that suits you.</string>
 </resources>

common/src/main/res/values/strings.xml

@@ -214,7 +214,8 @@
     <string name="live_title_hint">給直播寫個標題吧</string>
     <string name="live_class">頻道</string>
     <string name="live_class_choose">選擇直播頻道</string>
-    <string name="live_class_tip">注意選擇適合自己的頻道。直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。</string>
+    <string name="live_class_tip_title">注意選擇適合自己的頻道。</string>
+    <string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。</string>
     <string name="live_set_pwd">請設定房間密碼</string>
     <string name="live_set_fee">請設定收費金額\n（收益以直播結束顯示為准）</string>
     <string name="live_set_pwd_empty">請設定房間密碼</string>