升级ui库

caoyanglee · Apr 16, 2019 · 50cf9b6 · 50cf9b6
1 parent 16c42d6
commit 50cf9b6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 50 deletions.
diff --git a/app/src/main/java/io/weimu/www/imagepicker/AppData.kt b/app/src/main/java/io/weimu/www/imagepicker/AppData.kt
@@ -1,6 +1,6 @@
 package io.weimu.www.imagepicker
 
-import com.weimu.universalib.OriginAppData
+import com.weimu.universalview.OriginAppData
 
 /**
  * Author:你需要一台永动机

diff --git a/app/src/main/java/io/weimu/www/imagepicker/ui/preview/ImagePreviewFragment.kt b/app/src/main/java/io/weimu/www/imagepicker/ui/preview/ImagePreviewFragment.kt
@@ -12,16 +12,14 @@ import com.bumptech.glide.request.transition.Transition
 import com.liulishuo.filedownloader.BaseDownloadTask
 import com.liulishuo.filedownloader.FileDownloadListener
 import com.liulishuo.filedownloader.FileDownloader
-import com.orhanobut.logger.Logger
 import com.shizhefei.view.largeimage.factory.FileBitmapDecoderFactory
-import com.weimu.universalib.OriginAppData
+import com.weimu.universalib.helper.Md5Helper
 import com.weimu.universalib.helper.MediaScanner
 import com.weimu.universalib.ktx.formatDate
-import com.weimu.universalib.ktx.toast
-import com.weimu.universalib.utils.AnimUtils
 import com.weimu.universalib.utils.FileUtils
-import com.weimu.universalib.utils.Md5Utils
+import com.weimu.universalview.OriginAppData
 import com.weimu.universalview.core.fragment.BaseFragment
+import com.weimu.universalview.helper.AnimHelper
 import com.weimu.universalview.ktx.invisible
 import com.weimu.universalview.ktx.visible
 import io.weimu.www.imagepicker.R
@@ -116,7 +114,7 @@ class ImagePreviewFragment : BaseFragment() {
 
         val targetDir = FILE_IMAGE_PREVIEW
         //Logger.e("目标路径=$targetDir")
-        val fileName = Md5Utils.sign(url, "weimu")
+        val fileName = Md5Helper.sign(url, "weimu")
 
         //md5 名称唯一性
         targetPath = "$targetDir$fileName"
@@ -212,7 +210,7 @@ class ImagePreviewFragment : BaseFragment() {
                 //加载大图
                 iv_large?.setImage(FileBitmapDecoderFactory(file))
                 //做一下过渡动画比较不会太生硬
-                AnimUtils.alphaAnim(iv_large, 1000, onAnimEnd = {
+                AnimHelper.alphaAnim(iv_large, 1000, onAnimEnd = {
                     //                    Handler().postDelayed({iv_large_thumbnail?.gone()},1000)
                     cl_root?.removeView(iv_large_thumbnail)
                 })
@@ -242,7 +240,7 @@ class ImagePreviewFragment : BaseFragment() {
             when (it) {
                 "发送给朋友" -> {
                     //发送给朋友
-                    toast("发送给朋友")
+                    toastSuccess("发送给朋友")
                 }
                 "保存图片" -> {
                     //保存图片
@@ -264,13 +262,13 @@ class ImagePreviewFragment : BaseFragment() {
         val saveFile = "$picturePath/$target"
         try {
             FileUtils.copyFile(sourceFile, saveFile)//直接复制即可
-            toast("保存成功")
+            toastSuccess("保存成功")
             //让图片可以扫描
             val filePaths = arrayOf("$picturePath/$target")
             val mimeTypes = arrayOf(MimeTypeMap.getSingleton().getMimeTypeFromExtension("png"))
             MediaScanner(context).scanFiles(filePaths, mimeTypes)
         } catch (e: FileNotFoundException) {
-            toast("文件未找到，请重试")
+            toastFail("文件未找到，请重试")
         }
 
     }

diff --git a/app/src/main/java/io/weimu/www/imagepicker/widget/MenuDialog.kt b/app/src/main/java/io/weimu/www/imagepicker/widget/MenuDialog.kt
@@ -1,20 +1,16 @@
 package io.weimu.www.imagepicker.widget
 
-import android.app.AlertDialog
-import android.app.Dialog
 import android.arch.lifecycle.MutableLiveData
 import android.content.Context
 import android.os.Bundle
 import android.support.v7.widget.DefaultItemAnimator
 import android.support.v7.widget.GridLayoutManager
-import android.view.LayoutInflater
-import android.view.View
 import com.weimu.universalib.origin.BaseB
 import com.weimu.universalview.core.dialog.BottomUpDialog
 import com.weimu.universalview.core.recyclerview.BaseRecyclerAdapter
 import com.weimu.universalview.core.recyclerview.BaseRecyclerViewHolder
 import io.weimu.www.imagepicker.R
-import kotlinx.android.synthetic.main.dialog_menu.view.*
+import kotlinx.android.synthetic.main.dialog_menu.*
 import kotlinx.android.synthetic.main.list_item_member_operaion.view.*
 
 /**
@@ -23,6 +19,8 @@ import kotlinx.android.synthetic.main.list_item_member_operaion.view.*
  * Description:通用的菜单弹窗
  */
 class MenuDialog : BottomUpDialog() {
+
+
     override fun getTagName() = "menu"
 
 
@@ -37,42 +35,31 @@ class MenuDialog : BottomUpDialog() {
     }
 
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(activity)
-        isCancelable = true
-        val contentView = LayoutInflater.from(context).inflate(R.layout.dialog_menu, null)
-        ViewHolder(contentView)
-        builder.setView(contentView)
-        return builder.show()
-    }
+    override fun getLayoutResID(): Int = R.layout.dialog_menu
 
-    inner class ViewHolder(itemView: View) : BaseRecyclerViewHolder(itemView) {
-
-        init {
-            itemView.apply {
-                this.tv_cancel.setOnClickListener {
-                    dismiss()
-                }
-                //adapter
-                val mAdapter = MenuAdapter(context!!)
-
-                //list
-                this.mRecyclerView.itemAnimator = DefaultItemAnimator()//设置Item增加、移除动画
-                this.mRecyclerView.layoutManager = GridLayoutManager(context, 1)
-                this.mRecyclerView.adapter = mAdapter
-                dataList.observeForever {
-                    mAdapter.setDataToAdapter(it)
-                }
-
-                mAdapter.onItemClick = { item, position ->
-                    dismiss()
-                    onMenuClick?.invoke(position)
-                    onMenuClickV2?.invoke(item)
-                }
-            }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        this.tv_cancel.setOnClickListener {
+            dismiss()
+        }
+        //adapter
+        val mAdapter = MenuAdapter(context!!)
+
+        //list
+        this.mRecyclerView.itemAnimator = DefaultItemAnimator()//设置Item增加、移除动画
+        this.mRecyclerView.layoutManager = GridLayoutManager(context, 1)
+        this.mRecyclerView.adapter = mAdapter
+        dataList.observeForever {
+            mAdapter.setDataToAdapter(it)
+        }
 
+        mAdapter.onItemClick = { item, position ->
+            dismiss()
+            onMenuClick?.invoke(position)
+            onMenuClickV2?.invoke(item)
         }
+
     }
 
 

diff --git a/build.gradle b/build.gradle
@@ -40,5 +40,5 @@ ext{
     compileSdkVersion = 28
 
     //App dependencies
-    universal_view='0.1.12'
+    universal_ui='0.2.1'
 }
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
@@ -28,7 +28,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     //universal-view
-    compile "com.github.caoyanglee:universalui:$rootProject.universal_view"
+    compile "com.github.caoyanglee:universalui:$rootProject.universal_ui"
     //裁剪图
     compile 'com.isseiaoki:simplecropview:1.1.8@aar'
     //图片预览