diff --git a/config.gradle b/config.gradle index 356c8ed61..ead21741d 100644 --- a/config.gradle +++ b/config.gradle @@ -4,8 +4,8 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 23, targetSdkVersion : 34, - versionCode : 698, - versionName : "6.8.1" + versionCode : 700, + versionName : "6.8.2" ] manifestPlaceholders = [ //正式、 diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 81da45000..9e66aeb1d 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -5282,6 +5282,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis break; case WHAT_FIRST_LOOK_LIVE: + Log.i("xinrenguanbo", "WHAT_FIRST_LOOK_LIVE: "); + if (isAttention == 0) { mLiveRoomViewHolder.showFirstLookLiveFollowNotify(); } else { @@ -5289,9 +5291,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } break; case WHAT_LOOK_5_MIN_LIVE: + Log.i("xinrenguanbo", "WHAT_LOOK_5_MIN_LIVE: "); + mLiveRoomViewHolder.showSendGiftTaskDetailsNotify(); break; case WHAT_TASK_INLET_LIVE: + Log.i("xinrenguanbo", "WHAT_TASK_INLET_LIVE: "); mLiveRoomViewHolder.showSendGiftTaskMsg(); break; case WHAT_ANCHOR_GOD_SHOW_HIDE: diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index b1a998c5e..d53b9d496 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -31,6 +31,7 @@ import com.lzf.easyfloat.permission.PermissionUtils; import com.lzf.easyfloat.utils.LifecycleUtils; import com.yunbao.common.manager.imrongcloud.RongcloudIMManager; import com.yunbao.common.utils.DebugUtils; +import com.yunbao.common.utils.LogUtil; import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppContext; @@ -883,14 +884,20 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe } //初始化整蠱列表 mLiveRoomViewHolder.initPrankProgress(isShowPrank?1:2); + Log.i("xinrenguanbo", "Test ......."); if("1".equals(data.getEnterRoomInfo().getIsNewUser())){ + Log.i("xinrenguanbo", "Test ...111...."); + //检测是否是首次观看该直播间 if("1".equals(data.getEnterRoomInfo().getIsFirstEntry())){ + Log.i("xinrenguanbo", "首次观看该直播间: "); mLiveRoomViewHolder.firstLookLiveNotify(); } //判断是否有免费礼物 if("0".equals(data.getNewPeopleTask().getTask().getSendgift())){ + Log.i("xinrenguanbo", "有免费礼物: "); + mLiveRoomViewHolder.firstLook5MinLiveNotify(); } //观看200秒之后,推送活动入口im消息 diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index eef8e6b27..7c17c1430 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -52,6 +52,7 @@ public class MainHttpUtil { .params("lastlogindevice", "Android") .params("uuid_Device", uuid) .params("langue", WordUtil.isNewZh()?"chinese":"english") + .params("app_from", "PDLive") .execute(callback); } @@ -106,6 +107,7 @@ public class MainHttpUtil { .params("sign", sign) .params("lastlogindevice", "Android") .params("pushid", "") + .params("app_from", "PDLive") .params("langue", WordUtil.isNewZh() ? "chinese" : "english") .execute(callback); }