From c2d268744105f0a8d8ade91ed97f1fe9b070e132 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 22 Oct 2022 10:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/views/floatingview/APPEasyFloat.java |  3 +++
 .../common/views/floatingview/MagnetViewListener.java  |  2 ++
 .../com/yunbao/common/views/weight/LiveFloatView.java  | 10 ++++++++--
 common/src/main/res/values-en/strings.xml              |  7 +++++++
 .../java/com/yunbao/main/activity/SettingActivity.java | 10 ++++++++++
 main/src/main/res/layout/activity_setting.xml          |  1 +
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java b/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java
index 1549e406d..1a3d49a94 100644
--- a/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java
+++ b/common/src/main/java/com/yunbao/common/views/floatingview/APPEasyFloat.java
@@ -168,5 +168,8 @@ public class APPEasyFloat implements Application.ActivityLifecycleCallbacks {
         FloatingView.get().remove();
         FloatingView.get().detach(activity);
         activity.getApplication().unregisterActivityLifecycleCallbacks(this);
+        if (magnetViewListener != null) {
+            magnetViewListener.dismiss();
+        }
     }
 }
diff --git a/common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java b/common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java
index ea41fa0eb..09ab1a287 100644
--- a/common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java
+++ b/common/src/main/java/com/yunbao/common/views/floatingview/MagnetViewListener.java
@@ -7,4 +7,6 @@ public interface MagnetViewListener {
     void invoke(FloatingMagnetView magnetView);
 
     void onRemove();
+
+    void dismiss();
 }
diff --git a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java
index 40e278042..213b8cc2e 100644
--- a/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java
+++ b/common/src/main/java/com/yunbao/common/views/weight/LiveFloatView.java
@@ -47,7 +47,7 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
         return instance;
     }
 
-    public void builderFloat(Activity mContext, String url,Class<?> back) {
+    public void builderFloat(Activity mContext, String url, Class<?> back) {
         this.mContext = mContext;
         this.url = url;
         APPEasyFloat.getInstance().layout(R.layout.view_flaot_live)
@@ -77,7 +77,13 @@ public class LiveFloatView implements Function1<FloatCallbacks.Builder, Unit> {
 
                     @Override
                     public void onRemove() {
-//                        mPlayer.stopPlay();
+//
+                    }
+
+                    @Override
+                    public void dismiss() {
+                        if (mPlayer != null)
+                            mPlayer.stopPlay();
                     }
                 })
                 .show(mContext);
diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml
index 5da7c1017..30c268445 100644
--- a/common/src/main/res/values-en/strings.xml
+++ b/common/src/main/res/values-en/strings.xml
@@ -924,4 +924,11 @@ Limited ride And limited avatar frame</string>
     <string name="do_you_like">Don\'t like the small window play?\n You can turn it off in [Personal Center] - [Settings]</string>
     <string name="to_set_up">Go to Settings</string>
     <string name="know_the">Got it</string>
+    <string name="individual_set">Personal Settings</string>
+    <string name="reward">Rewards</string>
+    <string name="change_the_password">Change password</string>
+    <string name="blacklist">Blacklist</string>
+    <string name="alerts">Message Settings</string>
+    <string name="studio_gift_effects">Blocking gift effects</string>
+    <string name="studio_ride_effects">Blocking seat effects</string>
 </resources>
diff --git a/main/src/main/java/com/yunbao/main/activity/SettingActivity.java b/main/src/main/java/com/yunbao/main/activity/SettingActivity.java
index a022b7afa..f03bc0b6e 100644
--- a/main/src/main/java/com/yunbao/main/activity/SettingActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/SettingActivity.java
@@ -38,6 +38,7 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.VersionUtil;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.SettingAdapter;
@@ -103,6 +104,14 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
                 mRecyclerView.setAdapter(mAdapter);
             }
         });
+        //跳转自己
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.individual_set), new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                RouteUtil.forwardEditProfileActivity();
+            }
+        });
+
         //黑名单
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.blacklist), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
@@ -179,6 +188,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
                 }
                 //更新特效开关
                 IMLoginManager.get(mContext).initFloat(isFloat);
+                APPEasyFloat.getInstance().dismiss(mContext);
             }
         });
         //系统悬浮窗
diff --git a/main/src/main/res/layout/activity_setting.xml b/main/src/main/res/layout/activity_setting.xml
index be37c111c..b0a349060 100644
--- a/main/src/main/res/layout/activity_setting.xml
+++ b/main/src/main/res/layout/activity_setting.xml
@@ -24,6 +24,7 @@
                 android:orientation="vertical">
 
                 <LinearLayout
+                    android:id="@+id/individual_set"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"