From d1e95dd56fa68d1c452d5df4bdff816b1150bbd9 Mon Sep 17 00:00:00 2001
From: YeChao <yechao@banklaw.cn>
Date: Tue, 25 May 2021 14:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            | 18 +-------------
 .idea/misc.xml                                |  2 +-
 .idea/modules.xml                             | 12 ++++------
 .idea/runConfigurations.xml                   |  1 +
 README.md                                     | 18 +++++++++-----
 .../main/java/com/yechaoa/app/MainActivity.kt | 24 ++++++++++++++-----
 app/src/main/res/layout/activity_main.xml     |  6 +++++
 .../java/com/yechaoa/yutils/ToastUtil.java    |  9 +++----
 .../main/java/com/yechaoa/yutils/YUtils.java  |  6 ++++-
 .../java/com/yechaoa/yutilskt/ToastExt.kt     | 14 +++++++++++
 .../java/com/yechaoa/yutilskt/ToastUtil.kt    | 15 ++++++------
 .../main/java/com/yechaoa/yutilskt/YUtils.kt  |  9 +++++--
 12 files changed, 82 insertions(+), 52 deletions(-)
 create mode 100644 yutilskt/src/main/java/com/yechaoa/yutilskt/ToastExt.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0da921d..1a3b5b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -39,7 +39,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c2279c4..1b149f6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,14 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AndroidProject-YUtils.iml" filepath="$PROJECT_DIR$/.idea/modules/AndroidProject-YUtils.iml" group="YUtils" />
-      <module fileurl="file://$PROJECT_DIR$/YUtils.iml" filepath="$PROJECT_DIR$/YUtils.iml" group="YUtils" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/YUtils-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/YUtils-app.iml" group="YUtils/app" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutils/YUtils-yutils.iml" filepath="$PROJECT_DIR$/.idea/modules/yutils/YUtils-yutils.iml" group="YUtils/yutils" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutilskt/YUtils-yutilskt.iml" filepath="$PROJECT_DIR$/.idea/modules/yutilskt/YUtils-yutilskt.iml" group="YUtils/yutilskt" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="YUtils/app" />
-      <module fileurl="file://$PROJECT_DIR$/yutils/yutils.iml" filepath="$PROJECT_DIR$/yutils/yutils.iml" group="YUtils/yutils" />
-      <module fileurl="file://$PROJECT_DIR$/yutilskt/yutilskt.iml" filepath="$PROJECT_DIR$/yutilskt/yutilskt.iml" group="YUtils/yutilskt" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/YUtils.iml" filepath="$PROJECT_DIR$/.idea/modules/YUtils.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/YUtils.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/YUtils.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutils/YUtils.yutils.iml" filepath="$PROJECT_DIR$/.idea/modules/yutils/YUtils.yutils.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/yutilskt/YUtils.yutilskt.iml" filepath="$PROJECT_DIR$/.idea/modules/yutilskt/YUtils.yutilskt.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/README.md b/README.md
index 7d9472b..174dd10 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 ![](https://img.shields.io/badge/language-Java%20&%20kotlin-orange.svg)
 ![](https://img.shields.io/hexpm/l/plug.svg)
 
-最近更新 2021.01.26
+最近更新 2021.05.25
 
 ### How to use
 
@@ -22,13 +22,13 @@ allprojects {
 ```
 dependencies {
     //kotlin 版本
-    implementation 'com.github.yechaoa.YUtils:yutilskt:3.2.0'
+    implementation 'com.github.yechaoa.YUtils:yutilskt:3.2.1'
 
     //java 版本
-    implementation 'com.github.yechaoa.YUtils:yutils:3.2.0'
+    implementation 'com.github.yechaoa.YUtils:yutils:3.2.1'
 
     //kotlin && java 版本
-    implementation 'com.github.yechaoa:YUtils:3.2.0'
+    implementation 'com.github.yechaoa:YUtils:3.2.1'
 }
 ```
 
@@ -50,7 +50,9 @@ LogUtil.setIsLog(true);
 
 * void init(Application app)<br>Application 中初始化
 
-* Application getApp()<br>获取全局上下文
+* Application getApp()<br>获取Application
+
+* Context getAppContext()<br>获取全局上下文
 
 * void showLoading(Activity activity,String msg)<br>Loading加载框
 
@@ -85,7 +87,11 @@ LogUtil.setIsLog(true);
 * void showCenter(final String msg)<br>showCenter 居中显示
 
 * void cancel()<br>取消Toast，onDestroy时调用，或onPause，当前页面finish之后在下一个页面不会再显示
- 
+
+> kotlin分支中添加了一个Toast扩展，比之前使用更加简单方便，调用示例：
+> "111".show() -> 111
+> 111.show() -> 111
+> 111.show("222") -> 222
  
 > ## 3.LogUtil（日志打印，带方法行数链接，可超长打印）
 
diff --git a/app/src/main/java/com/yechaoa/app/MainActivity.kt b/app/src/main/java/com/yechaoa/app/MainActivity.kt
index b7f5952..53d9b21 100644
--- a/app/src/main/java/com/yechaoa/app/MainActivity.kt
+++ b/app/src/main/java/com/yechaoa/app/MainActivity.kt
@@ -1,15 +1,19 @@
 package com.yechaoa.app
 
+import android.os.Build
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import android.os.Looper
 import android.widget.TextView
-import com.google.android.material.snackbar.Snackbar
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import com.yechaoa.yutilskt.*
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlin.concurrent.thread
 
 
 class MainActivity : AppCompatActivity() {
 
+    @RequiresApi(Build.VERSION_CODES.M)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -31,7 +35,6 @@ class MainActivity : AppCompatActivity() {
 
         button.setOnClickListener {
             SpUtil.setStringSet("testStringSet", set)
-            //SpUtil.getBoolean("111",true)
         }
 
         button2.setOnClickListener {
@@ -51,9 +54,6 @@ class MainActivity : AppCompatActivity() {
             LogUtil.i("" + ActivityUtil.currentActivityName)
         }
 
-//        ActivityUtil.start(MainActivity::class.java)
-//        ActivityUtil.finish(this)
-
         btn_display.setOnClickListener {
             LogUtil.i("" + DisplayUtil.getStatusBarHeight() + "---" + DisplayUtil.getScreenHeight())
             LogUtil.i("" + DisplayUtil.getActionBarHeight() + "---" + DisplayUtil.getNavBarHeight())
@@ -62,5 +62,17 @@ class MainActivity : AppCompatActivity() {
         btn_sim.setOnClickListener {
             ToastUtil.show(if (YUtils.hasSim()) "有sim卡" else "无sim卡")
         }
+
+        btn_thread.setOnClickListener {
+            LogUtil.d("" + mainLooper.isCurrentThread)
+            LogUtil.d("" + Looper.myLooper()!!.isCurrentThread)
+            val b = mainLooper == Looper.myLooper()
+            LogUtil.d("" + b)
+            thread {
+                ToastUtil.show("213")
+            }
+
+        }
+
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b2f180f..d209eea 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -56,4 +56,10 @@
         android:layout_height="wrap_content"
         android:text="是否有sim卡" />
 
+    <Button
+        android:id="@+id/btn_thread"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="打印线程" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/yutils/src/main/java/com/yechaoa/yutils/ToastUtil.java b/yutils/src/main/java/com/yechaoa/yutils/ToastUtil.java
index d2e4136..c5c172b 100644
--- a/yutils/src/main/java/com/yechaoa/yutils/ToastUtil.java
+++ b/yutils/src/main/java/com/yechaoa/yutils/ToastUtil.java
@@ -1,6 +1,7 @@
 package com.yechaoa.yutils;
 
 import android.annotation.SuppressLint;
+import android.os.Looper;
 import android.view.Gravity;
 import android.widget.Toast;
 
@@ -23,7 +24,7 @@ public class ToastUtil {
      */
     @Deprecated
     public static void showToast(final String msg) {
-        if ("main".equals(Thread.currentThread().getName())) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createToast(msg);
         } else {
             ActivityUtil.getCurrentActivity().runOnUiThread(new Runnable() {
@@ -41,7 +42,7 @@ public void run() {
      * @param msg 需要显示的参数
      */
     public static void show(final String msg) {
-        if ("main".equals(Thread.currentThread().getName())) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createToast(msg);
         } else {
             ActivityUtil.getCurrentActivity().runOnUiThread(new Runnable() {
@@ -75,7 +76,7 @@ private static void createToast(String msg) {
      */
     @Deprecated
     public static void showCenterToast(final String msg) {
-        if ("main".equals(Thread.currentThread().getName())) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createCenterToast(msg);
         } else {
             ActivityUtil.getCurrentActivity().runOnUiThread(new Runnable() {
@@ -93,7 +94,7 @@ public void run() {
      * @param msg 需要显示的参数
      */
     public static void showCenter(final String msg) {
-        if ("main".equals(Thread.currentThread().getName())) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createCenterToast(msg);
         } else {
             ActivityUtil.getCurrentActivity().runOnUiThread(new Runnable() {
diff --git a/yutils/src/main/java/com/yechaoa/yutils/YUtils.java b/yutils/src/main/java/com/yechaoa/yutils/YUtils.java
index 5905065..9440d47 100644
--- a/yutils/src/main/java/com/yechaoa/yutils/YUtils.java
+++ b/yutils/src/main/java/com/yechaoa/yutils/YUtils.java
@@ -64,12 +64,16 @@ public static Application getApplication() {
 
     public static Application getApp() {
         if (null == mApp) {
-            throw new NullPointerException("YUtils未在Application中初始化");
+            throw new NullPointerException("YUtils is not initialized in application");
         } else {
             return mApp;
         }
     }
 
+    public static Context getAppContext() {
+        return getApp().getApplicationContext();
+    }
+
     /**
      * 获取屏幕宽度 改为DisplayUtil.getScreenWidth()
      */
diff --git a/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastExt.kt b/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastExt.kt
new file mode 100644
index 0000000..c085e7e
--- /dev/null
+++ b/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastExt.kt
@@ -0,0 +1,14 @@
+package com.yechaoa.yutilskt
+
+import android.widget.Toast
+
+/**
+ * Created by yechao on 2021/5/25.
+ * Describe : Toast 扩展
+ *  "111".show() -> 111
+ *  111.show() -> 111
+ *  111.show("222") -> 222
+ */
+fun Any.show(msg: String = this.toString(), duration: Int = Toast.LENGTH_SHORT) {
+    Toast.makeText(YUtils.getAppContext(), msg, duration).show()
+}
\ No newline at end of file
diff --git a/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastUtil.kt b/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastUtil.kt
index 70a1173..7b4a550 100644
--- a/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastUtil.kt
+++ b/yutilskt/src/main/java/com/yechaoa/yutilskt/ToastUtil.kt
@@ -1,6 +1,7 @@
 package com.yechaoa.yutilskt
 
 import android.annotation.SuppressLint
+import android.os.Looper
 import android.view.Gravity
 import android.widget.Toast
 
@@ -19,9 +20,9 @@ object ToastUtil {
      *
      * @param msg 需要显示的参数
      */
-    @Deprecated("简化调用，使用show(msg)即可", ReplaceWith("ToastUtilKt.show(msg)"))
+    @Deprecated("简化调用，使用show(msg)即可", ReplaceWith("ToastUtil.show(msg)"))
     fun showToast(msg: String) {
-        if ("main" == Thread.currentThread().name) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createToast(msg)
         } else {
             ActivityUtil.currentActivity?.runOnUiThread { createToast(msg) }
@@ -29,7 +30,7 @@ object ToastUtil {
     }
 
     fun show(msg: String) {
-        if ("main" == Thread.currentThread().name) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createToast(msg)
         } else {
             ActivityUtil.currentActivity?.runOnUiThread { createToast(msg) }
@@ -56,9 +57,9 @@ object ToastUtil {
      *
      * @param msg 需要显示的参数
      */
-    @Deprecated("简化调用，使用showCenter(msg)即可", ReplaceWith("ToastUtilKt.showCenter(msg)"))
+    @Deprecated("简化调用，使用showCenter(msg)即可", ReplaceWith("ToastUtil.showCenter(msg)"))
     fun showCenterToast(msg: String) {
-        if ("main" == Thread.currentThread().name) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createCenterToast(msg)
         } else {
             ActivityUtil.currentActivity!!.runOnUiThread { createCenterToast(msg) }
@@ -66,7 +67,7 @@ object ToastUtil {
     }
 
     fun showCenter(msg: String) {
-        if ("main" == Thread.currentThread().name) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
             createCenterToast(msg)
         } else {
             ActivityUtil.currentActivity!!.runOnUiThread { createCenterToast(msg) }
@@ -94,7 +95,7 @@ object ToastUtil {
      * onDestroy时调用，或者onPause
      * 当前页面finish之后在下一个页面不会显示
      */
-    @Deprecated("简化调用，使用cancel()即可", ReplaceWith("ToastUtilKt.cancel()"))
+    @Deprecated("简化调用，使用cancel()即可", ReplaceWith("ToastUtil.cancel()"))
     fun cancelToast() {
         toast?.cancel()
     }
diff --git a/yutilskt/src/main/java/com/yechaoa/yutilskt/YUtils.kt b/yutilskt/src/main/java/com/yechaoa/yutilskt/YUtils.kt
index bb4af7c..0970b09 100644
--- a/yutilskt/src/main/java/com/yechaoa/yutilskt/YUtils.kt
+++ b/yutilskt/src/main/java/com/yechaoa/yutilskt/YUtils.kt
@@ -54,10 +54,14 @@ object YUtils {
         if (this::mApp.isInitialized) {
             return mApp
         } else {
-            throw UninitializedPropertyAccessException("YUtils未在Application中初始化")
+            throw UninitializedPropertyAccessException("YUtils is not initialized in application")
         }
     }
 
+    fun getAppContext(): Context {
+        return getApp().applicationContext
+    }
+
     /**
      * 获取屏幕宽度
      */
@@ -235,7 +239,8 @@ object YUtils {
      * 关闭软键盘
      */
     fun closeSoftKeyboard() {
-        val inputManger = ActivityUtil.currentActivity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        val inputManger =
+            ActivityUtil.currentActivity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         inputManger.hideSoftInputFromWindow(ActivityUtil.currentActivity!!.window.decorView.windowToken, 0)
     }