1.UI调整

2.bug修复

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         ydlrouter_version = '1.2.3'
         constrait_support_version = '1.0.2'
 
-        componentVersion = "0.3.0.20-wjy-SNAPSHOT"
+        componentVersion = "0.3.0.22-wjy-SNAPSHOT"
     }
     repositories {
         mavenCentral()

m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

@@ -590,7 +590,7 @@ class ExpertSearchAdapter(
                         val userService = findRouteService(IUserService::class.java)
                         if (!userService.isBindPhone() && context is Activity) {
                             CommonDialog(context)
-                                .setMessage("为了及时接收消息通知,请立即绑定收集")
+                                .setMessage("为了及时接收消息通知,请立即绑定手机")
                                 .setLeftOnclick("忍痛放弃") {}
                                 .setRightClick("果断绑定") {
                                     userService.wxBindToInputhonePage(context) // 跳转绑定手机号页面

m-course/src/main/java/com/yidianling/course/widget/CourseListDialog.kt

@@ -32,7 +32,7 @@ class CourseListDialog : BaseDialogFragment() {
     private lateinit var recycler_list: RecyclerView
 
     override fun getLayoutResourceId(): Int = R.layout.dialog_course_list
-    override fun getGravity(): Int = Gravity.BOTTOM
+    override fun setGravity(): Int = Gravity.BOTTOM
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         context?.let { ctx ->

m-course/src/main/java/com/yidianling/course/widget/CourseSpeedDialog.kt

@@ -26,7 +26,7 @@ class CourseSpeedDialog : BaseDialogFragment() {
     private lateinit var tv_cancel: TextView
 
     override fun getLayoutResourceId(): Int = R.layout.dialog_course_speed
-    override fun getGravity(): Int = Gravity.BOTTOM
+    override fun setGravity(): Int = Gravity.BOTTOM
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         context?.let {

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeConsultItemView.kt

@@ -139,7 +139,7 @@ class HomeConsultItemView(private var mContext: Context, private var homeEvent:
             val userService = findRouteService(IUserService::class.java)
             if (!userService.isBindPhone() && context is Activity) {
                 CommonDialog(context)
-                    .setMessage("为了及时接收消息通知,请立即绑定收集")
+                    .setMessage("为了及时接收消息通知,请立即绑定手机")
                     .setLeftOnclick("忍痛放弃") {}
                     .setRightClick("果断绑定") {
                         userService.wxBindToInputhonePage(context as Activity) // 跳转绑定手机号页面

m-user/src/main/java/com/yidianling/user/mine/AvaterDialog.kt

+package com.yidianling.user.mine
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.DialogFragment
+import com.ydl.ydlcommon.base.BaseDialogFragment
+import com.yidianling.user.R
+
+/**
+ * 修改头像dialog
+ */
+class AvaterDialog : BaseDialogFragment() {
+    override fun getLayoutResourceId(): Int = R.layout.dialog_album_photo
+    override fun setGravity(): Int = Gravity.BOTTOM
+
+    lateinit var listener: (Int, DialogFragment) -> Unit
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val tv_album = view.findViewById<TextView>(R.id.tv_album)
+        tv_album.setOnClickListener {
+            listener.invoke(0, this)
+        }
+        val tv_photo = view.findViewById<TextView>(R.id.tv_photo)
+        tv_photo.setOnClickListener {
+            listener.invoke(1, this)
+        }
+        val tv_cancel = view.findViewById<TextView>(R.id.tv_cancel)
+        tv_cancel.setOnClickListener {
+            listener.invoke(2, this)
+        }
+    }
+}
\ No newline at end of file

m-user/src/main/res/drawable/bg_top_corner_8_white.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"/>
+    <solid android:color="@android:color/white"/>
+</shape>
\ No newline at end of file

m-user/src/main/res/layout/activity_modify_avatar.xml

@@ -8,7 +8,6 @@
 
     <com.ydl.ydlcommon.view.TitleBar
         android:id="@+id/tip_bar"
-        android:background="@color/color_2E2E30"
         app:layout_constraintTop_toTopOf="parent"
         android:layout_width="match_parent"
         android:layout_height="44dp"

m-user/src/main/res/layout/activity_modify_info.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/color_F9F9FD"
     android:orientation="vertical">
 
     <com.ydl.ydlcommon.view.TitleBar
@@ -12,6 +13,7 @@
         android:layout_height="44dp"
         android:background="@color/platform_white"
         app:pa_left_start_icon="@drawable/platform_common_back"
+        android:layout_marginBottom="16dp"
         app:pa_right_text="保存"
         app:pa_title_text="修改昵称" />
 
@@ -20,13 +22,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="26dp"
-        android:layout_marginTop="16dp"
         android:layout_marginBottom="12dp"
         android:textColor="@color/color_9d9ea7"
         android:textSize="14sp"
-        android:visibility="invisible"
+        android:visibility="gone"
         tools:text="七天内可修改一次昵称"
-        tools:visibility="visible" />
+        tools:visibility="visible"/>
 
     <com.ydl.ydlcommon.view.DeleteEditTextView
         android:id="@+id/det_set_info"
@@ -40,7 +41,7 @@
         android:paddingEnd="10dp"
         android:paddingTop="15dp"
         android:gravity="start"
-        android:textSize="14sp"
+        android:textSize="18sp"
         android:textColor="@color/color_1C1F28"
         android:paddingBottom="15dp" />
 

m-user/src/main/res/layout/dialog_album_photo.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_top_corner_8_white">
+
+    <TextView
+        android:id="@+id/tv_album"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:text="相册"
+        android:textColor="@color/color_1C1F28"
+        android:textSize="16sp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/divide_1"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        app:layout_constraintTop_toBottomOf="@id/tv_album"
+        android:background="@color/color_EFEFF1"/>
+
+    <TextView
+        android:id="@+id/tv_photo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:text="拍照"
+        android:textColor="@color/color_1C1F28"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/divide_1" />
+
+    <View
+        android:id="@+id/divide_2"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        app:layout_constraintTop_toBottomOf="@id/tv_photo"
+        android:background="@color/color_EFEFF1"/>
+
+    <TextView
+        android:id="@+id/tv_cancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
+        android:text="取消"
+        android:textColor="@color/color_1C1F28"
+        android:textSize="16sp"
+        app:layout_constraintTop_toBottomOf="@id/divide_2" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseDialogFragment.kt

@@ -8,6 +8,7 @@ import android.view.ViewDebug.ExportedProperty
 import android.view.ViewDebug.IntToString
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
+import androidx.annotation.StyleRes
 import androidx.fragment.app.DialogFragment
 import com.ydl.ydlcommon.R
 
@@ -18,7 +19,7 @@ abstract class BaseDialogFragment : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.bottomUpDialog)
+        setStyle(STYLE_NO_TITLE, setTheme())
     }
 
     override fun onCreateView(
@@ -33,7 +34,7 @@ abstract class BaseDialogFragment : DialogFragment() {
         super.onStart()
         dialog?.window?.run {
             attributes = attributes?.apply {
-                gravity = getGravity()
+                gravity = setGravity()
                 width = getWidth()
                 height = getHeight()
             }
@@ -42,7 +43,9 @@ abstract class BaseDialogFragment : DialogFragment() {
 
     @LayoutRes
     abstract fun getLayoutResourceId(): Int
-    open fun getGravity(): Int = Gravity.NO_GRAVITY
+    open fun setGravity(): Int = Gravity.NO_GRAVITY
+    @StyleRes
+    open fun setTheme(): Int = R.style.bottomUpDialog
 
     @ExportedProperty(
         category = "layout",

ydl-platform/src/main/res/values/colors.xml

@@ -135,4 +135,5 @@
     <color name="color_2E2E30">#2E2E30</color>
     <color name="color_191919">#191919</color>
     <color name="color_E5E5E5">#E5E5E5</color>
+    <color name="color_F9F9FD">#F9F9FD</color>
 </resources>