From e3a9a037bac1ca1493366d8fe16a3743cf1e86c2 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Fri, 23 Dec 2022 11:16:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/bean/LiveAiRobotBean.java | 12 +- .../com/yunbao/common/http/PDLiveApi.java | 11 +- .../common/http/live/LiveNetManager.java | 6 +- .../common/views/CustomDrawerPopupView.java | 3 +- .../src/main/res/drawable/bg_robot_shape.xml | 10 + common/src/main/res/drawable/icon_robot.png | Bin 0 -> 3840 bytes .../main/res/layout/custom_drawer_popup.xml | 2 +- .../src/main/res/mipmap-xxhdpi/icon_robot.png | Bin 0 -> 3840 bytes .../src/main/res/mipmap-xxhdpi/icon_tip.png | Bin 0 -> 2865 bytes common/src/main/res/values/strings.xml | 10 + .../LiveRobotSettingDialogFragment.java | 69 ++++-- .../live/views/LiveNewReadyRyViewHolder.java | 29 ++- .../res/layout/dialog_live_robot_setting.xml | 222 ++++++++++++++++-- .../main/res/layout/view_new_live_ready.xml | 20 +- .../yunbao/main/views/MainHomeViewHolder.java | 3 +- 15 files changed, 329 insertions(+), 68 deletions(-) create mode 100644 common/src/main/res/drawable/bg_robot_shape.xml create mode 100644 common/src/main/res/drawable/icon_robot.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_robot.png create mode 100644 common/src/main/res/mipmap-xxhdpi/icon_tip.png diff --git a/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java b/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java index 44e8b9f95..26ba27052 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveAiRobotBean.java +++ b/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; } 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 576df8487..91d73d34c 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/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> setAnchorAiState( - @Query("name") String name, - @Query("value") String value + Observable> setAnchorAiState( + @QueryMap Map map ); /** 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 4e6e91a91..41a7dce15 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 @@ -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 callback) { + Map map = new HashMap<>(); + map.put(name, value); API.get().pdLiveApi(mContext) - .setAnchorAiState(name, value) + .setAnchorAiState(map) .subscribeOn(Schedulers.io()) .subscribe(responseModel -> { if (callback != null) { diff --git a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java b/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java index e111905c0..ab2199dbd 100644 --- a/common/src/main/java/com/yunbao/common/views/CustomDrawerPopupView.java +++ b/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(); + } diff --git a/common/src/main/res/drawable/bg_robot_shape.xml b/common/src/main/res/drawable/bg_robot_shape.xml new file mode 100644 index 000000000..24885134c --- /dev/null +++ b/common/src/main/res/drawable/bg_robot_shape.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/drawable/icon_robot.png b/common/src/main/res/drawable/icon_robot.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0d8b45742845e5feb171de6fdc89c4d01f3184 GIT binary patch literal 3840 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 P00000NkvXXu0mjf`4(B; literal 0 HcmV?d00001 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 2e408f8e0..aa2b8a418 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -978,4 +978,14 @@ 拒绝 坚持拒绝 随机PK提示 + + 自動發言機器人設置 + 機器人開關 + 機器人名字設置 + 字數限制2-8個字 + 自動打招呼設置 + 已配置條數 + 自動發消息設置 + 前往設置 + 感謝送禮、PK開始、PK結束的自動機器人消息，\n暫不支持自定義。 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 6f413f971..56b118f65 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveRobotSettingDialogFragment.java @@ -4,19 +4,25 @@ import android.app.ActionBar; import android.os.Bundle; import android.util.Log; import android.view.Gravity; +import android.view.KeyEvent; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.view.inputmethod.EditorInfo; +import android.widget.EditText; +import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; + +import com.yunbao.common.bean.HttpCallbackModel; import com.yunbao.common.bean.LiveAiRobotBean; import com.yunbao.common.dialog.AbsDialogFragment; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; -import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.ToastUtil; import com.yunbao.live.R; -import androidx.annotation.Nullable; - import java.util.List; /** @@ -25,6 +31,8 @@ import java.util.List; public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements View.OnClickListener { private static String TAG = "AI机器人"; + private EditText robotNameSetting; + private AppCompatTextView automaticGreetingNumber, automaticMessageNumber; @Override protected int getLayoutId() { @@ -45,7 +53,7 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements protected void setWindowAttributes(Window window) { WindowManager.LayoutParams params = window.getAttributes(); params.width = ActionBar.LayoutParams.MATCH_PARENT; - params.height = DpUtil.dp2px(460); + params.height = ActionBar.LayoutParams.WRAP_CONTENT; params.gravity = Gravity.BOTTOM; window.setAttributes(params); } @@ -53,23 +61,44 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); + intiView(); initDate(); } + private void intiView() { + robotNameSetting = (EditText) findViewById(R.id.robot_name_setting); + automaticGreetingNumber = (AppCompatTextView) findViewById(R.id.automatic_greeting_number); + automaticMessageNumber = (AppCompatTextView) findViewById(R.id.automatic_message_number); + robotNameSetting.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_DONE) { + // 修改助手名字 + LiveNetManager.get(mContext) + .setAiRobotDate("ai_name", robotNameSetting.getText().toString(), new HttpCallback() { + @Override + public void onSuccess(HttpCallbackModel data) { + + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + + } + return false; + } + }); + } + private void initDate() { - LiveNetManager.get(mContext) - .getAiRobotStatus(new HttpCallback() { - @Override - public void onSuccess(LiveAiRobotBean data) { - Log.i(TAG, "onSuccess: " + data.toString()); - initListType1(); - } - - @Override - public void onError(String error) { - - } - }); + robotNameSetting.setText(getArguments().getString("Name", "1")); + automaticGreetingNumber.setText(getArguments().getString("AutoSeyHiNumber", "1")); + automaticMessageNumber.setText(getArguments().getString("AutoRequestFollowNumber", "1")); + initListType1(); + initListType2(); } private void initListType1() { @@ -77,11 +106,12 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements .getAiRobotBody(LiveAiRobotBean.Message.TYPE_SAY_HI, new HttpCallback>() { @Override public void onSuccess(List data) { - Log.i(TAG, "onSuccess: " + data.size()); + Log.i(TAG, "onSuccess 自动打招呼 : " + data.size()); for (LiveAiRobotBean.Message message : data) { Log.i(TAG, "onSuccess: message=" + message.toString()); } - initListType2(); + + } @Override @@ -100,6 +130,7 @@ public class LiveRobotSettingDialogFragment extends AbsDialogFragment implements for (LiveAiRobotBean.Message message : data) { Log.i(TAG, "onSuccess: message=" + message.toString()); } + } @Override diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index ecdbdcd42..032294d3f 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -2,7 +2,6 @@ package com.yunbao.live.views; import android.app.Dialog; import android.content.Context; -import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; @@ -19,11 +18,12 @@ import androidx.core.content.ContextCompat; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.Constants; +import com.yunbao.common.bean.LiveAiRobotBean; import com.yunbao.common.bean.LiveClassBean; import com.yunbao.common.bean.UserBean; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; -import com.yunbao.common.interfaces.ActivityResultCallback; +import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.CommonCallback; import com.yunbao.common.interfaces.ImageResultCallback; import com.yunbao.common.utils.DialogUitl; @@ -35,7 +35,6 @@ import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.faceunity.FaceManager; import com.yunbao.live.R; -import com.yunbao.live.activity.Beauty360Activity3; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; import com.yunbao.live.bean.LiveRoomTypeBean; @@ -43,6 +42,7 @@ import com.yunbao.live.dialog.LiveFaceUnityDialogFragment; import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment; import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment; import com.yunbao.live.dialog.LiveNewWishListDialogFragment; +import com.yunbao.live.dialog.LiveRobotSettingDialogFragment; import com.yunbao.live.dialog.LiveTimeDialogFragment; import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; @@ -160,6 +160,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl findViewById(R.id.btn_live_class).setOnClickListener(this); findViewById(R.id.btn_close).setOnClickListener(this); findViewById(R.id.btn_beauty).setOnClickListener(this); + findViewById(R.id.btn_robot).setOnClickListener(this); findViewById(R.id.btn_start_live).setOnClickListener(this); findViewById(R.id.btn_wishlist).setOnClickListener(this); findViewById(R.id.btn_horizontally).setOnClickListener(this); @@ -218,6 +219,28 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl } else if (i == R.id.btn_horizontally) { RCRTCCameraOutputStream cameraStream = RCRTCEngine.getInstance().getDefaultVideoStream(); cameraStream.setPreviewMirror(!cameraStream.isPreviewMirror()); + } else if (i == R.id.btn_robot) { + if (mContext instanceof LiveRyAnchorActivity) { + LiveNetManager.get(mContext) + .getAiRobotStatus(new com.yunbao.common.http.base.HttpCallback() { + @Override + public void onSuccess(LiveAiRobotBean data) { + Bundle mArguments = new Bundle(); + mArguments.putString("Name", data.getName()); + mArguments.putString("AutoSeyHiNumber", data.getAutoSeyHiNumber()); + mArguments.putString("AutoRequestFollowNumber", data.getAutoRequestFollowNumber()); + LiveRobotSettingDialogFragment fragment = new LiveRobotSettingDialogFragment(); + fragment.setArguments(mArguments); + fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveRobotSettingDialogFragment"); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + + } } } 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 8d8001e4a..1f1a2bd77 100644 --- a/live/src/main/res/layout/dialog_live_robot_setting.xml +++ b/live/src/main/res/layout/dialog_live_robot_setting.xml @@ -1,10 +1,10 @@ - + android:layout_height="wrap_content" + android:background="#000" + android:paddingBottom="23dp"> @@ -22,18 +23,19 @@ android:id="@+id/robot_status" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_below="@id/textView6" android:layout_marginTop="18dp" - android:orientation="horizontal" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView6"> + android:orientation="horizontal"> - + android:text="@string/robot_switch" + android:textColor="#FFF" + android:textSize="15sp" /> + android:layout_below="@+id/robot_status" + android:layout_marginTop="20dp" + android:orientation="horizontal"> - + android:orientation="vertical"> - + + + + + + + android:imeOptions="actionDone" + android:inputType="text" + android:maxLines="1" + android:textColor="#FFF" + android:textSize="12sp" /> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/view_new_live_ready.xml b/live/src/main/res/layout/view_new_live_ready.xml index 9d2a0de5d..98af6cebf 100644 --- a/live/src/main/res/layout/view_new_live_ready.xml +++ b/live/src/main/res/layout/view_new_live_ready.xml @@ -1,8 +1,6 @@ - @@ -254,13 +252,23 @@ android:id="@+id/faceTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#FFFFFF" - android:visibility="gone" - android:textSize="16sp" android:text="" + android:textColor="#FFFFFF" + android:textSize="16sp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 3517a8fbd..ce721b3f9 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -40,8 +40,7 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy); img_trophy.setOnClickListener(v -> { - LiveRobotSettingDialogFragment fragment=new LiveRobotSettingDialogFragment(); - fragment.show(((MainActivity)mContext).getSupportFragmentManager(),"LiveRobotSettingDialogFragment"); + }); }