diff --git a/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java b/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java index c9c22e008..c011a5a67 100644 --- a/common/src/main/java/com/yunbao/common/bean/IMLoginModel.java +++ b/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; @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; } diff --git a/common/src/main/java/com/yunbao/common/views/weight/CircleProgress2.java b/common/src/main/java/com/yunbao/common/views/weight/CircleProgress2.java index 879aae686..7efdb89c5 100644 --- a/common/src/main/java/com/yunbao/common/views/weight/CircleProgress2.java +++ b/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; //小圆的半径 diff --git a/config.gradle b/config.gradle index 8bd78b4b7..3c4631a75 100644 --- a/config.gradle +++ b/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", diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index 0f8a687ac..126ec891c 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/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; - minRate = 200; - maxRate = 900; + rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_480_848; + minRate = landscape == 1 ? 900 : 200; + maxRate = landscape == 1 ? 700 : 900; break; case 1: - rcrtcVideoResolution = RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280; - minRate = 250; - maxRate = 2200; + rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_720_1280; + minRate = landscape == 1 ? 900 : 250; + maxRate = landscape == 1 ? 700 : 2200; break; case 2: - rcrtcVideoResolution = RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_1080_1920; - minRate = 400; - maxRate = 4000; + rcrtcVideoResolution = landscape == 1 ? RCRTCParamsType.RCRTCVideoResolution.parseVideoResolution(960, 720) : RCRTCParamsType.RCRTCVideoResolution.RESOLUTION_1080_1920; + minRate = landscape == 1 ? 900 : 400; + maxRate = landscape == 1 ? 700 : 4000; break; } // 示例代码使用480x640分辨率演示 @@ -1146,6 +1149,15 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { ArrayList 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); // 开始切换为主播身份 diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index 7e93889f9..098475017 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -419,17 +419,6 @@ android:textSize="10sp" android:visibility="gone" /> - - + \ No newline at end of file