[new] 优化pop base

app/build.gradle

@@ -35,4 +35,6 @@ dependencies {
 //    implementation 'com.qmai.android.sdk:widgetlib:1.1.2-SNAPSHOT'
     implementation project(path: ':tools')
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+
+
 }

app/src/main/java/com/qimai/android/widget/CommomPopActivity.kt

@@ -4,10 +4,13 @@ import android.os.Bundle
 import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.qimai.android.tools.V
+import com.qimai.android.widgetlib.popup.CommonPopWindow
 import com.qimai.android.widgetlib.popup.QmAlertDialog
 
 class CommomPopActivity : AppCompatActivity() {
-
+    var dialog: QmAlertDialog? = null
+    var i = 0L
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_commom_pop)
@@ -26,9 +29,20 @@ class CommomPopActivity : AppCompatActivity() {
 //                .build()
 //            commonPopWindow.show(findViewById(R.id.root))
 //            commonPopWindow.dimBehind(0.5f)
-//
+            i = System.currentTimeMillis()
+            "$i".V()
+//            i.hashCode().toString().V()
+            if (dialog == null) {
+                val right: (CommonPopWindow: CommonPopWindow) -> Unit = {
+                    Toast.makeText(this, "确定", Toast.LENGTH_SHORT).show()
+                    it.dismiss()
+                    "$i".V()
+//                        "---------${i.hashCode()}".V()
 
-            QmAlertDialog
+                }
+
+
+                dialog = QmAlertDialog
                     .Builder()
                     .withContext(this)
                     .withLeftButton(leftButtonText = "取消", clickListener = {
@@ -36,20 +50,30 @@ class CommomPopActivity : AppCompatActivity() {
                         it.dismiss()
 
                     })
-                .withRightButton(rightButtonText = "确定", clickListener = {
-                    Toast.makeText(this, "确定", Toast.LENGTH_SHORT).show()
-                    it.dismiss()
+                    .withRightButton(rightButtonText = "确定", clickListener = right).withRootView(
 
-                }).withRootView(
                         findViewById(R.id.root)
                     )
                     .withTitle("订单1111")
                     .withSubTitle("子标题")
+                    .withWidth(400)
                     .build()
-                .show()
+            }
+            dialog?.show()
+
 
         }
 
 
     }
+
+    fun test(b: Int): () -> Int {
+        var a = 3
+        return fun(): Int {
+            a++
+            return a + b
+        }
+    }
+
+
 }

app/src/main/java/com/qimai/android/widget/MainActivity.kt

@@ -4,15 +4,29 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
+import com.qimai.android.widgetlib.toast.HolderContext
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        HolderContext.getInstance().register {
+            MainActivity@ this
+        }
 
         findViewById<Button>(R.id.commonPop).setOnClickListener {
-            startActivity(Intent(MainActivity@ this, CommomPopActivity::class.java))
+            //            ToastUtils.getInstance().showCenter("测试测试")
+
+//            ToastUtils.getInstance().setMsgColor(Color.RED).showTaost("测试出的的")
+//
+////            startActivity(Intent(MainActivity@ this, CommomPopActivity::class.java))
+////            val loding = Loading()
+////            loding.isCancelable  =false
+////            loding.show(supportFragmentManager, "loading")
+
+            TestWindow(this, findViewById<Button>(R.id.commonPop)).build().show()
+
         }
 
         findViewById<Button>(R.id.tip).setOnClickListener {

app/src/main/java/com/qimai/android/widget/TestWindow.kt

+package com.qimai.android.widget
+
+import android.content.Context
+import android.graphics.Point
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import com.qimai.android.tools.dpTopx
+import com.qimai.android.tools.getScreenWidth
+import com.qimai.android.widgetlib.popup.AbsQMBasePopup
+
+/**
+ *   created by wangwei   ON 2019-11-06  email:wangwei_5521@163.com
+ *   @version 1.1.1
+ *   @Description
+ **/
+class TestWindow constructor(var ctx: Context, var anchor: View) : AbsQMBasePopup(ctx) {
+    override fun onShowEnd() {
+        dimBehind(0.5f)
+    }
+
+    override fun config(): WindowConfig {
+        return AbsQMBasePopup.WindowConfig().apply {
+            mContentView = LayoutInflater.from(ctx).inflate(R.layout.qm_alert_content, null)
+            mAnchorView = anchor
+            mWindowWidth = getScreenWidth(ctx) - ctx.dpTopx(30.0f)
+            mGravity = Gravity.CENTER
+        }
+    }
+
+    override fun onShowBegin(contentView: View): Point {
+        return Point(0, 0)
+    }
+
+
+}
\ No newline at end of file

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.50'
     ext.kotlin_version = '1.3.41'
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }// 阿里云镜像

fragmentcontroller/.gitignore

+/build

fragmentcontroller/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    compile "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}

fragmentcontroller/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

fragmentcontroller/src/androidTest/java/com/qmai/android/fragmentcontroller/ExampleInstrumentedTest.java

+package com.qmai.android.fragmentcontroller;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("com.qmai.android.fragmentcontroller.test", appContext.getPackageName());
+    }
+}

fragmentcontroller/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.qmai.android.fragmentcontroller" />

fragmentcontroller/src/main/java/com/qmai/android/fragmentcontroller/LifeFragment.kt

+package com.qmai.android.fragmentcontroller
+
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.fragment.app.Fragment
+
+/**
+ *   created by wangwei   ON 2019-10-29  email:wangwei_5521@163.com
+ *   @version 1.1.1
+ *   @Description
+ **/
+class LifeFragment :Fragment(){
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+    }
+
+    override fun onInflate(context: Context, attrs: AttributeSet, savedInstanceState: Bundle?) {
+        super.onInflate(context, attrs, savedInstanceState)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+    }
+
+
+}
\ No newline at end of file

fragmentcontroller/src/main/res/values/strings.xml

+<resources>
+    <string name="app_name">FragmentController</string>
+</resources>

fragmentcontroller/src/test/java/com/qmai/android/fragmentcontroller/ExampleUnitTest.java

+package com.qmai.android.fragmentcontroller;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file

settings.gradle

-include ':app', ':widgetlib', ':tools'
+include ':app', ':widgetlib', ':tools', ':fragmentcontroller'

tools/build.gradle

@@ -42,7 +42,7 @@ repositories {
 
 
 group 'com.qmai.android.tools'
-version '1.1.6-SNAPSHOT'
+version '1.1.7-SNAPSHOT'
 
 gradlePublish {
 

tools/src/main/java/com/qimai/android/tools/TimeFormat.kt

+package com.qimai.android.tools
+
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ *   created by wangwei   ON 2019-09-23  email:wangwei_5521@163.com
+ *   @version 1.1.1
+ *   @Description
+ **/
+
+
+fun formatCurrentDate(pattern: String) = getTimeFormatStr(pattern)
+
+private fun getTimeFormatStr(pattern: String, original: Any = Date()) =
+    SimpleDateFormat(pattern, Locale.getDefault()).format(original)
+        ?: ""
+
+/**获取当前年份**/
+val currentYear: Int
+    get() = Calendar.getInstance().get(Calendar.YEAR)
+
+/**获取当前月份**/
+val currentMonth
+    get() = Calendar.getInstance().get(Calendar.MONTH) + 1
+
+
+/**获取当前日**/
+val currentDay: Int
+    get() = Calendar.getInstance().get(Calendar.DATE)
+
+/**获取当前时间戳**/
+val currentTimeMillis: Long
+    get() = System.currentTimeMillis()

widgetlib/Pop.MD

+````
+class TestWindow constructor(var ctx: Context, var anchor: View) : AbsQMBasePopup(ctx) {
+    override fun onShowEnd() {
+        dimBehind(0.5f)
+    }
+
+    override fun config(): WindowConfig {
+        return AbsQMBasePopup.WindowConfig().apply {
+            mContentView = LayoutInflater.from(ctx).inflate(R.layout.qm_alert_content, null)
+            mAnchorView = anchor
+            mWindowWidth = getScreenWidth(ctx) - ctx.dpTopx(30.0f)
+            mGravity = Gravity.CENTER
+        }
+    }
+
+    override fun onShowBegin(contentView: View): Point {
+        return Point(0, 0)
+    }
+
+
+}
+
+````
+`  显示   TestWindow(this, anchorView).build().show()
+`
\ No newline at end of file

widgetlib/build.gradle

@@ -37,6 +37,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(path: ':tools')
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.github.ybq:Android-SpinKit:1.4.0'
+
 //    implementation 'com.qmai.android.tools:tools:1.1.1-SNAPSHOT'
 }
 repositories {
@@ -45,7 +47,7 @@ repositories {
 
 
 group 'com.qmai.android.sdk'
-version '1.1.12-SNAPSHOT'
+version '1.1.18-SNAPSHOT'
 
 gradlePublish {
 

widgetlib/src/main/java/com/qimai/android/widgetlib/SectionItemView.java

+package com.qimai.android.widgetlib;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+/**
+ * created by wangwei   ON 2019-11-04  email:wangwei_5521@163.com
+ *
+ * @version 1.1.1
+ * @Description
+ **/
+public class SectionItemView extends RelativeLayout {
+
+    public static final int TYPE_ARROW = 0;
+    public static final int TYPE_CHECK = 1;
+    public static final int TYPE_RADIO = 2;
+
+
+    public SectionItemView(Context context) {
+        this(context, null);
+    }
+
+    public SectionItemView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SectionItemView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        TypedArray a = context.getTheme().obtainStyledAttributes(
+                /** layout 布局配置**/
+                attrs,
+                R.styleable.SectionItemView,
+                /** 通过attr 设置**/
+                defStyleAttr,
+                /** 默认样式 **/
+                0
+        );
+
+        int type = a.getInteger(R.styleable.SectionItemView_type, 0);
+        switch (type) {
+            case TYPE_ARROW: {
+
+            }
+            case TYPE_CHECK: {
+
+            }
+            case TYPE_RADIO: {
+
+            }
+        }
+
+
+        a.recycle();
+    }
+
+
+}

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/AbsQMBasePopup.kt

+package com.qimai.android.widgetlib.popup
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Point
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.view.*
+import android.widget.FrameLayout
+import android.widget.PopupWindow
+
+/**
+ *   created by wangwei   ON 2019-08-22  email:wangwei_5521@163.com
+ *   @version 1.1.1
+ *   @Description
+ **/
+abstract class AbsQMBasePopup(open var context: Context) {
+
+
+    private var mWindow = PopupWindow()
+
+    private lateinit var mRootViewWrapper: FrameLayout
+    private lateinit var mWindowManager: WindowManager
+
+
+    protected open var mDismissListener: PopupWindow.OnDismissListener? = null
+
+    abstract fun config(): WindowConfig
+
+    var touchOutside = true
+        set(value) {
+            field = value
+            mWindow.isOutsideTouchable = value
+        }
+
+
+    fun isShowing(): Boolean {
+        return mWindow.isShowing
+    }
+
+
+    fun build(): AbsQMBasePopup {
+        val config = config()
+        setContentView(contentView = config.mContentView)
+
+        mWindow.width = config.mWindowWidth
+        mWindow.height = ViewGroup.LayoutParams.WRAP_CONTENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+            mWindow.isAttachedInDecor = false
+        }
+        if (config.mBackground == null) {
+            mWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        } else {
+            mWindow.setBackgroundDrawable(config.mBackground)
+        }
+
+        mWindow.isTouchable = true
+        mWindow.isFocusable = true
+        mWindow.isOutsideTouchable = config.isOutsideTouchable
+
+        // 在相关的View被移除时，window也自动移除。避免当Fragment退出后，Fragment中弹出的PopupWindow还存在于界面上。
+        config.mAnchorView.addOnAttachStateChangeListener(object :
+            View.OnAttachStateChangeListener {
+            override fun onViewAttachedToWindow(v: View) {
+
+            }
+
+            override fun onViewDetachedFromWindow(v: View) {
+                if (isShowing()) {
+                    dismiss()
+                }
+            }
+        })
+        return this
+    }
+
+    fun dimBehind(dim: Float) {
+        if (!::mWindowManager.isInitialized)
+            mWindowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        if (!isShowing()) {
+            throw RuntimeException("should call after method show() or in onShowEnd()")
+        }
+        val decorView = getDecorView()
+        if (decorView != null) {
+            val p = decorView.layoutParams as WindowManager.LayoutParams
+            p.flags = p.flags or WindowManager.LayoutParams.FLAG_DIM_BEHIND
+            p.dimAmount = dim
+            mWindowManager.updateViewLayout(decorView, p)
+        }
+    }
+
+    protected abstract fun onShowBegin(contentView: View): Point
+
+    protected abstract fun onShowEnd()
+
+
+    fun dismiss() {
+        if (isShowing())
+            mWindow.dismiss()
+    }
+
+    fun show() {
+        if (!isShowing()) {
+            val point = onShowBegin(config().mContentView)
+            mWindow.showAtLocation(config().mAnchorView, config().mGravity, point.x, point.y)
+            onShowEnd()
+        }
+    }
+
+
+    fun setContentView(contentView: View) {
+        mRootViewWrapper = FrameLayout(contentView.context)
+        mRootViewWrapper.layoutParams = ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+        mRootViewWrapper.addView(contentView)
+        mWindow.contentView = mRootViewWrapper
+        mWindow.setTouchInterceptor(View.OnTouchListener { v, event ->
+            if (event.action == MotionEvent.ACTION_OUTSIDE) {
+                mWindow.dismiss()
+                return@OnTouchListener false
+            }
+            false
+        })
+        mWindow.setOnDismissListener {
+            this@AbsQMBasePopup.onDismiss()
+            if (mDismissListener != null) {
+                mDismissListener!!.onDismiss()
+            }
+        }
+    }
+
+    protected fun onDismiss() {}
+
+    private fun getDecorView(): View? {
+        var decorView: View? = null
+        try {
+            decorView = if (mWindow.background == null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    mWindow.contentView.parent as View
+                } else {
+                    mWindow.contentView
+                }
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    mWindow.contentView.parent.parent as View
+                } else {
+                    mWindow.contentView.parent as View
+                }
+            }
+        } catch (ignore: Exception) {
+
+        }
+
+        return decorView
+    }
+
+    class WindowConfig {
+        var mWindowWidth = ViewGroup.LayoutParams.MATCH_PARENT
+        var mWindowHeight = ViewGroup.LayoutParams.WRAP_CONTENT
+        var mAnimationStyle: Int = -1
+        var mGravity: Int = Gravity.CENTER
+        var mBackground: Drawable? = null
+        lateinit var mContentView: View
+        lateinit var mAnchorView: View
+        var isOutsideTouchable = true
+
+
+    }
+}
\ No newline at end of file

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/CommonPopWindow.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Point
 import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup
 import android.widget.PopupWindow
 import com.qimai.android.tools.dpTopx
 import com.qimai.android.tools.getScreenWidth
@@ -17,7 +16,7 @@ import com.qimai.android.tools.getScreenWidth
 class CommonPopWindow private constructor(
     override var context: Context,
     private val contentView: View,
-    private var animationStyle: Int,
+    private var animationStyles: Int,
     override var gravity: Int,
     override var mDismissListener: PopupWindow.OnDismissListener?
 
@@ -28,13 +27,20 @@ class CommonPopWindow private constructor(
     private constructor(builder: Builder) : this(
         context = builder.mContentView.context,
         contentView = builder.mContentView,
-        animationStyle = builder.animationStyle,
+        animationStyles = builder.animationStyle,
         gravity = builder.gravity,
         mDismissListener = builder.dismissListener
     ) {
         this.setContentView(contentView)
-        this.setAnimatonStyle(animationStyle)
+        this.setAnimationStyle(animationStyles)
+        if (builder.windowWidth < 0)
             setWindowWidth(getScreenWidth(contentView.context) - context.dpTopx(30.0f))
+        else
+            setWindowWidth(builder.windowWidth)
+
+        if (builder.windowHeight > 0) {
+            setWindowHeight(builder.windowHeight)
+        }
     }
 
 
@@ -48,14 +54,22 @@ class CommonPopWindow private constructor(
 
         internal var dismissListener: PopupWindow.OnDismissListener? = null
 
-        internal var windowWidth = ViewGroup.LayoutParams.MATCH_PARENT
-        internal var windowHeight = ViewGroup.LayoutParams.WRAP_CONTENT
+        var windowWidth = -1
+        var windowHeight = -1
 
 
         fun configContentView(contentView: View) = apply {
             this.mContentView = contentView
         }
 
+        fun configWidowWith(windowWidth: Int) = apply {
+            this.windowWidth = windowWidth
+        }
+
+        fun configWidowHeight(windowHeight: Int) = apply {
+            this.windowHeight = windowHeight
+        }
+
 
         fun configGravity(gravity: Int) = apply {
             this.gravity = gravity

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/Loading.kt

+package com.qimai.android.widgetlib.popup
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.qimai.android.widgetlib.R
+import kotlinx.android.synthetic.main.loading.view.*
+
+/**
+ *   created by wangwei   ON 2019-10-21  email:wangwei_5521@163.com
+ *   @version 1.1.1
+ *   @Description
+ **/
+class Loading : androidx.fragment.app.DialogFragment() {
+
+    private lateinit var rootView: View
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        val root = inflater.inflate(R.layout.loading, container, false)
+        rootView = root
+        return root
+    }
+
+    fun changeLoadText(loadingText: String) {
+        rootView.text.text = loadingText
+    }
+
+    fun show(manager: androidx.fragment.app.FragmentManager) {
+        show(manager, "loading")
+    }
+
+
+}
\ No newline at end of file

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QMBasePopup.kt

@@ -39,7 +39,7 @@ abstract class QMBasePopup(open var context: Context) {
         this.mWindowHeight = windowHeight
     }
 
-    fun setAnimatonStyle(style: Int) {
+    fun setAnimationStyle(style: Int) {
         mWindow.animationStyle = style
     }
 

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QmAlertDialog.kt

 package com.qimai.android.widgetlib.popup
 
 import android.content.Context
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -25,10 +23,11 @@ class QmAlertDialog private constructor(
     private val subTitle: CharSequence,
     private val leftButtonText: String,
     private val rightButtonText: String,
-    private val leftButtonClickListener: (CommonPopWindow:CommonPopWindow) -> Unit,
-    private val rightButtonClickListener: (CommonPopWindow:CommonPopWindow) -> Unit,
+    private val leftButtonClickListener: (CommonPopWindow: CommonPopWindow) -> Unit,
+    private val rightButtonClickListener: (CommonPopWindow: CommonPopWindow) -> Unit,
     private val rootView: ViewGroup,
     private val dismissListener: PopupWindow.OnDismissListener?
+    , private val width: Int
 ) {
 
     private lateinit var commonPopWindow: CommonPopWindow
@@ -41,7 +40,8 @@ class QmAlertDialog private constructor(
         leftButtonClickListener = builder.leftButtonClick,
         rightButtonClickListener = builder.rightButtonClick,
         rootView = builder.rootView,
-        dismissListener = builder.dismissListener
+        dismissListener = builder.dismissListener,
+        width = builder.width
     )
 
     fun show() {
@@ -76,13 +76,17 @@ class QmAlertDialog private constructor(
                 this.rightButtonClickListener.invoke(commonPopWindow)
             }
 
-            commonPopWindow = CommonPopWindow.Builder()
+            val builder = CommonPopWindow.Builder()
                 .configGravity(Gravity.CENTER)
                 .configContentView(contentView)
                 .dismissListener(PopupWindow.OnDismissListener {
                     dismissListener?.onDismiss()
                 })
-                .build()
+            if (width >0){
+                builder.configWidowWith(width)
+            }
+            commonPopWindow = builder.build()
+
         }
         commonPopWindow.show(rootView)
         commonPopWindow.dimBehind(0.5f)
@@ -104,11 +108,12 @@ class QmAlertDialog private constructor(
         internal var leftButtonText = "取消"
         internal var rightButtonText = "确定"
 
-        internal lateinit var leftButtonClick: (CommonPopWindow:CommonPopWindow) -> Unit
-        internal lateinit var rightButtonClick: (CommonPopWindow:CommonPopWindow) -> Unit
+        internal lateinit var leftButtonClick: (CommonPopWindow: CommonPopWindow) -> Unit
+        internal lateinit var rightButtonClick: (CommonPopWindow: CommonPopWindow) -> Unit
         private lateinit var context: Context
         internal lateinit var rootView: ViewGroup
         internal var dismissListener: PopupWindow.OnDismissListener? = null
+        internal var width: Int = 0
 
 
         fun withTitle(title: CharSequence) = apply {
@@ -132,13 +137,21 @@ class QmAlertDialog private constructor(
             this.rootView = rootView
         }
 
+        fun withWidth(windowWidth: Int) = apply {
+            this.width = windowWidth
+
+        }
+
 
         fun build(): QmAlertDialog {
             return QmAlertDialog(this)
         }
 
 
-        fun withLeftButton(leftButtonText: String, clickListener: (CommonPopWindow:CommonPopWindow) -> Unit) =
+        fun withLeftButton(
+            leftButtonText: String,
+            clickListener: (CommonPopWindow: CommonPopWindow) -> Unit
+        ) =
             apply {
 
                 this.leftButtonText = leftButtonText
@@ -146,7 +159,10 @@ class QmAlertDialog private constructor(
             }
 
 
-        fun withRightButton(rightButtonText: String, clickListener: (CommonPopWindow:CommonPopWindow) -> Unit) = apply {
+        fun withRightButton(
+            rightButtonText: String,
+            clickListener: (CommonPopWindow: CommonPopWindow) -> Unit
+        ) = apply {
 
             this.rightButtonText = rightButtonText
             this.rightButtonClick = clickListener

widgetlib/src/main/java/com/qimai/android/widgetlib/toast/HolderContext.java

+package com.qimai.android.widgetlib.toast;
+
+import android.content.Context;
+
+/**
+ * created by wangwei   ON 2019-11-04  email:wangwei_5521@163.com
+ *
+ * @version 1.1.1
+ * @Description
+ **/
+public class HolderContext {
+    private static volatile HolderContext instance;
+
+    public static HolderContext getInstance() {
+        if (instance == null) {
+            synchronized (HolderContext.class) {
+                if (instance == null) {
+                    instance = new HolderContext();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public static Context getContext() {
+        return getInstance().holder.getContext();
+    }
+
+    public Holder holder;
+
+    public void register(Holder holder) {
+        this.holder = holder;
+    }
+
+    public interface Holder {
+        Context getContext();
+    }
+}

widgetlib/src/main/java/com/qimai/android/widgetlib/toast/ToastUtils.java

+package com.qimai.android.widgetlib.toast;
+
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * created by wangwei   ON 2019-11-04  email:wangwei_5521@163.com
+ *
+ * @version 1.1.1
+ * @Description
+ **/
+public class ToastUtils {
+
+    private static volatile ToastUtils instance;
+    private static final int COLOR_DEFAULT = 0xFEFFFFFF;
+
+    private static volatile Toast mToast;
+
+    private int sMsgTextSize = -1;
+    private int sMsgColor = COLOR_DEFAULT;
+    private int sGravity = -1;
+    private int sBgColor = COLOR_DEFAULT;
+    private int sBgResource = -1;
+
+    public static ToastUtils getInstance() {
+        if (instance == null) {
+            synchronized (ToastUtils.class) {
+                if (instance == null) {
+                    instance = new ToastUtils();
+                }
+            }
+        }
+        return instance;
+    }
+
+
+    public void showCenter(String msg) {
+        getToast().setText(msg);
+        mToast.setGravity(Gravity.CENTER, 0, 0);
+        mToast.show();
+    }
+
+
+    public void showTaost(CharSequence msg) {
+        getToast();
+        View toastView = mToast.getView();
+        TextView message = toastView.findViewById(android.R.id.message);
+        message.setText(msg);
+        if (sMsgTextSize != -1) {
+            message.setTextSize(sMsgTextSize);
+        }
+        if (sMsgColor != COLOR_DEFAULT) {
+            message.setTextColor(sMsgColor);
+        }
+
+        if (sGravity != -1) {
+            mToast.setGravity(sGravity, 0, 0);
+        }
+        if (sBgResource != -1) {
+            toastView.setBackgroundResource(sBgResource);
+
+        } else if (sBgColor != COLOR_DEFAULT) {
+            Drawable background = toastView.getBackground();
+            if (background != null) {
+                background.setColorFilter(
+                        new PorterDuffColorFilter(sBgColor, PorterDuff.Mode.SRC_IN)
+                );
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                    toastView.setBackground(new ColorDrawable(sBgColor));
+                } else {
+                    toastView.setBackgroundDrawable(new ColorDrawable(sBgColor));
+                }
+            }
+
+        }
+        mToast.show();
+
+    }
+
+    public ToastUtils setsMsgTextSize(int msgTextSize) {
+        sMsgTextSize = msgTextSize;
+        return this;
+    }
+
+    public ToastUtils setMsgColor(int color) {
+        this.sMsgColor = color;
+        return this;
+    }
+
+    public ToastUtils setGravity(int gravity) {
+        this.sGravity = gravity;
+        return this;
+    }
+
+    public ToastUtils setBgColor(int color) {
+        this.sBgColor = color;
+        return this;
+    }
+
+    public ToastUtils setBgResouce(int bgResouce) {
+        this.sBgColor = bgResouce;
+        return this;
+    }
+
+
+    private static Toast getToast() {
+        if (mToast == null) {
+            synchronized (ToastUtils.class) {
+                if (mToast == null) {
+                    mToast = Toast.makeText(HolderContext.getContext(), "", Toast.LENGTH_LONG);
+                }
+            }
+        }
+        return mToast;
+    }
+
+}

widgetlib/src/main/res/layout/loading.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="wrap_content"
+        android:background="@drawable/shape_alert_bg"
+        android:layout_gravity="center"
+        android:padding="16dp"
+        android:layout_height="wrap_content">
+
+    <com.github.ybq.android.spinkit.SpinKitView
+            android:id="@+id/spin_kit"
+            style="@style/SpinKitView.Large.FadingCircle"
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_gravity="center"
+            app:SpinKit_Color="#E2CE22" />
+
+    <TextView
+            android:id="@+id/text"
+            android:text="加载中..."
+            android:textColor="@color/color_222222"
+            android:textSize="15sp"
+            android:layout_marginTop="16dp"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file

widgetlib/src/main/res/layout/section_itemview.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file

widgetlib/src/main/res/values/attrs.xml

@@ -36,4 +36,12 @@
         <attr name="overlay_borderColor" format="color" />
         <attr name="overlay_borderWidth" format="dimension" />
     </declare-styleable>
+
+    <declare-styleable name="SectionItemView">
+        <attr name="type" format="enum">
+            <enum name="arrow" value="0" />
+            <enum name="check" value="1" />
+            <enum name="radio" value="2" />
+        </attr>
+    </declare-styleable>
 </resources>
\ No newline at end of file