开播准备页面-暂提

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());
+    }
     /**
      * 新娱美颜
      */

live/src/main/res/drawable/bg_live_upload_cover.xml

@@ -3,7 +3,7 @@
     <item android:width="68dp" android:height="68dp">
         <shape android:shape="rectangle">
             <solid android:color="#59ffffff" />
-            <corners android:radius="2dp" />
+            <corners android:radius="5dp" />
         </shape>
     </item>
 </selector>

live/src/main/res/layout/view_new_live_ready.xml

@@ -18,6 +18,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/btn_live_clarity"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="54dp"
+        android:layout_toRightOf="@+id/btn_horizontally"
+        android:padding="3dp"
+        android:src="@mipmap/icon_fhd"
+        app:layout_constraintStart_toEndOf="@+id/btn_camera"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/btn_horizontally"
         android:layout_width="30dp"
@@ -27,9 +39,10 @@
         android:layout_toRightOf="@+id/btn_camera"
         android:padding="3dp"
         android:src="@mipmap/icon_horizontally"
-        app:layout_constraintStart_toEndOf="@+id/btn_camera"
+        app:layout_constraintStart_toEndOf="@+id/btn_live_clarity"
         app:layout_constraintTop_toTopOf="parent" />
 
+
     <ImageView
         android:id="@+id/btn_close"
         android:layout_width="45dp"
@@ -45,100 +58,78 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="79dp"
         android:layout_marginStart="10dp"
-        android:layout_marginTop="98dp"
         android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:id="@+id/contentLayout"
         android:background="@drawable/border_grey1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@+id/btn_camera">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/btn_live_clarity"
+            android:id="@+id/avatar"
-            android:layout_width="wrap_content"
+            android:layout_width="65dp"
-            android:layout_height="25dp"
+            android:layout_height="65dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="8dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="5dp"
-            android:gravity="center"
+            android:layout_marginEnd="14dp"
-            android:orientation="horizontal"
+            android:layout_marginBottom="5dp"
-            app:layout_constraintStart_toStartOf="parent"
+            android:background="@drawable/bg_live_upload_cover"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
-
+            app:layout_constraintEnd_toStartOf="@+id/edit_title"
-            <ImageView
-                android:id="@+id/img_clarity"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_weight="1"
-                app:srcCompat="@mipmap/icon_fhd" />
-
-            <TextView
-                android:id="@+id/live_clarity"
-                android:layout_width="60dp"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1"
-                android:text="@string/high_definition"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-
-            <ImageView
-                android:layout_width="5dp"
-                android:layout_height="10dp"
-                android:layout_weight="1"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/icon_live_more" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/btn_room_type"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:layout_weight="1"
+                android:layout_marginTop="15dp"
-                app:srcCompat="@mipmap/icon_public" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@mipmap/icon_live_ready_add" />
 
             <TextView
-                android:id="@+id/text_room_type"
+                android:id="@+id/cover_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
+                android:layout_marginBottom="12dp"
-                android:layout_marginEnd="4dp"
+                android:text="@string/live_cover"
-                android:layout_weight="1"
+                android:textColor="#FFFFFF"
-                android:text="@string/live_room_public"
+                android:textSize="12sp"
-                android:textColor="@color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
-                android:textSize="12sp" />
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <ImageView
+        <EditText
-                android:layout_width="5dp"
+            android:id="@+id/edit_title"
-                android:layout_height="10dp"
+            android:layout_width="0dp"
-                android:layout_weight="1"
+            android:layout_height="22dp"
-                android:scaleType="centerCrop"
+            android:layout_marginStart="8dp"
-                android:src="@mipmap/icon_live_more" />
+            android:background="@null"
-        </LinearLayout>
+            android:hint="@string/live_title_hint"
+            android:paddingRight="10dp"
+            android:singleLine="true"
+            android:textColor="#FFFFFF"
+            android:textColorHint="#FFFFFF"
+            android:textSize="15sp"
+            app:layout_constraintStart_toEndOf="@+id/avatar"
+            tools:layout_editor_absoluteY="16dp" />
 
         <LinearLayout
             android:id="@+id/btn_live_class"
             android:layout_width="wrap_content"
             android:layout_height="25dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="44dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="240dp"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
+
             <ImageView
                 android:layout_width="18dp"
                 android:layout_height="18dp"
@@ -163,185 +154,117 @@
                 android:src="@mipmap/icon_live_more" />
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/btn_wishlist"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_live_clarity">
-            <ImageView
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_weight="1"
-                app:srcCompat="@mipmap/ic_live_ready_xjd" />
 
-            <TextView
+    </androidx.constraintlayout.widget.ConstraintLayout>
-                android:id="@+id/text_wishlist"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1"
-                android:text="@string/live_wish_list"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
 
-            <ImageView
-                android:layout_width="5dp"
-                android:layout_height="10dp"
-                android:layout_weight="1"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/icon_live_more" />
-        </LinearLayout>
 
-        <LinearLayout
+    <LinearLayout
-            android:id="@+id/btn_live_anchor_say"
+        android:id="@+id/tips"
-            android:layout_width="wrap_content"
+        android:layout_width="wrap_content"
-            android:layout_height="25dp"
+        android:layout_height="30dp"
-            android:layout_marginTop="10dp"
+        android:layout_marginTop="4dp"
-            android:gravity="center"
+        android:background="@drawable/border_grey1"
-            android:orientation="horizontal"
+        android:layout_marginLeft="10dp"
-            app:layout_constraintEnd_toEndOf="parent"
+        android:gravity="center"
-            app:layout_constraintStart_toStartOf="parent"
+        android:orientation="horizontal"
-            app:layout_constraintTop_toBottomOf="@+id/btn_room_type">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/contentLayout">
 
-            <ImageView
+        <ImageView
-                android:layout_width="18dp"
+            android:layout_width="16dp"
-                android:layout_height="18dp"
+            android:layout_height="16dp"
-                android:layout_weight="1"
+            android:layout_marginStart="5dp"
-                app:srcCompat="@mipmap/ic_live_ready_say" />
+            android:layout_weight="1"
-
+            app:srcCompat="@mipmap/icon_tips" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1"
-                android:text="@string/layout_live_anchor_say_ready_title"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-
-            <ImageView
-                android:layout_width="5dp"
-                android:layout_height="10dp"
-                android:layout_weight="1"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/icon_live_more" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/btn_live_anchor_call_me"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_marginTop="10dp"
-            android:visibility="gone"
-            android:layout_marginEnd="16dp"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_live_class">
-
-            <ImageView
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                android:layout_weight="1"
-                app:srcCompat="@mipmap/ic_live_ready_letter" />
-
-            <TextView
-                android:layout_width="60dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1"
-                android:text="@string/live_ready_anchor_call_me"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-
-            <ImageView
-                android:layout_width="5dp"
-                android:layout_height="10dp"
-                android:layout_weight="1"
-                android:scaleType="centerCrop"
-                android:src="@mipmap/icon_live_more" />
-        </LinearLayout>
-        <View
-            android:id="@+id/line"
-            android:layout_width="0dp"
-            android:layout_height="1.4dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/bg_line"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btn_live_anchor_say" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/avatar"
-            android:layout_width="68dp"
-            android:layout_height="68dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="7dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/bg_live_upload_cover"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/line">
-
-            <ImageView
-                android:layout_width="18dp"
-                android:layout_height="18dp"
-                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" />
-
-            <TextView
-                android:id="@+id/cover_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                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" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
-            android:id="@+id/title_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="14dp"
+            android:layout_marginStart="5dp"
-            android:layout_marginTop="25dp"
+            android:layout_marginEnd="4dp"
-            android:text="@string/live_title"
+            android:layout_weight="1"
-            android:textColor="#C4FFFFFF"
+            android:text="開播前發一條動態，將會給您的直播帶來更高人氣哦~"
-            android:textSize="12sp"
+            android:textColor="@color/white"
-            app:layout_constraintStart_toEndOf="@+id/avatar"
+            android:textSize="12sp" />
-            app:layout_constraintTop_toBottomOf="@+id/line" />
 
-        <EditText
+    </LinearLayout>
-            android:id="@+id/edit_title"
+
-            android:layout_width="0dp"
+    <LinearLayout
-            android:layout_height="22dp"
+        android:id="@+id/btn_live_anchor_say"
-            android:layout_below="@id/title_text"
+        android:layout_width="wrap_content"
-            android:layout_marginStart="14dp"
+        android:layout_height="30dp"
-            android:layout_marginTop="8dp"
+        android:layout_marginTop="4dp"
-            android:background="@null"
+        android:background="@drawable/border_grey1"
-            android:hint="@string/live_title_hint"
+        android:layout_marginLeft="10dp"
-            android:paddingRight="10dp"
+        android:gravity="center"
-            android:singleLine="true"
+        android:orientation="horizontal"
-            android:textColor="#FFFFFF"
+        app:layout_constraintStart_toStartOf="parent"
-            android:textColorHint="#FFFFFF"
+        app:layout_constraintTop_toBottomOf="@+id/tips">
-            android:textSize="15sp"
+
-            app:layout_constraintStart_toEndOf="@+id/avatar"
+        <ImageView
-            app:layout_constraintTop_toBottomOf="@+id/title_text" />
+            android:layout_width="15dp"
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_height="15dp"
+            android:layout_marginStart="5dp"
+            android:layout_weight="1"
+            app:srcCompat="@mipmap/ic_live_ready_say" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="4dp"
+            android:layout_weight="1"
+            android:text="@string/layout_live_anchor_say_ready_title"
+            android:textColor="@color/white"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:layout_width="5dp"
+            android:layout_height="10dp"
+            android:layout_marginEnd="5dp"
+            android:layout_weight="1"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/icon_live_more" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/btn_wishlist"
+        android:layout_width="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_height="30dp"
+        android:layout_marginTop="4dp"
+        android:background="@drawable/border_grey1"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toEndOf="@+id/btn_live_anchor_say"
+        app:layout_constraintTop_toBottomOf="@+id/tips">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_weight="1"
+            android:layout_marginStart="5dp"
+            app:srcCompat="@mipmap/ic_live_ready_xjd" />
+
+        <TextView
+            android:id="@+id/text_wishlist"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:layout_marginStart="5dp"
+            android:layout_weight="1"
+            android:text="@string/live_wish_list"
+            android:textColor="@color/white"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:layout_width="5dp"
+            android:layout_height="10dp"
+            android:layout_weight="1"
+            android:layout_marginEnd="5dp"
+            android:scaleType="centerCrop"
+            android:src="@mipmap/icon_live_more" />
+    </LinearLayout>
 
     <ImageView
         android:id="@+id/btn_beauty"