add[完成-开播准备页面]

live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java

@@ -125,9 +125,7 @@ public class LiveNewReadyRyViewHolder 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
@@ -157,7 +155,6 @@ public class LiveNewReadyRyViewHolder 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);
 
@@ -205,8 +202,6 @@ public class LiveNewReadyRyViewHolder 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() {
                 final Handler handler = new Handler(Looper.getMainLooper());
@@ -591,8 +586,6 @@ public class LiveNewReadyRyViewHolder 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();
         }
     }
 

live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java

@@ -150,7 +150,6 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
         });
         mCoverText = (TextView) findViewById(R.id.cover_text);
         mEditTitle = (EditText) findViewById(R.id.edit_title);
-        findViewById(R.id.btn_room_type).setOnClickListener(this);
         mOpenLocation = true;
         mLiveClass = (TextView) findViewById(R.id.live_class);
         mLiveWishListTextView = (TextView) findViewById(R.id.text_wishlist);
@@ -325,9 +324,7 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
         } else if (i == R.id.btn_wishlist) {
             //点击心愿单
             openWishListWindow();
-        } else if (i == R.id.btn_room_type) {
+        }  else if (i == R.id.btn_start_live) {
-            chooseLiveType();
-        } else if (i == R.id.btn_start_live) {
             if (!selector) {
                 ToastUtil.show(mContext.getString(R.string.anchor_agreement_hint));
                 return;

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

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:width="355dp" android:height="121dp">
         <shape android:shape="rectangle">
-            <solid android:color="#4d000000" />
+            <solid android:color="#66333333" />
             <corners android:radius="6dp" />
         </shape>
     </item>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="355dp" android:height="121dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#8065615A" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:width="355dp" android:height="121dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#4D333333" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -114,21 +114,23 @@
             android:paddingRight="10dp"
             android:singleLine="true"
             android:textColor="#FFFFFF"
+            android:layout_marginTop="15dp"
+            app:layout_constraintTop_toTopOf="parent"
             android:textColorHint="#FFFFFF"
             android:textSize="15sp"
             app:layout_constraintStart_toEndOf="@+id/avatar"
-            tools:layout_editor_absoluteY="16dp" />
+            tools:ignore="MissingConstraints" />
 
         <LinearLayout
             android:id="@+id/btn_live_class"
             android:layout_width="wrap_content"
             android:layout_height="25dp"
-            android:layout_marginTop="44dp"
-            android:layout_marginEnd="240dp"
             android:gravity="center"
+            android:layout_marginTop="7dp"
+            android:layout_marginStart="8dp"
             android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/avatar"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toBottomOf="@+id/edit_title">
 
             <ImageView
                 android:layout_width="18dp"
@@ -161,9 +163,9 @@
     <LinearLayout
         android:id="@+id/tips"
         android:layout_width="wrap_content"
-        android:layout_height="30dp"
+        android:layout_height="37dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
-        android:background="@drawable/border_grey1"
+        android:background="@drawable/border_grey1_tips"
         android:layout_marginLeft="10dp"
         android:gravity="center"
         android:orientation="horizontal"
@@ -193,8 +195,8 @@
         android:id="@+id/btn_live_anchor_say"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
-        android:background="@drawable/border_grey1"
+        android:background="@drawable/border_grey1_50"
         android:layout_marginLeft="10dp"
         android:gravity="center"
         android:orientation="horizontal"
@@ -232,8 +234,8 @@
         android:layout_width="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_height="30dp"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="10dp"
-        android:background="@drawable/border_grey1"
+        android:background="@drawable/border_grey1_50"
         android:gravity="center"
         android:orientation="horizontal"
         app:layout_constraintStart_toEndOf="@+id/btn_live_anchor_say"
@@ -268,8 +270,8 @@
 
     <ImageView
         android:id="@+id/btn_beauty"
-        android:layout_width="30dp"
+        android:layout_width="28dp"
-        android:layout_height="30dp"
+        android:layout_height="28dp"
         android:layout_marginStart="50dp"
         android:layout_marginBottom="83dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -304,8 +306,8 @@
 
     <ImageView
         android:id="@+id/btn_robot"
-        android:layout_width="30dp"
+        android:layout_width="28dp"
-        android:layout_height="30dp"
+        android:layout_height="28dp"
         android:layout_marginEnd="50dp"
         android:layout_marginBottom="83dp"
         app:layout_constraintBottom_toBottomOf="parent"