底部的按钮调整完成
This commit is contained in:
parent
73ea623700
commit
0a08b67fb1
@ -26,7 +26,13 @@ public abstract class AbsViewHolder implements LifeCycleListener {
|
|||||||
mTag = getClass().getSimpleName();
|
mTag = getClass().getSimpleName();
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mParentView = parentView;
|
mParentView = parentView;
|
||||||
mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
|
try {
|
||||||
|
mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
|
||||||
|
}catch (Exception e){
|
||||||
|
L.e("AbsViewHolder",e.toString());
|
||||||
|
}
|
||||||
|
if (mContentView == null)
|
||||||
|
L.e("AbsViewHolder","mContentView==null");
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,7 +41,13 @@ public abstract class AbsViewHolder implements LifeCycleListener {
|
|||||||
processArguments(args);
|
processArguments(args);
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mParentView = parentView;
|
mParentView = parentView;
|
||||||
mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
|
try {
|
||||||
|
mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false);
|
||||||
|
}catch (Exception e){
|
||||||
|
L.e("AbsViewHolder",e.toString());
|
||||||
|
}
|
||||||
|
if (mContentView == null)
|
||||||
|
L.e("AbsViewHolder","mContentView==null");
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ import org.greenrobot.eventbus.EventBus;
|
|||||||
|
|
||||||
public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.OnClickListener {
|
public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.OnClickListener {
|
||||||
|
|
||||||
public TextView mRedPoint;//消息上的红点
|
public View mRedPoint;//消息上的红点
|
||||||
public View mRedPointPrivilege;//皇冠上的点
|
public View mRedPointPrivilege;//皇冠上的点
|
||||||
|
|
||||||
public AbsLiveViewHolder(Context context, ViewGroup parentView) {
|
public AbsLiveViewHolder(Context context, ViewGroup parentView) {
|
||||||
@ -30,8 +30,8 @@ public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.On
|
|||||||
public void init() {
|
public void init() {
|
||||||
findViewById(R.id.et_input).setOnClickListener(this);
|
findViewById(R.id.et_input).setOnClickListener(this);
|
||||||
findViewById(R.id.btn_msg).setOnClickListener(this);
|
findViewById(R.id.btn_msg).setOnClickListener(this);
|
||||||
mRedPoint = (TextView) findViewById(R.id.red_point);
|
mRedPoint = findViewById(R.id.red_point);
|
||||||
mRedPointPrivilege = findViewById(R.id.privilege_red_point);
|
//mRedPointPrivilege = findViewById(R.id.privilege_red_point);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,8 +92,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
private ImageView giftImage, liveNewPeople;
|
private ImageView giftImage, liveNewPeople;
|
||||||
private String newPeopleUrl = null;
|
private String newPeopleUrl = null;
|
||||||
private View mNewPeopleRedDot;
|
private View mNewPeopleRedDot;
|
||||||
private LinearLayout voiceButton;
|
private ImageView voiceButton;
|
||||||
private ImageView mRole;//特权
|
// private ImageView mRole;//特权
|
||||||
private ImageView mPlay;//玩
|
private ImageView mPlay;//玩
|
||||||
private ImageView mCheat;//整蛊
|
private ImageView mCheat;//整蛊
|
||||||
private ImageView pd_pao, combo;
|
private ImageView pd_pao, combo;
|
||||||
@ -150,15 +150,15 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
// msgRedPoint = findViewById(R.id.msg_red_point);
|
// msgRedPoint = findViewById(R.id.msg_red_point);
|
||||||
// totalImage = findViewById(R.id.total_image);
|
// totalImage = findViewById(R.id.total_image);
|
||||||
// totalRedPoint = findViewById(R.id.total_red_point);
|
// totalRedPoint = findViewById(R.id.total_red_point);
|
||||||
|
Log.i("LiveAudienceViewHolder", "init");
|
||||||
voiceButton = (LinearLayout) findViewById(R.id.voice_button);
|
voiceButton = findViewById(R.id.voice_button);
|
||||||
giftImage = (ImageView) findViewById(R.id.gift_image);
|
giftImage = (ImageView) findViewById(R.id.gift_image);
|
||||||
quick_gift_remaining_quantity = (TextView) findViewById(R.id.quick_gift_remaining_quantity);
|
quick_gift_remaining_quantity = (TextView) findViewById(R.id.quick_gift_remaining_quantity);
|
||||||
time_text = (TextView) findViewById(R.id.time_text);
|
time_text = (TextView) findViewById(R.id.time_text);
|
||||||
liveNewPeople = (ImageView) findViewById(R.id.live_new_people);
|
liveNewPeople = (ImageView) findViewById(R.id.live_new_people);
|
||||||
|
|
||||||
viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner);
|
viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner);
|
||||||
mRole = (ImageView) findViewById(R.id.live_privilege);
|
|
||||||
mCheat = (ImageView) findViewById(R.id.live_cheat);
|
mCheat = (ImageView) findViewById(R.id.live_cheat);
|
||||||
mPlay = (ImageView) findViewById(R.id.live_play);
|
mPlay = (ImageView) findViewById(R.id.live_play);
|
||||||
stationHornBanner = findViewById(R.id.station_horn_banner);
|
stationHornBanner = findViewById(R.id.station_horn_banner);
|
||||||
@ -166,12 +166,13 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
pd_pao = (ImageView) findViewById(R.id.pd_pao);
|
pd_pao = (ImageView) findViewById(R.id.pd_pao);
|
||||||
combo = (ImageView) findViewById(R.id.combo);
|
combo = (ImageView) findViewById(R.id.combo);
|
||||||
circleProgress = (CircleProgress2) findViewById(R.id.circleProgress);
|
circleProgress = (CircleProgress2) findViewById(R.id.circleProgress);
|
||||||
|
//mRole = (ImageView) findViewById(R.id.live_privilege);
|
||||||
combo.setVisibility(View.GONE);
|
combo.setVisibility(View.GONE);
|
||||||
liveNewPeople.setOnClickListener(this);
|
liveNewPeople.setOnClickListener(this);
|
||||||
mRole.setOnClickListener(this);
|
//mRole.setOnClickListener(this);
|
||||||
mCheat.setOnClickListener(this);
|
mCheat.setOnClickListener(this);
|
||||||
mPlay.setOnClickListener(this);
|
mPlay.setOnClickListener(this);
|
||||||
|
Log.i("LiveAudienceViewHolder", "init2");
|
||||||
findViewById(R.id.btn_mic).setOnClickListener(new View.OnClickListener() {
|
findViewById(R.id.btn_mic).setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
@ -206,7 +207,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
});
|
});
|
||||||
findViewById(R.id.btn_more).setOnClickListener(this);
|
findViewById(R.id.btn_more).setOnClickListener(this);
|
||||||
|
|
||||||
|
Log.i("LiveAudienceViewHolder", "init3");
|
||||||
v_msg_redpoint = (View) findViewById(R.id.v_msg_redpoint);
|
v_msg_redpoint = (View) findViewById(R.id.v_msg_redpoint);
|
||||||
//底部改造
|
//底部改造
|
||||||
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.total_image), new ViewClicksAntiShake.ViewClicksCallBack() {
|
ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.total_image), new ViewClicksAntiShake.ViewClicksCallBack() {
|
||||||
@ -240,6 +241,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Log.i("LiveAudienceViewHolder", "init4");
|
||||||
// //底部礼物弹窗
|
// //底部礼物弹窗
|
||||||
ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
|
ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage);
|
||||||
|
|
||||||
@ -258,7 +260,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole);
|
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole);
|
||||||
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay);
|
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay);
|
||||||
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat);
|
// ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat);
|
||||||
|
Log.i("LiveAudienceViewHolder", "init5");
|
||||||
voiceButton.setOnTouchListener((v, event) -> {
|
voiceButton.setOnTouchListener((v, event) -> {
|
||||||
MobclickAgent.onEvent(mContext, "live_room_voice_chat_btn", "直播间点开最下面的语音输入的聊天按钮");
|
MobclickAgent.onEvent(mContext, "live_room_voice_chat_btn", "直播间点开最下面的语音输入的聊天按钮");
|
||||||
if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
if (event.getAction() == MotionEvent.ACTION_DOWN) {
|
||||||
@ -310,6 +312,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
Log.i("LiveAudienceViewHolder", "init6");
|
||||||
mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
|
mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
|
||||||
quick_gift_remaining_quantity.setVisibility(View.GONE);
|
quick_gift_remaining_quantity.setVisibility(View.GONE);
|
||||||
time_text.setVisibility(View.GONE);
|
time_text.setVisibility(View.GONE);
|
||||||
@ -372,6 +375,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Log.i("LiveAudienceViewHolder", "init7");
|
||||||
combo.setOnClickListener(new View.OnClickListener() {
|
combo.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
@ -407,6 +411,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
findViewById(R.id.total_image_red_point).setVisibility(View.GONE);
|
findViewById(R.id.total_image_red_point).setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
getMsgCount();
|
getMsgCount();
|
||||||
|
Log.i("LiveAudienceViewHolder", "init8");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getMsgCount() {
|
private void getMsgCount() {
|
||||||
@ -705,10 +710,12 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
|
|||||||
openZGListWindow();
|
openZGListWindow();
|
||||||
} else if (i == R.id.live_new_people) {
|
} else if (i == R.id.live_new_people) {
|
||||||
openNewPeopleDialog();
|
openNewPeopleDialog();
|
||||||
} else if (i == R.id.live_privilege) {
|
}
|
||||||
MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮");
|
// else if (i == R.id.live_privilege) {
|
||||||
openRoleDialog();
|
// MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮");
|
||||||
} else if (i == R.id.live_cheat) {
|
// openRoleDialog();
|
||||||
|
// }
|
||||||
|
else if (i == R.id.live_cheat) {
|
||||||
|
|
||||||
} else if (i == R.id.live_play) {
|
} else if (i == R.id.live_play) {
|
||||||
|
|
||||||
|
@ -499,6 +499,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
|||||||
enterRoomNew();
|
enterRoomNew();
|
||||||
Bus.get().post(new LiveOpenSuccessEvent());
|
Bus.get().post(new LiveOpenSuccessEvent());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
Log.e("进入房间异常", e.toString());
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -114,20 +114,199 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<include
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
layout="@layout/view_live_audience_part"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="45dp"
|
android:layout_height="52dp"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
tools:layout_marginBottom="45dp"/>
|
tools:layout_marginBottom="45dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/et_input"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_marginTop="5dp"
|
||||||
|
android:layout_marginBottom="5dp"
|
||||||
|
android:background="@drawable/bg_live_item_an"
|
||||||
|
android:gravity="center_vertical|start"
|
||||||
|
android:paddingStart="12dp"
|
||||||
|
android:text="@string/say_something3"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="12sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintWidth_percent="0.4" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/voice_button"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_marginEnd="8dp"
|
||||||
|
android:paddingStart="5dp"
|
||||||
|
android:paddingEnd="5dp"
|
||||||
|
android:src="@mipmap/ic_live_new_voice"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/et_input"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/et_input"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/et_input" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/btn_msg"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:src="@mipmap/ic_live_menu_msg"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/et_input"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/v_msg_redpoint"
|
||||||
|
android:layout_width="6dp"
|
||||||
|
android:layout_height="6dp"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:background="@drawable/background_ff5075"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintHorizontal_bias="0.12"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintVertical_bias="0.11"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/pd_pao"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:src="@mipmap/ic_live_menu_panda"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/gift_image"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/red_point"
|
||||||
|
android:layout_width="8dp"
|
||||||
|
android:layout_height="8dp"
|
||||||
|
android:background="@drawable/bg_red_point"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintHorizontal_bias="0.82"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/btn_msg"
|
||||||
|
app:layout_constraintVertical_bias="0.16"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/quick_gift_remaining_quantity"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:text="99"
|
||||||
|
android:textColor="#FFB403"
|
||||||
|
android:textSize="8sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/et_input" />
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/combo"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:src="@mipmap/icon_combo"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
||||||
|
tools:visibility="gone" />
|
||||||
|
|
||||||
|
|
||||||
|
<com.yunbao.common.views.weight.CircleProgress2
|
||||||
|
android:id="@+id/circleProgress"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_margin="5dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
||||||
|
tools:visibility="gone" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/time_text"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_margin="5dp"
|
||||||
|
android:background="@drawable/backgroud_panda_time"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="120S"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="10sp"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
||||||
|
tools:visibility="gone" />
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/gift_image"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:padding="3dp"
|
||||||
|
android:src="@mipmap/ic_live_menu_gift"
|
||||||
|
app:layout_constraintDimensionRatio="1"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/total_image"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/pd_pao"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/pd_pao"/>
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/total_image"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="5dp"
|
||||||
|
android:src="@mipmap/ic_live_menu_menu"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/gift_image"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/total_image_red_point"
|
||||||
|
android:layout_width="8dp"
|
||||||
|
android:layout_height="8dp"
|
||||||
|
android:background="@drawable/bg_red_point"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/total_image"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/total_image"
|
||||||
|
app:layout_constraintHorizontal_bias="0.82"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/total_image"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/total_image"
|
||||||
|
app:layout_constraintVertical_bias="0.16"
|
||||||
|
tools:visibility="visible" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="45dp"
|
android:layout_height="45dp"
|
||||||
android:visibility="gone"
|
|
||||||
tools:visibility="visible"
|
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:gravity="center_vertical">
|
android:gravity="center_vertical"
|
||||||
|
android:visibility="gone"
|
||||||
|
tools:visibility="visible">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/btn_close"
|
android:id="@+id/btn_close"
|
||||||
@ -245,101 +424,6 @@
|
|||||||
android:src="@mipmap/icon_live_red_pack"
|
android:src="@mipmap/icon_live_red_pack"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
<!--聊天-->
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="126dp"
|
|
||||||
android:layout_height="35dp"
|
|
||||||
android:layout_marginStart="10dp"
|
|
||||||
android:clickable="false"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/et_input"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:layout_weight="9"
|
|
||||||
android:alpha="0.5"
|
|
||||||
android:background="@drawable/bc_sound_recording_left"
|
|
||||||
android:gravity="center"
|
|
||||||
android:hint="@string/say_something3"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textColor="#D9D9D9"
|
|
||||||
android:textColorHint="@color/gray3"
|
|
||||||
android:textSize="12sp" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/voice_button"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:background="@drawable/bc_sound_recording_right"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true"
|
|
||||||
android:focusableInTouchMode="true"
|
|
||||||
android:gravity="center">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
|
|
||||||
android:layout_width="14dp"
|
|
||||||
android:layout_height="14dp"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:clickable="false"
|
|
||||||
android:focusable="false"
|
|
||||||
android:focusableInTouchMode="false"
|
|
||||||
android:src="@mipmap/icon_voice"
|
|
||||||
android:visibility="visible" />
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
<!--消息中心-->
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:visibility="visible">
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/rt_msg"
|
|
||||||
android:layout_width="45dp"
|
|
||||||
android:layout_height="45dp">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/btn_msg"
|
|
||||||
android:layout_width="35dp"
|
|
||||||
android:layout_height="35dp"
|
|
||||||
android:layout_centerInParent="true"
|
|
||||||
android:src="@mipmap/icon_message" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/v_msg_redpoint"
|
|
||||||
android:layout_width="6dp"
|
|
||||||
android:layout_height="6dp"
|
|
||||||
android:layout_marginTop="6dp"
|
|
||||||
android:background="@drawable/background_ff5075"
|
|
||||||
android:visibility="gone" />
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/red_point"
|
|
||||||
android:layout_width="6dp"
|
|
||||||
android:layout_height="6dp"
|
|
||||||
android:layout_alignTop="@id/rt_msg"
|
|
||||||
android:layout_alignRight="@id/rt_msg"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginRight="5dp"
|
|
||||||
android:background="@drawable/bg_red_point"
|
|
||||||
android:gravity="center"
|
|
||||||
android:includeFontPadding="false"
|
|
||||||
android:minWidth="14dp"
|
|
||||||
android:paddingLeft="3dp"
|
|
||||||
android:paddingRight="3dp"
|
|
||||||
android:textColor="#fff"
|
|
||||||
android:textSize="10sp"
|
|
||||||
android:translationY="-4dp"
|
|
||||||
android:visibility="invisible" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
@ -390,106 +474,6 @@
|
|||||||
android:visibility="invisible" />
|
android:visibility="invisible" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:layout_marginEnd="8dp">
|
|
||||||
|
|
||||||
<com.yunbao.common.views.weight.CircleProgress2
|
|
||||||
android:id="@+id/circleProgress"
|
|
||||||
android:layout_width="32dp"
|
|
||||||
android:layout_height="32dp"
|
|
||||||
android:layout_centerHorizontal="true" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/pd_pao"
|
|
||||||
android:layout_width="27dp"
|
|
||||||
android:layout_height="27dp"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:src="@mipmap/icon_pd_pao" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/time_text"
|
|
||||||
android:layout_width="27dp"
|
|
||||||
android:layout_height="27dp"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:background="@drawable/backgroud_panda_time"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="120S"
|
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="10sp"
|
|
||||||
android:visibility="gone"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/combo"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:src="@mipmap/icon_combo"
|
|
||||||
android:visibility="gone" />
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<!--礼物-->
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/gift_image"
|
|
||||||
android:layout_width="36dp"
|
|
||||||
android:layout_height="36dp"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:background="@drawable/background_gift" />
|
|
||||||
<!--特权-->
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:layout_width="40dp"
|
|
||||||
android:layout_height="40dp">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/live_privilege"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:src="@mipmap/icon_privilege"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/privilege_red_point"
|
|
||||||
android:layout_width="6dp"
|
|
||||||
android:layout_height="6dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginEnd="10dp"
|
|
||||||
android:background="@drawable/bg_red_point"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="38dp"
|
|
||||||
android:layout_height="38dp">
|
|
||||||
<!--普通工具合集-->
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/total_image"
|
|
||||||
android:layout_width="35dp"
|
|
||||||
android:layout_height="35dp"
|
|
||||||
android:layout_marginEnd="8dp"
|
|
||||||
android:src="@mipmap/icon_more_live_menu" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/total_image_red_point"
|
|
||||||
android:layout_width="6dp"
|
|
||||||
android:layout_height="6dp"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginTop="3dp"
|
|
||||||
android:layout_marginEnd="12dp"
|
|
||||||
android:background="@drawable/bg_red_point"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
@ -511,18 +495,6 @@
|
|||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/quick_gift_remaining_quantity"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:layout_marginEnd="144dp"
|
|
||||||
android:layout_marginBottom="-2dp"
|
|
||||||
android:text="99"
|
|
||||||
android:textColor="#FFB403"
|
|
||||||
android:textSize="8sp"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
@ -1,168 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/et_input"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_marginTop="5dp"
|
|
||||||
android:layout_marginBottom="5dp"
|
|
||||||
android:background="@drawable/bg_live_item_an"
|
|
||||||
android:gravity="center_vertical|start"
|
|
||||||
android:paddingStart="12dp"
|
|
||||||
android:text="@string/say_something3"
|
|
||||||
android:textColor="@color/white"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/msg_image"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/msg_image"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/msg_image"
|
|
||||||
app:layout_constraintWidth_percent="0.4" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:src="@mipmap/live_icon_news"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/et_input"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/et_input"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/et_input" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/msg_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="5dp"
|
|
||||||
android:src="@mipmap/ic_live_menu_msg"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/panda_image"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/et_input"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/panda_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="5dp"
|
|
||||||
android:src="@mipmap/ic_live_menu_panda"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/gift_image"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/msg_image"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/quick_gift_remaining_quantity"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
app:layout_constraintTop_toBottomOf="@+id/et_input"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
|
||||||
android:text="99"
|
|
||||||
android:textColor="#FFB403"
|
|
||||||
android:textSize="8sp"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/combo"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:padding="5dp"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
|
||||||
android:src="@mipmap/icon_combo"
|
|
||||||
android:visibility="gone"
|
|
||||||
tools:visibility="gone" />
|
|
||||||
|
|
||||||
|
|
||||||
<com.yunbao.common.views.weight.CircleProgress2
|
|
||||||
android:id="@+id/circleProgress"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_margin="5dp"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
|
||||||
tools:visibility="gone"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/time_text"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_margin="5dp"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:background="@drawable/backgroud_panda_time"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/panda_image"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/panda_image"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/panda_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/panda_image"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="120S"
|
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="10sp"
|
|
||||||
android:visibility="gone"
|
|
||||||
tools:visibility="gone"/>
|
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/gift_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="3dp"
|
|
||||||
android:src="@mipmap/ic_live_menu_gift"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/total_image"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/panda_image"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/msg_red_point"
|
|
||||||
android:layout_width="8dp"
|
|
||||||
android:layout_height="8dp"
|
|
||||||
android:background="@drawable/bg_red_point"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/msg_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/msg_image"
|
|
||||||
app:layout_constraintHorizontal_bias="0.82"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/msg_image"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/msg_image"
|
|
||||||
app:layout_constraintVertical_bias="0.16"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/total_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="5dp"
|
|
||||||
android:src="@mipmap/ic_live_menu_menu"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/gift_image"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/total_red_point"
|
|
||||||
android:layout_width="8dp"
|
|
||||||
android:layout_height="8dp"
|
|
||||||
android:background="@drawable/bg_red_point"
|
|
||||||
android:visibility="gone"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/total_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/total_image"
|
|
||||||
app:layout_constraintHorizontal_bias="0.82"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/total_image"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/total_image"
|
|
||||||
app:layout_constraintVertical_bias="0.16"
|
|
||||||
tools:visibility="visible" />
|
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
BIN
live/src/main/res/mipmap-hdpi/ic_live_new_voice.png
Normal file
BIN
live/src/main/res/mipmap-hdpi/ic_live_new_voice.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
BIN
live/src/main/res/mipmap-mdpi/ic_live_new_voice.png
Normal file
BIN
live/src/main/res/mipmap-mdpi/ic_live_new_voice.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 669 B |
BIN
live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png
Normal file
BIN
live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
BIN
live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png
Normal file
BIN
live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
Loading…
x
Reference in New Issue
Block a user