diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml new file mode 100644 index 000000000..251ee5e5a --- /dev/null +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-hdpi/icon_microphone.png b/common/src/main/res/mipmap-hdpi/icon_microphone.png new file mode 100644 index 000000000..c071c4be7 Binary files /dev/null and b/common/src/main/res/mipmap-hdpi/icon_microphone.png differ diff --git a/live/src/main/res/mipmap-mdpi/icon_beauty.png b/common/src/main/res/mipmap-mdpi/icon_beauty.png similarity index 100% rename from live/src/main/res/mipmap-mdpi/icon_beauty.png rename to common/src/main/res/mipmap-mdpi/icon_beauty.png diff --git a/common/src/main/res/mipmap-mdpi/icon_danrenpk.png b/common/src/main/res/mipmap-mdpi/icon_danrenpk.png new file mode 100644 index 000000000..7c7077f98 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/icon_danrenpk.png differ diff --git a/common/src/main/res/mipmap-mdpi/icon_duorenpk.png b/common/src/main/res/mipmap-mdpi/icon_duorenpk.png new file mode 100644 index 000000000..74ef11336 Binary files /dev/null and b/common/src/main/res/mipmap-mdpi/icon_duorenpk.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_leave.png b/common/src/main/res/mipmap-xxhdpi/icon_leave.png new file mode 100644 index 000000000..677860538 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_leave.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_leave_p.png b/common/src/main/res/mipmap-xxhdpi/icon_leave_p.png new file mode 100644 index 000000000..ab86774cf Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_leave_p.png differ diff --git a/live/src/main/res/mipmap-mdpi/icon_live_ready_camera.png b/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png similarity index 100% rename from live/src/main/res/mipmap-mdpi/icon_live_ready_camera.png rename to common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png diff --git a/live/src/main/res/mipmap-mdpi/icon_weekstar.png b/common/src/main/res/mipmap-xxhdpi/icon_weekstar.png similarity index 100% rename from live/src/main/res/mipmap-mdpi/icon_weekstar.png rename to common/src/main/res/mipmap-xxhdpi/icon_weekstar.png diff --git a/live/src/main/res/mipmap-mdpi/icon_xinyuandan.png b/common/src/main/res/mipmap-xxhdpi/icon_xinyuandan.png similarity index 100% rename from live/src/main/res/mipmap-mdpi/icon_xinyuandan.png rename to common/src/main/res/mipmap-xxhdpi/icon_xinyuandan.png diff --git a/live/src/main/res/mipmap-mdpi/icon_zhenggu.png b/common/src/main/res/mipmap-xxhdpi/icon_zhenggu.png similarity index 100% rename from live/src/main/res/mipmap-mdpi/icon_zhenggu.png rename to common/src/main/res/mipmap-xxhdpi/icon_zhenggu.png diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index bb41c81a5..a36380085 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -874,4 +874,5 @@ Limited ride And limited avatar frame has sent you a reward, come and get it! Pay attention to the channel that suits you. What do you say to everyone + LiveConfig diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 56c3317ea..311b2a5c7 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -891,4 +891,5 @@ 在線客服 向你發送了一個獎勵,快來領取吧! 和大家說些什麼 + 直播設置 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index 4f843825c..72a2c6271 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -50,6 +50,7 @@ import com.yunbao.live.dialog.LiveBeautyDialogFragment; import com.yunbao.live.dialog.LiveFunctionDialogFragment; import com.yunbao.live.dialog.LiveLinkMicListDialogFragment; import com.yunbao.live.dialog.LiveMicUserDialogFragment; +import com.yunbao.live.dialog.LiveNewFunctionDialogFragment; import com.yunbao.live.dialog.LiveNewWishListDialogFragment; import com.yunbao.live.dialog.LiveWishListDialogFragment; import com.yunbao.live.event.LinkMicTxMixStreamEvent; @@ -216,7 +217,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl * @param functionID */ int mrr = 0; - public static int leave = 0; + public int leave = 0; @Override public void onClick(int functionID) { @@ -532,13 +533,14 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl * 打开功能弹窗 */ public void showFunctionDialog() { - LiveFunctionDialogFragment fragment = new LiveFunctionDialogFragment(); + LiveNewFunctionDialogFragment fragment = new LiveNewFunctionDialogFragment(); Bundle bundle = new Bundle(); boolean hasGame = false; if (CommonAppConfig.GAME_ENABLE && mGameList != null) { hasGame = mGameList.size() > 0; } bundle.putBoolean(Constants.HAS_GAME, hasGame); + bundle.putInt("leave",leave); bundle.putBoolean(Constants.OPEN_FLASH, mLivePushViewHolder != null && mLivePushViewHolder.isFlashOpen()); fragment.setArguments(bundle); fragment.setFunctionClickListener(this); @@ -666,6 +668,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl } mStartLive = true; mLiveRoomViewHolder.startRefreshUserList(); + mLiveRoomViewHolder.hideFloatMsg(); //守护相关 mLiveGuardInfo = new LiveGuardInfo(); diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveFunctionAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveFunctionAdapter.java index 2a5e6b757..bf77e19d5 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveFunctionAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveFunctionAdapter.java @@ -44,7 +44,8 @@ public class LiveFunctionAdapter extends RecyclerView.Adapter