直播间机器人

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

@@ -15,9 +15,9 @@ public class LiveAiRobotBean extends BaseModel {
     @SerializedName("ai_time")
     private int time;
     @SerializedName("ai_sayhi")
-    private int autoSeyHiNumber;// 自动打招呼已配置数量
+    private String autoSeyHiNumber;// 自动打招呼已配置数量
     @SerializedName("ai_gz")
-    private int autoRequestFollowNumber;//自动求关注已配置数量
+    private String autoRequestFollowNumber;//自动求关注已配置数量
 
     public LiveAiRobotBean() {
     }
@@ -46,19 +46,19 @@ public class LiveAiRobotBean extends BaseModel {
         this.time = time;
     }
 
-    public int getAutoSeyHiNumber() {
+    public String getAutoSeyHiNumber() {
         return autoSeyHiNumber;
     }
 
-    public void setAutoSeyHiNumber(int autoSeyHiNumber) {
+    public void setAutoSeyHiNumber(String autoSeyHiNumber) {
         this.autoSeyHiNumber = autoSeyHiNumber;
     }
 
-    public int getAutoRequestFollowNumber() {
+    public String getAutoRequestFollowNumber() {
         return autoRequestFollowNumber;
     }
 
-    public void setAutoRequestFollowNumber(int autoRequestFollowNumber) {
+    public void setAutoRequestFollowNumber(String autoRequestFollowNumber) {
         this.autoRequestFollowNumber = autoRequestFollowNumber;
     }
 

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

@@ -20,10 +20,10 @@ import com.yunbao.common.bean.NewPeopleInfo;
 import com.yunbao.common.bean.NobleRankHideUserListModel;
 import com.yunbao.common.bean.NobleTrumpetModel;
 import com.yunbao.common.bean.PkRankBean;
-import com.yunbao.common.bean.RandomPkUserBean;
-import com.yunbao.common.bean.RankPkInfoBean;
 import com.yunbao.common.bean.PrankGiftBean;
 import com.yunbao.common.bean.PrankHttpTurntableBean;
+import com.yunbao.common.bean.RandomPkUserBean;
+import com.yunbao.common.bean.RankPkInfoBean;
 import com.yunbao.common.bean.SearchModel;
 import com.yunbao.common.bean.SetAttentsModel;
 import com.yunbao.common.bean.SlideInBannerModel;
@@ -31,6 +31,7 @@ import com.yunbao.common.bean.StarChallengeStatusModel;
 import com.yunbao.common.bean.VipModel;
 
 import java.util.List;
+import java.util.Map;
 
 import io.reactivex.Observable;
 import retrofit2.http.Field;
@@ -38,6 +39,7 @@ import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
+import retrofit2.http.QueryMap;
 
 /**
  * PDLive网络接口访问
@@ -485,9 +487,8 @@ public interface PDLiveApi {
      * 修改机器人信息
      */
     @GET("/api/public/?service=Live.setAnchorAiState")
-    Observable<ResponseModel<HttpCallbackModel>> setAnchorAiState(
-            @Query("name") String name,
-            @Query("value") String value
+    Observable<ResponseModel<Integer>> setAnchorAiState(
+            @QueryMap Map<String, Object> map
     );
 
     /**

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -33,7 +33,9 @@ import com.yunbao.common.http.base.CheckLiveCallBack;
 import com.yunbao.common.http.base.HttpCallback;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -934,8 +936,10 @@ public class LiveNetManager {
     }
 
     public void setAiRobotDate(String name, String value, HttpCallback<HttpCallbackModel> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put(name, value);
         API.get().pdLiveApi(mContext)
-                .setAnchorAiState(name, value)
+                .setAnchorAiState(map)
                 .subscribeOn(Schedulers.io())
                 .subscribe(responseModel -> {
                     if (callback != null) {

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

@@ -127,7 +127,8 @@ public class CustomDrawerPopupView extends DrawerPopupView {
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.system_notice), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
-                dismiss();
+//                dismiss();
+
 
 
             }

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item >
+        <shape>
+            <corners android:radius="13.33dp"/>
+            <solid android:color="#00B8EB"/>
+        </shape>
+    </item>
+</selector>

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

@@ -108,7 +108,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:id="@+id/system_notice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -978,4 +978,14 @@
     <string name="random_pk_dialog_refuse" translatable="false">拒绝</string>
     <string name="random_pk_dialog_refuse_again" translatable="false">坚持拒绝</string>
     <string name="random_pk_dialog_title" translatable="false">随机PK提示</string>
+
+    <string name="speech_robot_setup" translatable="false">自動發言機器人設置</string>
+    <string name="robot_switch" translatable="false">機器人開關</string>
+    <string name="robot_name_setting" translatable="false">機器人名字設置</string>
+    <string name="word_limit" translatable="false">字數限制2-8個字</string>
+    <string name="automatic_greeting_setting" translatable="false">自動打招呼設置</string>
+    <string name="configured_items" translatable="false">已配置條數</string>
+    <string name="automatic_message_sending" translatable="false">自動發消息設置</string>
+    <string name="robot_go_setting" translatable="false">前往設置</string>
+    <string name="robot_hint" translatable="false">感謝送禮、PK開始、PK結束的自動機器人消息，\n暫不支持自定義。</string>
 </resources>