Merge remote-tracking branch 'origin/master'

common/src/main/java/com/yunbao/common/Constants.java

@@ -172,6 +172,7 @@ public class Constants {
     public static final String RECOMMEND_CARD_NOTIFY = "recommendCardNotify";//推荐卡通知消息
     public static final String STAR_CHALLENGE_UPDATE = "starChallengeUpdate";//星级助力
     public static final String AI_AUTOMATIC_SPEECH = "aiAutomaticSpeech";//机器人助手
+    public static final String AI_AUTOMATIC_SPEECH_LIVE = "aiAutomaticSpeechNew";//机器人助手
     public static final String STAR_CHALLENGE_UPGRADE_NOTIFY = "starChallengeUpgradeNotify";//星级挑战成功
     public static final String SUPER_VISION = "supervision";//超级发言警告
     public static final String PK_RANK_UPDATE = "RankingRankUpdate";//PK排位赛更新数据

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

@@ -0,0 +1,49 @@
+package com.yunbao.common.bean;
+
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+
+public class LiveStetUpStatusModel extends BaseModel {
+
+    @SerializedName("wishList")
+    private String wishList;
+    @SerializedName("ai_state")
+    private String aiState;
+
+    /**
+     * wishList 1设置 0 未设置
+     *
+     * @return
+     */
+    public boolean getWishListState() {
+        return TextUtils.equals(wishList, "1");
+    }
+
+    /**
+     * aiState 1打开机器人 0 未设置
+     *
+     * @return
+     */
+    public boolean getAiStateState() {
+        return TextUtils.equals(aiState, "1");
+    }
+
+    public String getWishList() {
+        return wishList;
+    }
+
+    public LiveStetUpStatusModel setWishList(String wishList) {
+        this.wishList = wishList;
+        return this;
+    }
+
+    public String getAiState() {
+        return aiState;
+    }
+
+    public LiveStetUpStatusModel setAiState(String aiState) {
+        this.aiState = aiState;
+        return this;
+    }
+}

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -15,6 +15,7 @@ import com.yunbao.common.bean.LinkMicUserBeanV2;
 import com.yunbao.common.bean.LiveAiRobotBean;
 import com.yunbao.common.bean.LiveInfoModel;
 import com.yunbao.common.bean.LiveRoomActivityBanner;
+import com.yunbao.common.bean.LiveStetUpStatusModel;
 import com.yunbao.common.bean.MsgSwitchDetailModel;
 import com.yunbao.common.bean.NewPeopleInfo;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
@@ -522,11 +523,18 @@ public interface PDLiveApi {
     /**
      * 机器人修改话术
      */
-    @GET("/api/public/?service=Live.updateAiAutomaticSpeech  ")
+    @GET("/api/public/?service=Live.updateAiAutomaticSpeech")
     Observable<ResponseModel<List<String>>> updateAiAutomaticSpeech(
             @Query("type") String type,
             @Query("id") String id,
             @Query("content") String content
     );
 
+    /**
+     * 开播获取机器人状态和心愿单状态
+     */
+    @GET("/api/public/?service=Live.getLiveStetUpStatus")
+    Observable<ResponseModel<LiveStetUpStatusModel>> getLiveStetUpStatus(
+            @Query("liveuid") String liveUid
+    );
 }

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -7,7 +7,6 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
-import com.cosmos.baseutil.app.AppContext;
 import com.google.gson.Gson;
 import com.lzf.easyfloat.EasyFloat;
 import com.yunbao.common.CommonAppContext;
@@ -39,7 +38,25 @@ public class IMLoginManager extends BaseCacheManager {
     private final String IS_FLOAT = "is_float";
     private final String IS_HINT = "is_hint";
     private final String IS_HINT2 = "is_hint2";
+    private final String SELECT_CLARITY = "selectClarity";
 
+    /**
+     * 设置清晰度
+     *
+     * @param selectClarity
+     */
+    public void setSelectClarity(int selectClarity) {
+        put(SELECT_CLARITY, selectClarity);
+    }
+
+    /**
+     * 获取清晰度
+     *
+     * @return
+     */
+    public int getSelectClarity() {
+        return getInt(SELECT_CLARITY, 1);
+    }
 
     public boolean isHint() {
         return 1 == getInt(IS_HINT, 0);

common/src/main/java/com/yunbao/common/views/InputCustomPopup.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
@@ -17,14 +18,17 @@ import com.yunbao.common.utils.ToastUtil;
  */
 public class InputCustomPopup extends CenterPopupView {
     private String message = "";
+    private int title = R.string.dialog_tip;
 
-    public InputCustomPopup(@NonNull Context context, String message) {
+    public InputCustomPopup(@NonNull Context context, String message, int title) {
         super(context);
         this.message = message;
+        this.title = title;
     }
 
-    public InputCustomPopup(@NonNull Context context) {
+    public InputCustomPopup(@NonNull Context context,int title) {
         super(context);
+        this.title = title;
     }
 
     // 返回自定义弹窗的布局
@@ -38,7 +42,9 @@ public class InputCustomPopup extends CenterPopupView {
     protected void onCreate() {
         super.onCreate();
         EditText content = findViewById(R.id.content);
+        TextView titleText = findViewById(R.id.title);
         content.setText(message);
+        titleText.setText(title);
         findViewById(R.id.btn_cancel).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {

common/src/main/java/com/yunbao/common/views/LiveClarityCustomPopup.java

@@ -0,0 +1,116 @@
+package com.yunbao.common.views;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.NonNull;
+
+import com.lxj.xpopup.core.BottomPopupView;
+import com.yunbao.common.R;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+
+public class LiveClarityCustomPopup extends BottomPopupView implements View.OnClickListener {
+    private int selectClarity = 1;
+    private RelativeLayout lineSd, lineHd, lineFhd;
+    private ImageView iconSd, iconHd, iconFhd;
+
+    public int getSelectClarity() {
+        return selectClarity;
+    }
+
+    public LiveClarityCustomPopup(@NonNull Context context, int selectClarity) {
+        super(context);
+        this.selectClarity = selectClarity;
+    }
+
+    public LiveClarityCustomPopup(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onClick(View v) {
+
+    }
+
+    // 返回自定义弹窗的布局
+    @Override
+    protected int getImplLayoutId() {
+        return R.layout.dialog_live_clarity;
+    }
+
+    // 执行初始化操作，比如：findView，设置点击，或者任何你弹窗内的业务逻辑
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        initView();
+        initDate();
+    }
+
+    private void initView() {
+        lineSd = findViewById(R.id.line_sd);
+        lineHd = findViewById(R.id.line_hd);
+        lineFhd = findViewById(R.id.line_fhd);
+        iconSd = findViewById(R.id.icon_sd);
+        iconHd = findViewById(R.id.icon_hd);
+        iconFhd = findViewById(R.id.icon_fhd);
+        selectClarity(selectClarity);
+        //流畅
+        ViewClicksAntiShake.clicksAntiShake(lineSd, () -> {
+            selectClarity = 0;
+            selectClarity(selectClarity);
+            dismiss();
+        });
+        //高清
+        ViewClicksAntiShake.clicksAntiShake(lineHd, () -> {
+            selectClarity = 1;
+            selectClarity(selectClarity);
+            dismiss();
+
+        });
+        //超高清
+        ViewClicksAntiShake.clicksAntiShake(lineFhd, () -> {
+            selectClarity = 2;
+            selectClarity(selectClarity);
+            dismiss();
+        });
+    }
+
+    /**
+     * 状态选择
+     *
+     * @param selectClarity
+     */
+    private void selectClarity(int selectClarity) {
+        switch (selectClarity) {
+            case 0:
+                lineSd.setSelected(true);
+                lineHd.setSelected(false);
+                lineFhd.setSelected(false);
+                iconSd.setVisibility(VISIBLE);
+                iconHd.setVisibility(GONE);
+                iconFhd.setVisibility(GONE);
+                break;
+            case 1:
+                lineSd.setSelected(false);
+                lineHd.setSelected(true);
+                lineFhd.setSelected(false);
+                iconSd.setVisibility(GONE);
+                iconHd.setVisibility(VISIBLE);
+                iconFhd.setVisibility(GONE);
+                break;
+            case 2:
+                lineSd.setSelected(false);
+                lineHd.setSelected(false);
+                lineFhd.setSelected(true);
+                iconSd.setVisibility(GONE);
+                iconHd.setVisibility(GONE);
+                iconFhd.setVisibility(VISIBLE);
+                break;
+        }
+    }
+
+    private void initDate() {
+    }
+}

common/src/main/java/com/yunbao/common/views/LiveRobotMessageCustomPopup.java

@@ -136,7 +136,7 @@ public class LiveRobotMessageCustomPopup extends BottomPopupView {
             @Override
             public void onClick(View v) {
                 new XPopup.Builder(getContext())
-                        .asCustom(new InputCustomPopup(getContext()).setListener(new InputCustomPopup.InputCustomListener() {
+                        .asCustom(new InputCustomPopup(getContext(),R.string.automatic_message_sending).setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 //添加消息语

common/src/main/java/com/yunbao/common/views/LiveRobotSayHelloCustomPopup.java

@@ -82,7 +82,7 @@ public class LiveRobotSayHelloCustomPopup extends BottomPopupView {
             @Override
             public void onClick(View v) {
                 new XPopup.Builder(getContext())
-                        .asCustom(new InputCustomPopup(getContext()).setListener(new InputCustomPopup.InputCustomListener() {
+                        .asCustom(new InputCustomPopup(getContext(), R.string.automatic_greeting_setting).setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 //添加消息语

common/src/main/java/com/yunbao/common/views/RobotMessageViewHolder.java

@@ -53,7 +53,7 @@ public class RobotMessageViewHolder extends RecyclerView.ViewHolder {
             @Override
             public void onClick(View v) {
                 new XPopup.Builder(itemView.getContext())
-                        .asCustom(new InputCustomPopup(itemView.getContext(), message.getContent()).setListener(new InputCustomPopup.InputCustomListener() {
+                        .asCustom(new InputCustomPopup(itemView.getContext(), message.getContent(), R.string.automatic_message_sending).setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 LiveNetManager.get(itemView.getContext())

common/src/main/java/com/yunbao/common/views/RobotSayHelloViewHoler.java

@@ -53,7 +53,7 @@ public class RobotSayHelloViewHoler extends RecyclerView.ViewHolder {
             @Override
             public void onClick(View v) {
                 new XPopup.Builder(itemView.getContext())
-                        .asCustom(new InputCustomPopup(itemView.getContext(), message.getContent()).setListener(new InputCustomPopup.InputCustomListener() {
+                        .asCustom(new InputCustomPopup(itemView.getContext(), message.getContent(), R.string.automatic_greeting_setting).setListener(new InputCustomPopup.InputCustomListener() {
                             @Override
                             public void onConfirm(String text) {
                                 LiveNetManager.get(itemView.getContext())

common/src/main/res/drawable/bg_btn_definition.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="#20FFB2B2" />
+        </shape>
+    </item>
+    <item android:state_selected="false">
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="#407792D0" />
+        </shape>
+    </item>
+</selector>

common/src/main/res/layout/dialog_live_clarity.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="249dp"
+    android:background="@drawable/bg_live_tota"
+
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical">
+
+        <RelativeLayout
+            android:id="@+id/line_sd"
+            android:layout_width="0dp"
+            android:layout_height="137dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_btn_definition"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/icon_sd"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_alignParentEnd="true"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_marginBottom="10dp"
+                android:src="@mipmap/icon_selected" />
+
+            <ImageView
+                android:id="@+id/sd"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="39dp"
+                android:src="@mipmap/icon_sd" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/sd"
+                android:layout_centerInParent="true"
+                android:layout_marginTop="4dp"
+                android:text="@string/standard_clear"
+                android:textColor="#F6F7FB"
+                android:textSize="16sp" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/line_hd"
+            android:layout_width="0dp"
+            android:layout_height="137dp"
+            android:layout_marginStart="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_btn_definition"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/icon_hd"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+
+                android:layout_alignParentEnd="true"
+                android:layout_margin="10dp"
+                android:src="@mipmap/icon_selected" />
+
+            <ImageView
+                android:id="@+id/hd"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="39dp"
+                android:src="@mipmap/icon_hd" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/hd"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="4dp"
+                android:text="@string/high_definition"
+                android:textColor="#F6F7FB"
+                android:textSize="16sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/line_fhd"
+            android:layout_width="0dp"
+            android:layout_height="137dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_btn_definition"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/icon_fhd"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_alignParentEnd="true"
+                android:layout_margin="10dp"
+                android:src="@mipmap/icon_selected" />
+
+            <ImageView
+                android:id="@+id/fhd"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="39dp"
+                android:src="@mipmap/icon_fhd" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/fhd"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="4dp"
+                android:text="@string/ultra_hd"
+                android:textColor="#F6F7FB"
+                android:textSize="16sp" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginBottom="30dp"
+        android:text="@string/clarity_hint"
+        android:textColor="#FFFFFF"
+        android:textSize="12sp" />
+
+</LinearLayout>

common/src/main/res/values/strings.xml

@@ -996,4 +996,8 @@
     <string name="robot_add_content_hint3" translatable="false">當有用戶進入直播間時，機器人會@該用戶並自動</string>
     <string name="robot_add_content_hint4" translatable="false">隨機以下一句話。最少設置1條，最多20條。</string>
     <string name="robot_setup" translatable="false">機器人設置</string>
+    <string name="high_definition" translatable="false">高清</string>
+    <string name="standard_clear" translatable="false">流暢</string>
+    <string name="ultra_hd" translatable="false">超高清</string>
+    <string name="clarity_hint" translatable="false">確定清晰度開播後，需要重新開播才能更改</string>
 </resources>

config.gradle

@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-            serverHost       : "https://napi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
 //            測試
-//            serverHost       : "https://ceshi.yaoulive.com",
+            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java

@@ -17,6 +17,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -31,17 +32,22 @@ import androidx.fragment.app.DialogFragment;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.blankj.utilcode.util.GsonUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.BasePopupView;
+import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.opensource.svgaplayer.SVGAImageView;
 import com.tencent.trtc.TRTCCloudDef;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
+import com.yunbao.common.bean.AiAutomaticSpeechModel;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LinkMicUserBean;
+import com.yunbao.common.bean.LiveAiRobotBean;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.LiveUserGiftBean;
 import com.yunbao.common.bean.MicUserBean;
@@ -52,6 +58,7 @@ import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.manager.IMRTCManager;
 import com.yunbao.common.manager.RandomPkManager;
@@ -99,11 +106,13 @@ import com.yunbao.live.views.LivePushRyViewHolder;
 import com.yunbao.live.views.LiveRoomViewHolder;
 import com.yunbao.live.views.LiveRyAnchorViewHolder;
 
+import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.File;
 import java.util.List;
+import java.util.Random;
 
 import cn.rongcloud.rtc.api.RCRTCEngine;
 import cn.rongcloud.rtc.api.callback.IRCRTCResultCallback;
@@ -284,6 +293,52 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
         switch (functionID) {
             case Constants.LIVE_ROBOT:
                 new XPopup.Builder(mContext)
+                        .setPopupCallback(new XPopupCallback() {
+                            @Override
+                            public void onCreated(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void beforeShow(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void onShow(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public void onDismiss(BasePopupView popupView) {
+                                EventBus.getDefault().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.UPDATA_ROBOT));
+                            }
+
+                            @Override
+                            public void beforeDismiss(BasePopupView popupView) {
+
+                            }
+
+                            @Override
+                            public boolean onBackPressed(BasePopupView popupView) {
+                                return false;
+                            }
+
+                            @Override
+                            public void onKeyBoardStateChanged(BasePopupView popupView, int height) {
+
+                            }
+
+                            @Override
+                            public void onDrag(BasePopupView popupView, int value, float percent, boolean upOrLeft) {
+
+                            }
+
+                            @Override
+                            public void onClickOutside(BasePopupView popupView) {
+
+                            }
+                        })
                         .asCustom(new LiveRobotSettingCustomPopup(mContext))
                         .show();
                 break;
@@ -674,6 +729,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
      * @param data createRoom返回的数据
      */
     public void startLiveSuccess(String data, int liveType, int liveTypeVal) {
+        Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((" + data);
         mLiveType = liveType;
         mLiveTypeVal = liveTypeVal;
         //处理createRoom返回的数据
@@ -774,6 +830,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
         if (CommonAppConfig.GAME_ENABLE) {
             mGameList = JSON.parseArray(obj.getString("game_switch"), Integer.class);
         }
+        getAiRobotStatus();
     }
 
     /**
@@ -861,6 +918,10 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
         LiveHttpUtil.stopLive(mStream, new HttpCallback() {
             @Override
             public void onSuccess(int code, String msg, String[] info) {
+                if (robotRunnable != null) {
+                    robotHandler.removeCallbacks(robotRunnable);
+                    robotRunnable = null;
+                }
                 if (code == 0) {
                     JSONObject obj = JSON.parseObject(info[0]);
                     JSONObject datas = obj.getJSONObject("data");
@@ -1506,6 +1567,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     mLiveRoomViewHolder.aiAutomaticSpeech((event.getAiAutomaticSpeechModel()));
                 }
                 break;
+            case UPDATA_ROBOT:
+                getAiRobotStatus();
+                break;
 
         }
     }
@@ -1532,4 +1596,118 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
             }
         });
     }
+
+    /**
+     * 获取机器人配置；取得求关注时间间隔
+     */
+    private long robotTime = 0;
+
+    private void getAiRobotStatus() {
+        Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((");
+        LiveNetManager.get(mContext)
+                .getAiRobotStatus(new com.yunbao.common.http.base.HttpCallback<LiveAiRobotBean>() {
+                    @Override
+                    public void onSuccess(LiveAiRobotBean data) {
+                        Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((" + data.toString());
+                        if (data.getStatus() == 1) {
+                            if (robotRunnable != null) {
+                                robotHandler.removeCallbacks(robotRunnable);
+                                robotRunnable = null;
+                            }
+                            robotRunnable = new Runnable() {
+                                @Override
+                                public void run() {
+                                    Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((data.getName())" + data.getName());
+                                    String robotName = data.getName();
+                                    //发送消息
+                                    LiveNetManager.get(mContext)
+                                            .getAiRobotBody(LiveAiRobotBean.Message.TYPE_FOLLOW,
+                                                    new com.yunbao.common.http.base.HttpCallback<List<LiveAiRobotBean.Message>>() {
+                                                        @Override
+                                                        public void onSuccess(List<LiveAiRobotBean.Message> messageList) {
+                                                            Random random = new Random();
+                                                            int randNumber = random.nextInt(messageList.size()) - 1;
+                                                            if (randNumber < 0) {
+                                                                randNumber = 0;
+                                                            }
+                                                            Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((data.randNumber())" + randNumber);
+                                                            Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((data)" + messageList.toString());
+                                                            sendRobotMessage(robotName, messageList.get(randNumber).getContent());
+                                                        }
+
+                                                        @Override
+                                                        public void onError(String error) {
+                                                            Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((data.error())" + error);
+                                                        }
+                                                    });
+
+                                }
+                            };
+                            robotTime = data.getTime() * 60 * 1000;
+                            Log.e("随机打招呼", "(((((((((((((((((((((((((((((((((((((((((((((((robotTime)" + robotTime);
+                            robotHandler.postDelayed(robotRunnable, robotTime);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String error) {
+                        ToastUtil.show(error);
+                    }
+                });
+    }
+
+    //机器人求关注轮询器
+    private Handler robotHandler = new Handler();
+    private Runnable robotRunnable = null;
+
+    /**
+     * '{"msg":
+     * [{"_method_":"aiAutomaticSpeech",
+     * "ct":{"name_color":"#f19ec2","ai_name":"'+_this.robotInfo.ai_name+'",
+     * "content":"'+content+'","user_name":"",
+     * "icon":"https://downs.yaoulive.com/xzs_tab.png",
+     * "system_bubble":"https://downs.yaoulive.com/xzs_qipao.9.png"},
+     * "msgtype":"10"}],"retcode":"000000","retmsg":"OK"}'
+     */
+    private void sendRobotMessage(String name, String content) {
+        Log.e("随机打招呼", name + "==========00000000000000++++" + content);
+        AiAutomaticSpeechModel aiAutomaticSpeechModel = new AiAutomaticSpeechModel();
+        aiAutomaticSpeechModel.setAiName(name)
+                .setIcon("https://downs.yaoulive.com/xzs_tab.png")
+                .setNameColor("#f19ec2")
+                .setSystemBubble("https://downs.yaoulive.com/xzs_qipao.9.png")
+                .setUserName("")
+                .setContent(content);
+        SocketSendBean msg =
+                new SocketSendBean()
+                        .param("_method_", "aiAutomaticSpeechNew")
+                        .param("msgtype", "10")
+                        .param("ct", GsonUtils.toJson(aiAutomaticSpeechModel, AiAutomaticSpeechModel.class));
+        msg.create();
+        String targetId = "g" + mLiveUid;
+        Conversation.ConversationType conversationType = Conversation.ConversationType.CHATROOM;
+        TextMessage messageContent = TextMessage.obtain(msg.mResult.toString());
+        Message message = Message.obtain(targetId, conversationType, messageContent);
+
+        RongIMClient.getInstance().sendMessage(message, null, null, new IRongCallback.ISendMessageCallback() {
+            @Override
+            public void onAttached(Message message) {
+
+            }
+
+            @Override
+            public void onSuccess(Message message) {
+                if (SocketRyClient.mSocketHandler != null) {
+                    SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
+                }
+            }
+
+            @Override
+            public void onError(Message message, RongIMClient.ErrorCode errorCode) {
+                Log.e("tx", "aaa" + errorCode.toString());
+                ToastUtil.show(errorCode.code + ":" + errorCode.msg);
+            }
+        });
+        robotHandler.postDelayed(robotRunnable, robotTime);
+    }
 }

live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java

@@ -255,7 +255,8 @@ public class LiveAudienceEvent extends BaseModel {
         DISCONNEXT_PK_TIME(50, "单人Pk结束"),
         UP_PK_TWO(51, "PK头像信息"),
         CUSTOM_FULL_SERVICE_NOTIFY(51, "全服通知"),
-        CHANGE_VIEW(52, "更改连胜位置");
+        CHANGE_VIEW(52, "更改连胜位置"),
+        UPDATA_ROBOT(53, "更新机器人消息");
 
         private int type;
         private String name;

live/src/main/java/com/yunbao/live/socket/SocketRyClient.java

@@ -529,6 +529,7 @@ public class SocketRyClient {
                     }
                     break;
                 case Constants.AI_AUTOMATIC_SPEECH:
+                case Constants.AI_AUTOMATIC_SPEECH_LIVE:
                     //{"name_color":"#f19ec2","ai_name":"助手小小P","content":"@1 ","user_name":"1","icon":"https://downs.yaoulive.com/xzs_tab.png","system_bubble":"https://downs.yaoulive.com/xzs_qipao.9.png"}
                     AiAutomaticSpeechModel aiAutomaticSpeechModel = GsonUtils.fromJson(map.getString("ct"), AiAutomaticSpeechModel.class);
                     Bus.get().post(new LiveAudienceEvent()

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

@@ -11,12 +11,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 
 import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.core.BasePopupView;
+import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.LiveClassBean;
@@ -25,6 +28,7 @@ import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.CommonCallback;
 import com.yunbao.common.interfaces.ImageResultCallback;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.ProcessImageUtil;
@@ -32,7 +36,9 @@ import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsViewHolder;
+import com.yunbao.common.views.LiveClarityCustomPopup;
 import com.yunbao.common.views.LiveRobotSettingCustomPopup;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.faceunity.FaceManager;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
@@ -59,7 +65,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
     private ProcessImageUtil mImageUtil;
     private File mAvatarFile;
     private TextView mLiveClass;
-    private TextView mLiveTypeTextView;//房间类型TextView
+    private TextView mLiveTypeTextView, liveClarity;//房间类型TextView
     private TextView mLiveWishListTextView;//心愿单TextView
     private int mLiveClassID;//直播频道id
     private int mLiveType;//房间类型
@@ -70,6 +76,8 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
     private LiveClassBean classBean;
     private FaceManager manager;
     private TextView faceTextView;//提示人脸未检测到的TextView
+    private ImageView imgClarity;
+    private int selectClarity = 1;
 
     public LiveNewReadyRyViewHolder(Context context, ViewGroup parentView, int liveSdk) {
         super(context, parentView, liveSdk);
@@ -90,6 +98,8 @@ 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);
+        liveClarity = (TextView) findViewById(R.id.live_clarity);
         mRootView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -163,6 +173,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
         findViewById(R.id.btn_start_live).setOnClickListener(this);
         findViewById(R.id.btn_wishlist).setOnClickListener(this);
         findViewById(R.id.btn_horizontally).setOnClickListener(this);
+
         if (manager != null) {
             manager.setFaceStatusChanged(new FaceManager.FaceStatusChanged() {
                 final Handler handler = new Handler(Looper.getMainLooper());
@@ -180,6 +191,83 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
             });
             //新美颜
             setFaceUnity(true);
+
+        }
+        //设置清晰度
+        selectClarity = IMLoginManager.get(mContext).getSelectClarity();
+        setSelectClarity(selectClarity);
+        ViewClicksAntiShake
+                .clicksAntiShake(
+                        findViewById(R.id.btn_live_clarity), () -> {
+                            LiveClarityCustomPopup liveClarityCustomPopup = new LiveClarityCustomPopup(mContext, selectClarity);
+                            new XPopup.Builder(mContext)
+                                    .setPopupCallback(new XPopupCallback() {
+                                        @Override
+                                        public void onCreated(BasePopupView popupView) {
+
+                                        }
+
+                                        @Override
+                                        public void beforeShow(BasePopupView popupView) {
+
+                                        }
+
+                                        @Override
+                                        public void onShow(BasePopupView popupView) {
+
+                                        }
+
+                                        @Override
+                                        public void onDismiss(BasePopupView popupView) {
+                                            setSelectClarity(liveClarityCustomPopup.getSelectClarity());
+                                        }
+
+                                        @Override
+                                        public void beforeDismiss(BasePopupView popupView) {
+
+                                        }
+
+                                        @Override
+                                        public boolean onBackPressed(BasePopupView popupView) {
+                                            return false;
+                                        }
+
+                                        @Override
+                                        public void onKeyBoardStateChanged(BasePopupView popupView, int height) {
+
+                                        }
+
+                                        @Override
+                                        public void onDrag(BasePopupView popupView, int value, float percent, boolean upOrLeft) {
+
+                                        }
+
+                                        @Override
+                                        public void onClickOutside(BasePopupView popupView) {
+
+                                        }
+                                    })
+                                    .asCustom(liveClarityCustomPopup)
+                                    .show();
+                        });
+    }
+
+    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;
         }
     }
 

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

@@ -54,6 +54,43 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <LinearLayout
+            android:id="@+id/btn_live_clarity"
+            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_toTopOf="parent">
+
+            <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="wrap_content"
+                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"
@@ -62,7 +99,7 @@
             android:layout_marginTop="10dp"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toEndOf="@id/btn_live_clarity"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
@@ -94,11 +131,11 @@
             android:id="@+id/btn_live_class"
             android:layout_width="wrap_content"
             android:layout_height="25dp"
-            android:layout_marginStart="75dp"
             android:layout_marginTop="10dp"
+            android:layout_marginEnd="16dp"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintStart_toEndOf="@+id/btn_room_type"
+            app:layout_constraintEnd_toStartOf="@+id/btn_wishlist"
             app:layout_constraintTop_toTopOf="parent">
 
             <TextView