Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/bean/XydCompleteModel.java

@@ -1,6 +1,5 @@
 package com.yunbao.common.bean;
 
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 
 public class XydCompleteModel extends BaseModel {
@@ -64,6 +63,17 @@ public class XydCompleteModel extends BaseModel {
     private String equipment;
     @SerializedName("bubble")
     private String bubble;
+    @SerializedName("xydgiftname")
+    private String xydgiftname;
+
+    public String getXydgiftname() {
+        return xydgiftname;
+    }
+
+    public XydCompleteModel setXydgiftname(String xydgiftname) {
+        this.xydgiftname = xydgiftname;
+        return this;
+    }
 
     public String getMethod() {
         return method;

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -371,6 +371,7 @@ public class LiveNetManager {
                 }, new Consumer<Throwable>() {
                     @Override
                     public void accept(Throwable throwable) throws Exception {
+                        Log.e("异常", "checkLive: ",throwable);
                         if (callBack != null) {
                             callBack.onError(throwable.getMessage());
                         }

common/src/main/java/com/yunbao/common/utils/AppManager.java

@@ -2,6 +2,8 @@ package com.yunbao.common.utils;
 
 import android.app.Activity;
 
+import com.yunbao.common.BuildConfig;
+
 import java.util.Stack;
 
 public class AppManager {
@@ -114,6 +116,15 @@ public class AppManager {
         activityStack.clear();
     }
 
+    /**
+     *仅在debug下运行的代码
+     */
+    public static void runDebugCode(Runnable runnable) {
+        if (BuildConfig.DEBUG) {
+            runnable.run();
+        }
+    }
+
 
     /**
      * 退出应用程序

common/src/main/res/layout/view_live_new_wish.xml

@@ -4,15 +4,32 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/imageView2"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="117dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/bg_xyd_add_item"
-        android:layout_marginBottom="4dp"
-        android:scaleType="centerInside" />
+        android:layout_height="117dp">
+
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="match_parent"
+            android:layout_height="117dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_xyd_add_item"
+            android:scaleType="centerInside" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="95dp"
+            android:layout_marginTop="60dp"
+            android:text="@string/add_gift2"
+            android:textColor="#4223CD"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+    </FrameLayout>
+
 
     <FrameLayout
         android:layout_width="match_parent"

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

@@ -1118,4 +1118,5 @@ Limited ride And limited avatar frame</string>
     <string name="live_play_setting">Play setting</string>
     <string name="live_language_setting">language setting</string>
     <string name="traditional_chinese">Traditional Chinese</string>
+    <string name="add_gift2">Add gifts, nobles, and guardian wishes</string>
 </resources>

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

@@ -1116,5 +1116,6 @@
     <string name="live_play_setting">播放設置</string>
     <string name="live_language_setting">語言設定</string>
     <string name="traditional_chinese">繁體中文</string>
+    <string name="add_gift2">添加禮物、貴族、守護心願</string>
 
 </resources>