diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index aa2b8a418..574f224ef 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -988,4 +988,9 @@
自動發消息設置
前往設置
感謝送禮、PK開始、PK結束的自動機器人消息,\n暫不支持自定義。
+ 添加內容
+ 每隔一段時間,機器人自動隨機以下一句話發出。
+ 填寫內容推薦,如:求送心願單、加粉絲團等
+ 自動發言間隔時間(分鐘)
+ 最少間隔5分鐘1次
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveRobotMessageDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveRobotMessageDialogFragment.java
new file mode 100644
index 000000000..d96823523
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveRobotMessageDialogFragment.java
@@ -0,0 +1,37 @@
+package com.yunbao.live.dialog;
+
+import android.app.ActionBar;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.yunbao.common.dialog.AbsDialogFragment;
+import com.yunbao.common.utils.DpUtil;
+import com.yunbao.live.R;
+
+public class LiveRobotMessageDialogFragment extends AbsDialogFragment {
+ @Override
+ protected int getLayoutId() {
+ return R.layout.dialog_live_robot_message;
+ }
+
+
+ @Override
+ protected int getDialogStyle() {
+ return R.style.dialog2;
+ }
+
+ @Override
+ protected boolean canCancel() {
+ return true;
+ }
+
+ @Override
+ protected void setWindowAttributes(Window window) {
+ WindowManager.LayoutParams params = window.getAttributes();
+ params.width = ActionBar.LayoutParams.MATCH_PARENT;
+ params.height = DpUtil.dp2px(400);
+ params.gravity = Gravity.BOTTOM;
+ window.setAttributes(params);
+ }
+}
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 56b118f65..193d3315a 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java
@@ -22,6 +22,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R;
+import com.yunbao.live.activity.LiveRyAnchorActivity;
import java.util.List;
@@ -69,6 +70,7 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements
robotNameSetting = (EditText) findViewById(R.id.robot_name_setting);
automaticGreetingNumber = (AppCompatTextView) findViewById(R.id.automatic_greeting_number);
automaticMessageNumber = (AppCompatTextView) findViewById(R.id.automatic_message_number);
+ findViewById(R.id.automatic_message_sending).setOnClickListener(this);
robotNameSetting.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -142,7 +144,14 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements
@Override
public void onClick(View v) {
- dismiss();
+ int viewID = v.getId();
+ if (viewID == R.id.automatic_message_sending) {
+ Bundle mArguments = new Bundle();
+ LiveRobotMessageDialogFragment fragment = new LiveRobotMessageDialogFragment();
+ fragment.setArguments(mArguments);
+ fragment.show(getChildFragmentManager(), "LiveRobotMessageDialogFragment");
+ }
+
}
diff --git a/live/src/main/res/drawable/background_81c16d.xml b/live/src/main/res/drawable/background_81c16d.xml
new file mode 100644
index 000000000..c089906d7
--- /dev/null
+++ b/live/src/main/res/drawable/background_81c16d.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_live_robot_message.xml b/live/src/main/res/layout/dialog_live_robot_message.xml
new file mode 100644
index 000000000..570cce7b2
--- /dev/null
+++ b/live/src/main/res/layout/dialog_live_robot_message.xml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_live_robot_setting.xml b/live/src/main/res/layout/dialog_live_robot_setting.xml
index 1f1a2bd77..43ed93407 100644
--- a/live/src/main/res/layout/dialog_live_robot_setting.xml
+++ b/live/src/main/res/layout/dialog_live_robot_setting.xml
@@ -204,6 +204,7 @@