1.添加图片加载占位图

2.添加首次登陆欢迎弹窗

baselib/src/main/java/com/yingyangfly/baselib/adapter/DatabindingAdapter.kt

@@ -5,6 +5,7 @@ import android.text.style.AbsoluteSizeSpan
 import android.view.View
 import android.widget.ImageView
 import androidx.databinding.BindingAdapter
+import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.ext.click
 import com.yingyangfly.baselib.utils.ImageUtil.loadUrl
 import com.yingyangfly.baselib.utils.ScreenUtil
@@ -15,7 +16,7 @@ import com.yingyangfly.baselib.utils.ScreenUtil
 @BindingAdapter(value = ["loadHeadImg", "isCircle"], requireAll = false)
 fun ImageView.loadHeadImg(url: String?, isCircle: Boolean? = false) {
     url?.let {
-        loadUrl(url, isCircle = isCircle)
+        loadUrl(url, resId = R.mipmap.icon_place_holder, isCircle = isCircle)
     }
 }
 

baselib/src/main/java/com/yingyangfly/baselib/dialog/TaskFragment.kt

@@ -72,7 +72,7 @@ class TaskFragment : DialogFragment(), View.OnTouchListener {
         confirmBtan = rootView.findViewById(R.id.confirmBtan)
         confirmBtan?.setOnSingleClickListener {
             //停止动画
-            fishImage?.clearAnimation();
+            fishImage?.clearAnimation()
             if (animationDrawable != null) {
                 animationDrawable?.stop();
             }

home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -155,10 +155,17 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
         getCountTrain()
         //获取未读消息数量
         getCountMyMsg()
-        //获取任务状态弹窗
-        getSelectHomePageMsg()
         //获取任务列表
         getFindMyTask()
+        if (TextUtils.equals("0", User.getFirstLogin())) {
+            //第一次登录弹窗欢迎
+            User.saveFirstLogin("1")
+            val taskDesn = "欢迎" + User.getName() + "使用未来蓝豚康复平台！为您提供专业的认知康复支持和训练。帮助您提升认知能力，重建自信。小豚期待与您一同启程！"
+            showTaskDialog(taskDesn, "")
+        } else {
+            //获取任务状态弹窗
+            getSelectHomePageMsg()
+        }
     }
 
     /**
@@ -224,7 +231,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
                     if (it.currentTaskNum == it.totalTaskNum) {
                         if (TextUtils.equals("0", it.status)) {
                             //任务完成
-                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
+                            if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
+                                    .not()
+                            ) {
                                 User.saveTaskDialogStatus(User.getNowDay())
                                 showTipDialog()
                             } else {
@@ -283,11 +292,19 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
             .show(supportFragmentManager)
     }
 
+    /**
+     * 欢迎/确定信息弹窗
+     */
     private fun showTaskDialog(taskDesn: String, id: String) {
         val taskFragment = TaskFragment()
         taskFragment.setTaskDesn(taskDesn, id)
         taskFragment.onDialogClickListener = {
-            updateReadMsg(id)
+            if (id.isNullOrEmpty()) {
+                //获取任务状态弹窗
+                getSelectHomePageMsg()
+            } else {
+                updateReadMsg(id)
+            }
         }
         taskFragment.show(supportFragmentManager, "taskFragment")
     }