diff --git a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java index 9d63882f8..458f6a9ab 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java @@ -173,4 +173,26 @@ public class LiveGiftBean { public void setGiftNum(String giftNum) { this.mGiftNum = giftNum; } + + @Override + public String toString() { + return "LiveGiftBean{" + + "id=" + id + + ", type=" + type + + ", mark=" + mark + + ", name='" + name + '\'' + + ", price='" + price + '\'' + + ", icon='" + icon + '\'' + + ", checked=" + checked + + ", page=" + page + + ", mView=" + mView + + ", sendType='" + sendType + '\'' + + ", mGiftNum='" + mGiftNum + '\'' + + ", num='" + num + '\'' + + ", swf='" + swf + '\'' + + ", isweek='" + isweek + '\'' + + ", end_time='" + end_time + '\'' + + ", tag='" + tag + '\'' + + '}'; + } } diff --git a/config.gradle b/config.gradle index c40ea7ee3..f0557bc1e 100644 --- a/config.gradle +++ b/config.gradle @@ -10,9 +10,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/java/com/yunbao/live/adapter/LiveGiftAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java index 58f477eff..8a5fb8440 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveGiftAdapter.java @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.graphics.Color; import android.text.TextUtils; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,6 +20,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.alibaba.fastjson.JSONObject; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; import com.yunbao.common.bean.LiveGiftBean; @@ -288,7 +290,7 @@ public class LiveGiftAdapter extends RecyclerView.Adapter { } mRadioButton.setTag(position); mRadioButton.doChecked(bean.isChecked()); - if (bean.getSwf().isEmpty()) { + if (bean.getSwf()!=null&&bean.getSwf().isEmpty()) { mLoadingLayout.setVisibility(View.GONE); return; }