diff --git a/common/src/main/res/mipmap-mdpi/icon_beauty.png b/common/src/main/res/mipmap-mdpi/icon_beauty.png
index 1e1b57098..f619582a4 100644
Binary files a/common/src/main/res/mipmap-mdpi/icon_beauty.png and b/common/src/main/res/mipmap-mdpi/icon_beauty.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_fhd.png b/common/src/main/res/mipmap-xxhdpi/icon_fhd.png
index 0218dea94..a8c3b4224 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_fhd.png and b/common/src/main/res/mipmap-xxhdpi/icon_fhd.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png b/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png
index dfc6e39e0..a9e550a19 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png and b/common/src/main/res/mipmap-xxhdpi/icon_horizontally.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png b/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png
index 43ff285a2..f611577c6 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png and b/common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png b/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png
index a29310a9a..a1e7876f9 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png and b/common/src/main/res/mipmap-xxhdpi/icon_protocol_check.png differ
diff --git a/common/src/main/res/mipmap-xxhdpi/icon_robot.png b/common/src/main/res/mipmap-xxhdpi/icon_robot.png
index b72bba2eb..e589455d4 100644
Binary files a/common/src/main/res/mipmap-xxhdpi/icon_robot.png and b/common/src/main/res/mipmap-xxhdpi/icon_robot.png differ
diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
index 3d949e264..06dc01d61 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java
@@ -87,7 +87,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
private ProcessImageUtil mImageUtil;
private File mAvatarFile;
private TextView mLiveClass, anchorAgreement;
- private TextView mLiveTypeTextView, liveClarity;//房间类型TextView
+ private TextView mLiveTypeTextView;//房间类型TextView
private TextView mLiveWishListTextView;//心愿单TextView
private int mLiveClassID;//直播频道id
private int mLiveType;//房间类型
@@ -98,7 +98,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
private LiveClassBean classBean;
private FaceManager manager;
private TextView faceTextView;//提示人脸未检测到的TextView
- private ImageView imgClarity, selectorProtocol;
+ private ImageView selectorProtocol;
private int selectClarity = 1;
private LiveOpenCustomPopup liveOpenCustomPopup;
private boolean selector = true;
@@ -123,9 +123,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
@Override
public void init() {
mRootView = (ConstraintLayout) findViewById(R.id.traceroute_rootview);
- imgClarity = (ImageView) findViewById(R.id.img_clarity);
selectorProtocol = (ImageView) findViewById(R.id.selector_protocol);
- liveClarity = (TextView) findViewById(R.id.live_clarity);
anchorAgreement = (TextView) findViewById(R.id.anchor_agreement);
mRootView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -155,7 +153,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
findViewById(R.id.btn_room_type).setOnClickListener(this);
mOpenLocation = true;
mLiveClass = (TextView) findViewById(R.id.live_class);
- mLiveTypeTextView = (TextView) findViewById(R.id.text_room_type);
mLiveWishListTextView = (TextView) findViewById(R.id.text_wishlist);
faceTextView = (TextView) findViewById(R.id.faceTextView);
@@ -203,7 +200,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
findViewById(R.id.btn_horizontally).setOnClickListener(this);
findViewById(R.id.anchor_agreement_layout).setOnClickListener(this);
findViewById(R.id.btn_live_anchor_say).setOnClickListener(this);
- findViewById(R.id.btn_live_anchor_call_me).setOnClickListener(this);
if (manager != null) {
manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() {
@@ -258,7 +254,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
@Override
public void onDismiss(BasePopupView popupView) {
- setSelectClarity(liveClarityCustomPopup.getSelectClarity());
}
@Override
@@ -304,32 +299,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
});
}
- private void setSelectClarity(int selectClarity) {
- this.selectClarity = selectClarity;
- IMLoginManager.get(mContext).setSelectClarity(selectClarity);
- switch (selectClarity) {
- case 0:
- imgClarity.setImageResource(R.mipmap.icon_sd);
- liveClarity.setText(R.string.standard_clear);
- break;
- case 1:
- imgClarity.setImageResource(R.mipmap.icon_hd);
- liveClarity.setText(R.string.high_definition);
- break;
- case 2:
- imgClarity.setImageResource(R.mipmap.icon_fhd);
- liveClarity.setText(R.string.ultra_hd);
- break;
- }
- if (liveOpenCustomPopup != null) {
- liveOpenCustomPopup.setSelectClarity(selectClarity);
- }
- //SWManager.get().setDimensions(selectClarity);
- Log.e("切换分辨率", "时间戳" + System.currentTimeMillis());
- //重新发布一下流
- Bus.get().post(new LivePushRyEvent());
- }
-
public void setManager(FaceManager manager) {
this.manager = manager;
}
@@ -559,11 +528,27 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false);
} else if (i == R.id.btn_live_anchor_say) {
openAnchorSayDialog();
- } else if (i == R.id.btn_live_anchor_call_me) {
- openAnchorCallMeDialog();
}
}
-
+ private void setSelectClarity(int selectClarity) {
+ this.selectClarity = selectClarity;
+ IMLoginManager.get(mContext).setSelectClarity(selectClarity);
+ switch (selectClarity) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ break;
+ }
+ if (liveOpenCustomPopup != null) {
+ liveOpenCustomPopup.setSelectClarity(selectClarity);
+ }
+ //SWManager.get().setDimensions(selectClarity);
+ Log.e("切换分辨率", "时间戳" + System.currentTimeMillis());
+ //重新发布一下流
+ Bus.get().post(new LivePushRyEvent());
+ }
/**
* 新娱美颜
*/
diff --git a/live/src/main/res/drawable/bg_live_upload_cover.xml b/live/src/main/res/drawable/bg_live_upload_cover.xml
index e612dc685..ad97b6edf 100644
--- a/live/src/main/res/drawable/bg_live_upload_cover.xml
+++ b/live/src/main/res/drawable/bg_live_upload_cover.xml
@@ -3,7 +3,7 @@
-
-
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml
index 09fdf539e..b8b99118d 100644
--- a/live/src/main/res/layout/view_new_live_ready.xml
+++ b/live/src/main/res/layout/view_new_live_ready.xml
@@ -18,6 +18,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/btn_camera">
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginTop="15dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@mipmap/icon_live_ready_add" />
+ android:layout_marginBottom="12dp"
+ android:text="@string/live_cover"
+ android:textColor="#FFFFFF"
+ android:textSize="12sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
-
-
+
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ android:layout_marginStart="5dp"
+ android:layout_marginEnd="4dp"
+ android:layout_weight="1"
+ android:text="開播前發一條動態，將會給您的直播帶來更高人氣哦~"
+ android:textColor="@color/white"
+ android:textSize="12sp" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+