悬浮窗关闭

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1405,7 +1405,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             wishListLayout.setVisibility(View.GONE);
         }
         ((Activity) mContext).runOnUiThread(() -> {
-            wishListFlipper = (ViewFlipper) findViewById(R.id.wish_list);
+            wishListFlipper = (ViewFlipper) findViewById(R.id.wish_list_vf);
             for (int i = 0; i < wishlist.size(); i++) {
                 View wish = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
                 wish.setTag(wishlist.get(i).getId());

live/src/main/res/layout/view_live_room.xml

@@ -372,7 +372,7 @@
             android:src="@mipmap/live_icon_wishlist" />
 
         <ViewFlipper
-            android:id="@+id/wish_list"
+            android:id="@+id/wish_list_vf"
             android:layout_width="wrap_content"
             android:layout_height="20dp"
             android:layout_marginStart="6dp"

main/src/main/java/com/yunbao/main/activity/MainActivity.java

@@ -41,6 +41,7 @@ import com.google.firebase.messaging.FirebaseMessaging;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.jakewharton.rxbinding3.view.RxView;
+import com.lzf.easyfloat.EasyFloat;
 import com.lzf.easyfloat.interfaces.OnPermissionResult;
 import com.lzf.easyfloat.permission.PermissionUtils;
 import com.tencent.imsdk.v2.V2TIMCallback;
@@ -88,6 +89,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.VersionUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.LiveFloatView;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.activity.LiveAudienceActivity;
@@ -946,6 +948,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             if (curTime - mLastClickBackTime > 2000) {
                 mLastClickBackTime = curTime;
                 ToastUtil.show(R.string.main_click_next_exit);
+                APPEasyFloat.getInstance().dismiss(mContext);
+                //判断是否有直播悬浮窗，有直接关闭
+                if (EasyFloat.isShow("LiveFloatView")) {
+                    EasyFloat.dismiss("LiveFloatView", true);
+                }
                 return;
             }
             super.onBackPressed();

main/src/main/res/layout/view_homemain.xml

@@ -92,6 +92,12 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1">
+
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -103,6 +109,7 @@
                         android:id="@+id/v_table_redpoint"
                         android:layout_width="20dp"
                         android:layout_height="20dp"
+                        android:layout_marginEnd="5dp"
                         android:background="@drawable/background_ff5075"
                         android:gravity="center"
                         android:textColor="@color/white"