diff --git a/common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java b/common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java
index c2369455f..da77d56e5 100644
--- a/common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java
@@ -1,10 +1,18 @@
 package com.yunbao.common.bean;
 
 
-public class HttpCallbackModel extends BaseModel{
+public class HttpCallbackModel extends BaseModel {
     private int code;
     private String msg;
 
+    public HttpCallbackModel() {
+    }
+
+    public HttpCallbackModel(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
     public int getCode() {
         return code;
     }
diff --git a/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java b/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java
new file mode 100644
index 000000000..d94c60bb0
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java
@@ -0,0 +1,108 @@
+package com.yunbao.common.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.yunbao.common.bean.BaseModel;
+
+public class LiveAiRobotBean extends BaseModel {
+    @SerializedName("ai_name")
+    private String name;
+    @SerializedName("ai_state")
+    private int status;
+    @SerializedName("ai_time")
+    private int time;
+    @SerializedName("ai_sayhi")
+    private int autoSeyHiNumber;
+    @SerializedName("ai_gz")
+    private int autoRequestFollowNumber;
+
+    public LiveAiRobotBean() {
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getTime() {
+        return time;
+    }
+
+    public void setTime(int time) {
+        this.time = time;
+    }
+
+    public int getAutoSeyHiNumber() {
+        return autoSeyHiNumber;
+    }
+
+    public void setAutoSeyHiNumber(int autoSeyHiNumber) {
+        this.autoSeyHiNumber = autoSeyHiNumber;
+    }
+
+    public int getAutoRequestFollowNumber() {
+        return autoRequestFollowNumber;
+    }
+
+    public void setAutoRequestFollowNumber(int autoRequestFollowNumber) {
+        this.autoRequestFollowNumber = autoRequestFollowNumber;
+    }
+
+    public static class Body {
+        public static final int TYPE_SAY_HI=1;
+        public static final int TYPE_FOLLOW=3;
+        @SerializedName("id")
+        private int id;
+        @SerializedName("uid")
+        private int uid;
+        @SerializedName("type")
+        private int type;
+        @SerializedName("content")
+        private String content;
+
+        public Body() {
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public int getUid() {
+            return uid;
+        }
+
+        public void setUid(int uid) {
+            this.uid = uid;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void setType(int type) {
+            this.type = type;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+    }
+}
diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index ba403f483..1427d6157 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -9,8 +9,10 @@ import com.yunbao.common.bean.CustomSidebarInfoModel;
 import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.FaceBookUpModel;
 import com.yunbao.common.bean.HourRank;
+import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.IMLoginModel;
 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.MsgSwitchDetailModel;
@@ -354,42 +356,51 @@ public interface PDLiveApi {
 
     /**
      * 设置随机PK开关
+     *
      * @param pk 1=开，0=关
      */
     @GET("/api/public/?service=Livepk.setRandomPKType")
     Observable<ResponseModel<List<BaseModel>>> changeRandomPkSwitch(@Query("random_pk") int pk);
+
     /**
      * 获取自由PK次数
      */
     @GET("/api/public/?service=Livepk.getActivePkNum")
     Observable<ResponseModel<Integer>> getFreePkNumber();
+
     /**
      * 发起随机PK
      */
     @GET("/api/public/?service=Livepk.setRandomPK")
     Observable<ResponseModel<String>> randomPK();
+
     /**
      * 随机PK后调用接口给后台记录
      */
     @GET("/api/public/?service=Livepk.startRandomPK")
-    Observable<ResponseModel<BaseModel>> startRandomPK(@Query("pkuid")String pkuid);
+    Observable<ResponseModel<BaseModel>> startRandomPK(@Query("pkuid") String pkuid);
+
     /**
      * 自由PK开始后调用接口扣掉次数
      */
     @GET("/api/public/?service=Livepk.setActivePkNum")
     Observable<ResponseModel<BaseModel>> setFreePkNum();
+
     /**
      * 随机PK搜索用户
+     *
      * @param cs 简体关键字/uid
      * @param ct 繁体关键字/uid
      */
     @GET("/api/public/?service=Livepk.searchUser")
-    Observable<ResponseModel<List<RandomPkUserBean>>> randomPkSearchUser(@Query("jian_key")String cs,@Query("fan_key")String ct);
+    Observable<ResponseModel<List<RandomPkUserBean>>> randomPkSearchUser(@Query("jian_key") String cs, @Query("fan_key") String ct);
+
     /**
      * 拒绝随机PK
      */
     @GET("/api/public/?service=Livepk.setBanRandomPK")
     Observable<ResponseModel<BaseModel>> setBanRandomPK();
+
     /**
      * 拒绝随机PK
      */
@@ -403,6 +414,7 @@ public interface PDLiveApi {
     Observable<ResponseModel<PrankHttpTurntableBean>> getAnchorPrankTurntable(
             @Query("anchor_id") String anchor_id
     );
+
     /**
      * 提交整蛊
      */
@@ -418,6 +430,7 @@ public interface PDLiveApi {
             @Query("turntable_six") String turntable_six,
             @Query("status") String status
     );
+
     /**
      * 转盘整蛊结束后调用的接口
      */
@@ -431,7 +444,7 @@ public interface PDLiveApi {
      * 获取整蛊列表
      */
     @GET("/api/public/?service=Prank.prankList")
-    Observable<ResponseModel<List<PrankGiftBean>>> prankList(   @Query("anchor_id") String anchor_id);
+    Observable<ResponseModel<List<PrankGiftBean>>> prankList(@Query("anchor_id") String anchor_id);
 
     /**
      * 设置礼物整蛊
@@ -443,6 +456,7 @@ public interface PDLiveApi {
             @Query("gift_num") String gift_num,
             @Query("prank_content") String prank_content
     );
+
     /**
      * 删除礼物整蛊
      */
@@ -451,58 +465,67 @@ public interface PDLiveApi {
             @Query("anchor_id") String anchor_id,
             @Query("prank_index") String prank_index
     );
+
     /**
      * 设置机器人开关
      */
     @GET("/api/public/?service=Live.setAnchorAiState")
-    Observable<ResponseModel<List<BaseModel>>> setAnchorAiState(
+    Observable<ResponseModel<HttpCallbackModel>> setAnchorAiState(
             @Query("ai_state") String ai_state
     );
+
     /**
      * 获取机器人信息
      */
     @GET("/api/public/?service=Live.getAnchorAiState")
-    Observable<ResponseModel<List<BaseModel>>> getAnchorAiState(
+    Observable<ResponseModel<LiveAiRobotBean>> getAnchorAiState(
     );
+
     /**
      * 修改机器人信息
      */
     @GET("/api/public/?service=Live.setAnchorAiState")
-    Observable<ResponseModel<List<BaseModel>>> getAnchorAiState(
+    Observable<ResponseModel<HttpCallbackModel>> setAnchorAiState(
             @Query("name") String name,
             @Query("value") String value
     );
-   /**
+
+    /**
      * 获取机器人自定义话术
-    * @param type 1(自定义打招呼) 3(自定义求关注)
+     *
+     * @param type 1(自定义打招呼) 3(自定义求关注)
      */
     @GET("/api/public/?service=Live.getAiAutomaticSpeech")
-    Observable<ResponseModel<List<BaseModel>>> getAiAutomaticSpeech(
+    Observable<ResponseModel<List<LiveAiRobotBean.Body>>> getAiAutomaticSpeech(
             @Query("type") String type
     );
+
     /**
      * 机器人添加话术
      */
     @GET("/api/public/?service=Live.addAiAutomaticSpeech")
-    Observable<ResponseModel<List<BaseModel>>> addAiAutomaticSpeech(
+    Observable<ResponseModel<HttpCallbackModel>> addAiAutomaticSpeech(
             @Query("type") String type,
             @Query("content") String content
     );
+
     /**
      * 机器人删除话术
      */
     @GET("/api/public/?service=Live.delAiAutomaticSpeech ")
-    Observable<ResponseModel<List<BaseModel>>> delAiAutomaticSpeech (
-            @Query("type") String type,
-            @Query("id") String id
-    );
-    /**
-     * 机器人修改话术
-     */
-    @GET("/api/public/?service=Live.updateAiAutomaticSpeech  ")
-    Observable<ResponseModel<List<BaseModel>>> updateAiAutomaticSpeech  (
+    Observable<ResponseModel<HttpCallbackModel>> delAiAutomaticSpeech(
             @Query("type") String type,
             @Query("id") String id
     );
 
+    /**
+     * 机器人修改话术
+     */
+    @GET("/api/public/?service=Live.updateAiAutomaticSpeech  ")
+    Observable<ResponseModel<HttpCallbackModel>> updateAiAutomaticSpeech(
+            @Query("type") String type,
+            @Query("id") String id,
+            @Query("content") String content
+    );
+
 }
diff --git a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
index b5ff172fb..54ee7fcf6 100644
--- a/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
+++ b/common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
@@ -14,6 +14,7 @@ import com.yunbao.common.bean.EnterRoomNewModel;
 import com.yunbao.common.bean.HttpCallbackModel;
 import com.yunbao.common.bean.LinkMicUserBean;
 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.NobleRankHideUserListModel;
@@ -879,7 +880,7 @@ public class LiveNetManager {
     /**
      * 整蛊结束
      */
-    public void endPrankTurntable(String mLiveUid,HttpCallback<BaseModel> callback){
+    public void endPrankTurntable(String mLiveUid, HttpCallback<BaseModel> callback) {
         API.get().pdLiveApi(mContext)
                 .endPrankTurntable(mLiveUid)
                 .subscribeOn(Schedulers.io())
@@ -898,6 +899,132 @@ public class LiveNetManager {
 
     }
 
+    public void getAiRobotStatus(HttpCallback<LiveAiRobotBean> callback) {
+        API.get().pdLiveApi(mContext)
+                .getAnchorAiState()
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(responseModel.getData().getInfo());
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void setAiRobotStatus(String status, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .setAnchorAiState(status)
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(null);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void setAiRobotDate(String name, String value, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .setAnchorAiState(name, value)
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(null);
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void getAiRobotBody(int type, HttpCallback<List<LiveAiRobotBean.Body>> callback) {
+        API.get().pdLiveApi(mContext)
+                .getAiAutomaticSpeech(type + "")
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(responseModel.getData().getInfo());
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void addAiRobotBody(int type, String content, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .addAiAutomaticSpeech(type + "", content)
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(responseModel.getData().getCode(), responseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void updateAiRobotBody(int type, int id, String content, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .updateAiAutomaticSpeech(type + "", id + "", content)
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(responseModel.getData().getCode(), responseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
+    public void delAiRobotBody(int type, int id, HttpCallback<HttpCallbackModel> callback) {
+        API.get().pdLiveApi(mContext)
+                .delAiAutomaticSpeech(type + "", id + "")
+                .subscribeOn(Schedulers.io())
+                .subscribe(responseModel -> {
+                    if (callback != null) {
+                        callback.onSuccess(new HttpCallbackModel(responseModel.getData().getCode(), responseModel.getData().getMsg()));
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Exception {
+                        if (callback != null) {
+                            callback.onError(throwable.getMessage());
+                        }
+                    }
+                }).isDisposed();
+    }
+
     /**
      * 直播间取消网络请求
      */
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java
index 13eeae167..5ef74897b 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java
@@ -46,11 +46,6 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        Bundle bundle = getArguments();
-        if (bundle == null) {
-            return;
-        }
-
 
     }