新增设置对 View 长按监听事件方法

getActivity · getActivity · commit f8dc96c8e259 · 2021-09-05T18:08:52.000+08:00
修正子 View 设置点击事件后父 View 触摸监听没有回调的问题
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 
                                  Apache License
-                           Version 2.0, January 2004
+                           Version 2.0, January 2019
                         http://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 Huang JinQun
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ allprojects {
 ```groovy
 dependencies {
     // 悬浮窗框架：https://github.com/getActivity/XToast
-    implementation 'com.github.getActivity:XToast:8.1'
+    implementation 'com.github.getActivity:XToast:8.2'
 }
 ```
 
@@ -44,7 +44,7 @@ dependencies {
 // 传入 Activity 对象表示设置成局部的，不需要有悬浮窗权限
 // 传入 Application 对象表示设置成全局的，但需要有悬浮窗权限
 new XToast<>(XToastActivity.this)
-        .setView(R.layout.toast_hint)
+        .setContentView(R.layout.toast_hint)
         // 设置成可拖拽的
         //.setDraggable()
         // 设置显示时长
@@ -74,7 +74,7 @@ new XToast<>(XToastActivity.this)
 
 ```kotlin
 XToast<XToast<*>>(activity).apply {
-    setView(R.layout.toast_hint)
+    setContentView(R.layout.toast_hint)
     // 设置成可拖拽的
     //setDraggable()
     // 设置显示时长
@@ -98,7 +98,7 @@ XToast<XToast<*>>(activity).apply {
 
 ```kotlin
 XToast<XToast<*>>(activity)
-        .setView(R.layout.toast_hint)
+        .setContentView(R.layout.toast_hint)
         // 设置成可拖拽的
         //.setDraggable()
         // 设置显示时长
@@ -190,6 +190,8 @@ public final class FloatingLifecycle implements Application.ActivityLifecycleCal
 
 * 国际化框架：[MultiLanguages](https://github.com/getActivity/MultiLanguages)
 
+* Shape 框架：[ShapeView](https://github.com/getActivity/ShapeView)
+
 * Gson 解析容错：[GsonFactory](https://github.com/getActivity/GsonFactory)
 
 * 日志查看框架：[Logcat](https://github.com/getActivity/Logcat)
diff --git a/XToast.apk b/XToast.apk
diff --git a/app/AppSignature.jks b/app/AppSignature.jks
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,20 +7,45 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 81
-        versionName "8.1"
+        versionCode 82
+        versionName "8.2"
     }
+
+    // 支持 Java JDK 8
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // Apk 签名的那些事：https://www.jianshu.com/p/a1f8e5896aa2
+    signingConfigs {
+        config {
+            storeFile file(StoreFile)
+            storePassword StorePassword
+            keyAlias KeyAlias
+            keyPassword KeyPassword
+        }
+    }
+
     buildTypes {
-        release {
+        debug {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.config
+        }
+
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.config
         }
     }
 
-    // 支持 Java JDK 8
-    compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
+    applicationVariants.all { variant ->
+        // apk 输出文件名配置
+        variant.outputs.all { output ->
+            outputFileName = rootProject.getName() + '.apk'
+        }
     }
 }
 
@@ -35,10 +60,10 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:11.6'
+    implementation 'com.github.getActivity:XXPermissions:12.2'
 
     // 标题栏框架：https://github.com/getActivity/TitleBar
-    implementation 'com.github.getActivity:TitleBar:8.6'
+    implementation 'com.github.getActivity:TitleBar:9.0'
 
     // 吐司框架：https://github.com/getActivity/ToastUtils
     implementation 'com.github.getActivity:ToastUtils:9.5'
diff --git a/app/gradle.properties b/app/gradle.properties
@@ -0,0 +1,4 @@
+StoreFile = AppSignature.jks
+StorePassword = AndroidProject
+KeyAlias = AndroidProject
+KeyPassword = AndroidProject
diff --git a/app/src/main/java/com/hjq/xtoast/demo/IOSToast.java b/app/src/main/java/com/hjq/xtoast/demo/IOSToast.java
@@ -17,7 +17,7 @@ public final class IOSToast {
     public static void showSucceed(Activity activity, CharSequence text) {
         new XToast<>(activity)
                 .setDuration(TIME)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setText(android.R.id.message, text)
@@ -27,7 +27,7 @@ public static void showSucceed(Activity activity, CharSequence text) {
     public static void showFail(Activity activity, CharSequence text) {
         new XToast<>(activity)
                 .setDuration(TIME)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Activity)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_error)
                 .setText(android.R.id.message, text)
@@ -37,7 +37,7 @@ public static void showFail(Activity activity, CharSequence text) {
     public static void showWarn(Activity activity, CharSequence text) {
         new XToast<>(activity)
                 .setDuration(TIME)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Dialog)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_warning)
                 .setText(android.R.id.message, text)
diff --git a/app/src/main/java/com/hjq/xtoast/demo/MainActivity.java b/app/src/main/java/com/hjq/xtoast/demo/MainActivity.java
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
     public void show1(View v) {
         new XToast<>(this)
                 .setDuration(3000)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setText(android.R.id.message, "这个动画是不是很骚")
@@ -46,7 +46,7 @@ public void show1(View v) {
     public void show2(View v) {
         new XToast<>(this)
                 .setDuration(1000)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Activity)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_error)
                 .setText(android.R.id.message, "一秒后消失")
@@ -56,7 +56,7 @@ public void show2(View v) {
     public void show3(View v) {
         new XToast<>(this)
                 .setDuration(3000)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Dialog)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_warning)
                 .setText(android.R.id.message, "是不是感觉很牛逼")
@@ -77,7 +77,7 @@ public void onDismiss(XToast<?> toast) {
 
     public void show4(View v) {
         new XToast<>(this)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setText(android.R.id.message, "点我点我点我")
@@ -99,7 +99,7 @@ public void run() {
 
     public void show5(View v) {
         new XToast<>(this)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setDuration(2000)
@@ -116,7 +116,7 @@ public void onClick(final XToast<?> toast, TextView view) {
 
     public void show6(View v) {
         new XToast<>(this)
-                .setView(R.layout.toast_hint)
+                .setContentView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setText(android.R.id.message, "点我消失")
@@ -145,7 +145,7 @@ public void show7(View v) {
                     public void onGranted(List<String> granted, boolean all) {
                         // 传入 Application 表示这个是一个全局的 Toast
                         new XToast<>(getApplication())
-                                .setView(R.layout.toast_phone)
+                                .setContentView(R.layout.toast_phone)
                                 .setGravity(Gravity.END | Gravity.BOTTOM)
                                 .setYOffset(200)
                                 // 设置指定的拖拽规则
@@ -163,14 +163,21 @@ public void onClick(XToast<?> toast, ImageView view) {
                                         // https://developer.android.google.cn/about/versions/10/privacy/changes#background-activity-starts
                                     }
                                 })
+                                .setOnLongClickListener(android.R.id.icon, new XToast.OnLongClickListener<View>() {
+                                    @Override
+                                    public boolean onLongClick(XToast<?> toast, View view) {
+                                        ToastUtils.show("我被长按了");
+                                        return true;
+                                    }
+                                })
                                 .show();
                     }
 
                     @Override
                     public void onDenied(List<String> denied, boolean never) {
                         new XToast<>(MainActivity.this)
                                 .setDuration(1000)
-                                .setView(R.layout.toast_hint)
+                                .setContentView(R.layout.toast_hint)
                                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_error)
                                 .setText(android.R.id.message, "请先授予悬浮窗权限")
                                 .show();
@@ -182,7 +189,7 @@ public void show8(View v) {
         // 将 ToastUtils 中的 View 转移给 XToast 来显示
         new XToast<>(this)
                 .setDuration(1000)
-                .setView(ToastUtils.getStyle().createView(this))
+                .setContentView(ToastUtils.getStyle().createView(this))
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setText(android.R.id.message, "就问你溜不溜")
                 .setGravity(Gravity.BOTTOM)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
     <com.hjq.bar.TitleBar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:backButton="false"
+        app:leftIcon="@null"
         app:title="https://github.com/getActivity/XToast" />
 
     <ScrollView
diff --git a/app/src/main/res/layout/toast_hint.xml b/app/src/main/res/layout/toast_hint.xml
@@ -4,9 +4,9 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_margin="100dp"
     android:background="@drawable/dialog_toast_bg"
     android:gravity="center"
+    android:layout_margin="100dp"
     android:minWidth="120dp"
     android:minHeight="120dp"
     android:orientation="vertical">
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,9 @@ allprojects {
         // noinspection JcenterRepositoryObsolete
         jcenter()
     }
+
+    // 将构建文件统一输出到项目根目录下的 build 文件夹
+    setBuildDir(new File(rootDir, "build/${path.replaceAll(':', '/')}"))
 }
 
 task clean(type: Delete) {
diff --git a/library/build.gradle b/library/build.gradle
@@ -5,18 +5,26 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 81
-        versionName "8.1"
+        versionCode 82
+        versionName "8.2"
     }
 
     android.libraryVariants.all { variant ->
         // aar 输出文件名配置
         variant.outputs.all { output ->
-            outputFileName = "xtoast-${android.defaultConfig.versionName}.aar"
+            outputFileName = "${rootProject.name}-${android.defaultConfig.versionName}.aar"
         }
     }
 }
 
+afterEvaluate {
+    // 排除 BuildConfig.class 和 R.class
+    generateReleaseBuildConfig.enabled = false
+    generateDebugBuildConfig.enabled = false
+    generateReleaseResValues.enabled = false
+    generateDebugResValues.enabled = false
+}
+
 tasks.withType(Javadoc) {
     options.addStringOption('Xdoclint:none', '-quiet')
     options.addStringOption('encoding', 'UTF-8')
diff --git a/library/src/main/java/com/hjq/xtoast/ViewClickWrapper.java b/library/src/main/java/com/hjq/xtoast/ViewClickWrapper.java
@@ -22,6 +22,9 @@ final class ViewClickWrapper implements View.OnClickListener {
     @SuppressWarnings("unchecked")
     @Override
     public final void onClick(View view) {
+        if (mListener == null) {
+            return;
+        }
         mListener.onClick(mToast, view);
     }
 }
diff --git a/library/src/main/java/com/hjq/xtoast/ViewLongClickWrapper.java b/library/src/main/java/com/hjq/xtoast/ViewLongClickWrapper.java
@@ -0,0 +1,30 @@
+package com.hjq.xtoast;
+
+import android.view.View;
+
+/**
+ *    author : Android 轮子哥
+ *    github : https://github.com/getActivity/XToast
+ *    time   : 2021/09/03
+ *    desc   : {@link View.OnLongClickListener} 包装类
+ */
+@SuppressWarnings("rawtypes")
+final class ViewLongClickWrapper implements View.OnLongClickListener {
+
+    private final XToast<?> mToast;
+    private final XToast.OnLongClickListener mListener;
+
+    ViewLongClickWrapper(XToast<?> toast, XToast.OnLongClickListener listener) {
+        mToast = toast;
+        mListener = listener;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final boolean onLongClick(View view) {
+        if (mListener == null) {
+            return false;
+        }
+        return mListener.onLongClick(mToast, view);
+    }
+}
diff --git a/library/src/main/java/com/hjq/xtoast/ViewTouchWrapper.java b/library/src/main/java/com/hjq/xtoast/ViewTouchWrapper.java
@@ -25,6 +25,9 @@ final class ViewTouchWrapper implements View.OnTouchListener {
     @SuppressWarnings("unchecked")
     @Override
     public boolean onTouch(View view, MotionEvent event) {
+        if (mListener == null) {
+            return false;
+        }
         return mListener.onTouch(mToast, view, event);
     }
 }
diff --git a/library/src/main/java/com/hjq/xtoast/WindowLayout.java b/library/src/main/java/com/hjq/xtoast/WindowLayout.java
diff --git a/library/src/main/java/com/hjq/xtoast/XToast.java b/library/src/main/java/com/hjq/xtoast/XToast.java
diff --git a/library/src/main/java/com/hjq/xtoast/draggable/BaseDraggable.java b/library/src/main/java/com/hjq/xtoast/draggable/BaseDraggable.java
