修改语音连麦的逻辑

common/src/main/java/com/yunbao/common/bean/IMLoginModel.java

@@ -204,7 +204,7 @@ public class IMLoginModel extends BaseModel {
     @SerializedName("votes")
     private String votes;
     @SerializedName("yuanbao")
-    private long yuanbao;
+    private String yuanbao;
     @SerializedName("list")
     private List<List<ListModel>> list;
     @SerializedName("slide")
@@ -825,11 +825,11 @@ public class IMLoginModel extends BaseModel {
         return this;
     }
 
-    public long getYuanbao() {
+    public String getYuanbao() {
         return yuanbao;
     }
 
-    public IMLoginModel setYuanbao(long yuanbao) {
+    public IMLoginModel setYuanbao(String yuanbao) {
         this.yuanbao = yuanbao;
         return this;
     }

common/src/main/java/com/yunbao/common/views/weight/CircleProgress2.java

@@ -56,7 +56,7 @@ public class CircleProgress2 extends View {
         mPaint.setStyle(Paint.Style.STROKE);
         //设置圆弧的宽度（圆环的宽度）
         mPaint.setStrokeWidth(mArcWidth);
-        mPaint.setColor(Color.parseColor("#46433F"));
+        mPaint.setColor(Color.TRANSPARENT);
         //大圆的半径
         float bigCircleRadius = mWidth / 2;
         //小圆的半径

config.gradle

@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : " https://ceshi.yaoulive.com",
+//            serverHost       : " https://ceshi.yaoulive.com",
 
 
 

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

@@ -198,7 +198,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
 //            ImgLoader.displayBlurLive(mContext, coverUrl, mCover, 400, 600);
 //
 //        }
-    }
+    }//
 
     @Override
     public synchronized void setLiveBeanLandscape(int landscape) {
@@ -206,7 +206,10 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
         Log.i(TAG, "setLiveBeanLandscape: " + landscape + " isPk: " + isPk);
         this.landscape = landscape;
         this.videoLandscape = landscape;
-        mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL);
+        if (mPlayer != null) {
+            mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL);
+        }
+
         if (landscape == 2) {
             Log.i(TAG, "还原9：16");
             RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
@@ -1111,19 +1114,19 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
         int maxRate = 900;
         switch (IMLoginManager.get(mContext).getSelectClarity()) {
             case 0:
-                rcrtcVideoResolution = RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_480_848;
+                rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_480_848;
-                minRate = 200;
+                minRate = landscape == 1 ? 900 : 200;
-                maxRate = 900;
+                maxRate = landscape == 1 ? 700 : 900;
                 break;
             case 1:
-                rcrtcVideoResolution = RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280;
+                rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280;
-                minRate = 250;
+                minRate = landscape == 1 ? 900 : 250;
-                maxRate = 2200;
+                maxRate = landscape == 1 ? 700 : 2200;
                 break;
             case 2:
-                rcrtcVideoResolution = RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_1080_1920;
+                rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_1080_1920;
-                minRate = 400;
+                minRate = landscape == 1 ? 900 : 400;
-                maxRate = 4000;
+                maxRate = landscape == 1 ? 700 : 4000;
                 break;
         }
         // 示例代码使用480x640分辨率演示
@@ -1146,6 +1149,15 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
         ArrayList<RCRTCOutputStream> streams = new ArrayList<>();
 //        streams.add(RCRTCEngine.getInstance().getDefaultVideoStream());
         streams.add(RCRTCEngine.getInstance().getDefaultAudioStream());
+        if (landscape == 1) {
+            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    setLiveBeanLandscape(1);
+                }
+            });
+
+        }
 // 开启摄像头
 //        RCRTCEngine.getInstance().getDefaultVideoStream().startCamera(null);
 // 开始切换为主播身份

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

@@ -419,17 +419,6 @@
                     android:textSize="10sp"
                     android:visibility="gone" />
 
-                <TextView
-                    android:id="@+id/quick_gift_remaining_quantity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginBottom="-2dp"
-                    android:text="99"
-                    android:textColor="#FFB403"
-                    android:textSize="10sp"
-                    android:textStyle="bold" />
 
                 <ImageView
                     android:id="@+id/combo"
@@ -505,7 +494,18 @@
                 android:visibility="gone" />
         </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="150dp"
+            android:layout_marginBottom="-2dp"
+            android:text="99"
+            android:textColor="#FFB403"
+            android:textSize="8sp"
+            android:textStyle="bold" />
     </RelativeLayout>
 
 </LinearLayout>