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();
+        }
+    }
+
 
     /**
      * 退出应用程序