1 修复pop控件在安卓6.0以下点击空白区域,无法消失的问题

YangShuai
1 parent afd7573c
Showing 11 changed files with 74 additions and 11 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/MainActivity.java
app/src/main/java/com/cnlive/strike/xiaojiaspeaker/ToolBarTestActivity.java
app/src/main/res/layout/activity_tool_bar_test.xml
app/src/main/res/values/strings.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/AllDeviceFragmentView.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/adapter/AllDeviceAdapter.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/fragment/AllDeviceFragment.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/widget/popmenu/PopMenu.java
module_xiaojiaSoundBox/src/main/res/layout/fragment_search_device.xml
 apply plugin: 'com.android.application'
+
 static def stringValue(def value) {
     return "\"${value}\""
 }
+
 android {
     compileSdkVersion 28
     defaultConfig {
@@ -61,6 +63,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     implementation project(path: ':module_xiaojiaSoundBox')
     implementation "com.android.support:support-v4:$rootProject.supportV4"
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cnlive.strike.speaker">
-
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -11,6 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name="com.cnlive.strike.xiaojiaspeaker.ToolBarTestActivity"></activity>
         <activity android:name="com.cnlive.strike.xiaojiaspeaker.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -13,6 +13,7 @@ import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceInstructionActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.DeviceManagerActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.FirmwareUpdateActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SearchDeviceActivity;
+import com.cnlive.strike.xiaojiaspeaker.ui.activity.SelectWifiActivity;
 import com.cnlive.strike.xiaojiaspeaker.ui.activity.SpeakerMainActivity;
 public class MainActivity extends AppCompatActivity {
@@ -21,7 +22,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_speaker_main);
-//        startActivity(new Intent(MainActivity.this, SpeakerMainActivity.class));
+//        startActivity(new Intent(MainActivity.this, ToolBarTestActivity.class));
 //        startActivity(new Intent(MainActivity.this, BluetoothConnActivity.class));
 //        startActivity(new Intent(MainActivity.this, BlueToothStep1Activity.class));
 //            startActivity(new Intent(MainActivity.this, ConnBluetoothSuccessActivity.class));
@@ -29,6 +30,8 @@ public class MainActivity extends AppCompatActivity {
 //        startActivity(new Intent(MainActivity.this, DeviceInstructionActivity.class));
 //        startActivity(new Intent(MainActivity.this, DeviceManagerActivity.class));
 //        startActivity(new Intent(MainActivity.this, FirmwareUpdateActivity.class));
+//                startActivity(new Intent(MainActivity.this, SelectWifiActivity.class));
+
         finish();
     }
+package com.cnlive.strike.xiaojiaspeaker;
+
+import android.databinding.DataBindingUtil;
+import android.support.design.widget.AppBarLayout;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.cnlive.strike.speaker.R;
+import com.cnlive.strike.speaker.databinding.ActivityToolBarTestBinding;
+
+public class ToolBarTestActivity extends AppCompatActivity {
+    private ActivityToolBarTestBinding binding;
+    private String TAG = "ToolBarTestActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_tool_bar_test);
+    }
+}
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context="com.cnlive.strike.xiaojiaspeaker.ToolBarTestActivity"
+        tools:ignore="MissingDefaultResource">
+
+        <android.support.design.chip.Chip
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="text" />
+
+    </android.support.design.widget.CoordinatorLayout>
+</layout>
 \ No newline at end of file
 <resources>
-<!--    <string name="app_name">XiaoJiaSpeaker</string>-->
+    <!--    <string name="app_name">XiaoJiaSpeaker</string>-->
 </resources>
@@ -2,8 +2,11 @@ package com.cnlive.strike.xiaojiaspeaker.frame.view;
 import android.app.Activity;
 import android.graphics.Color;
+import android.support.design.widget.BottomSheetBehavior;
+import android.support.design.widget.BottomSheetDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import com.cnlive.strike.xiaojiaspeaker.R;
@@ -59,6 +62,18 @@ public class AllDeviceFragmentView implements MvpView {
     }
     public void initPopView() {
+//        View contentView = LayoutInflater.from(getContext())
+//                .inflate(R.layout.activity_all_device, null);
+//        BottomSheetDialog dialog = new BottomSheetDialog(getContext());
+//        dialog.setContentView(contentView);
+//        dialog.setCancelable(false);
+//        BottomSheetBehavior sheetBehavior = BottomSheetBehavior.from((View) contentView.getParent());
+//        sheetBehavior.setPeekHeight(200);
+        //给布局设置透明背景色，让图片突出来
+//        bottomSheetDialog.getDelegate().findViewById(android.support.design.R.id.design_bottom_sheet)
+//                .setBackgroundColor(getResources().getColor(android.R.color.transparent));
+//        dialog.show();
+
         popMenuInfoList = new ArrayList<>();
         PopMenuInfo popMenuInfo = new PopMenuInfo();
         popMenuInfo.setTitle("使用者管理");
@@ -84,7 +99,7 @@ public class AllDeviceFragmentView implements MvpView {
                     .setLineVisible(View.VISIBLE)
 //                .setArrowHeight(30f)
 //                .setArrowHeight(30f)
-                    //.setCancelable(false)
+                    .setCancelable(false)
                     .setCornerRadius(10f)
                     .build();
         }
@@ -93,12 +93,10 @@ public class AllDeviceAdapter extends RecyclerView.Adapter {
                 if (null != onItemClickListener) {
                     onItemClickListener.onItemClick(getAdapterPosition(), allDeviceInfos.get(getAdapterPosition()));
                 }
-                Log.e(TAG, "onClick: " + getAdapterPosition());
             } else if (R.id.ll_add == view.getId()) {
                 if (null != onAddClickListener) {
                     onAddClickListener.onAddClick();
                 }
-                Log.e(TAG, "onAddClickListener: " + getAdapterPosition());
             }
         }
     }
@@ -24,7 +24,6 @@ import java.util.List;
 public class AllDeviceFragment extends MvpBindingFragment<AllDeviceFragmentView, AllDeviceFragmentPresenter, Object, FragmentAllDeviceBinding> {
     private UIPopup qmuiPopup;
     private QMUIAlphaImageButton addButton;
-    ;
     public static AllDeviceFragment newInstance() {
         AllDeviceFragment fragment = new AllDeviceFragment();
@@ -7,11 +7,13 @@ import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.RectF;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DimenRes;
 import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
@@ -84,8 +86,8 @@ public final class PopMenu {
         mScreenHeightPixels = dm.heightPixels;
         mScreenWidthPixels = dm.widthPixels;
         mPopupWindow = new PopupWindow(builder.mContext);
-        mPopupWindow.setBackgroundDrawable(null);
-        mPopupWindow.setClippingEnabled(false);
+//        mPopupWindow.setBackgroundDrawable(null);
+        mPopupWindow.setBackgroundDrawable(new BitmapDrawable());//必须这么设置,要不安卓6.0以后,点击空白区域,无法消失
         mPopupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
         mPopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
         mPopupWindow.setContentView(getContentView(builder));
@@ -182,6 +184,7 @@ public final class PopMenu {
     }
     public void show(final View anchorView) {
+
         if (!isShowing()) {
             // 是否设置设置背景颜色变暗
             if (builder.isShowDarkenBackground) {
@@ -202,6 +205,8 @@ public final class PopMenu {
                     mPopupWindow.showAtLocation(mAnchorView, 0, 0, 0);
                 }
             });
+        } else {
+            mPopupWindow.dismiss();
         }
     }
@@ -25,6 +25,7 @@
                     android:id="@+id/rvBlueTooth"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:overScrollMode="never"
                     android:paddingTop="10dp" />
                 <!--                loading视图-->
                 <LinearLayout
@@ -49,7 +50,6 @@
                     android:id="@+id/ll_retry"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:background="@color/white"
                     android:gravity="center"
                     android:orientation="vertical"
                     android:visibility="gone">