feat : UI验收，bug修复

config.gradle

@@ -9,9 +9,9 @@ ext {
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.03",
             "m-user"          : "0.0.61.90",
-            "m-user-medical"  : "0.0.61.96",
+            "m-user-medical"  : "0.0.61.98",
             "m-home"          : "0.0.22.70",
-            "m-im-medical"    : "0.0.20.84",
+            "m-im-medical"    : "0.0.20.85",
             "m-im"            : "0.0.20.76",
             "m-dynamic"       : "0.0.7.28",
             "m-article"       : "0.0.0.10",
@@ -95,9 +95,9 @@ ext {
             "m-consultant"    : "0.0.59.91",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.90",
-            "m-user-medical"  : "0.0.61.96",
+            "m-user-medical"  : "0.0.61.98",
             "m-home"          : "0.0.22.70",
-            "m-im-medical"    : "0.0.20.84",
+            "m-im-medical"    : "0.0.20.85",
             "m-im"            : "0.0.20.76",
             "m-dynamic"       : "0.0.7.28",
             "m-article"       : "0.0.0.8",

m-im/src/main/java/com/yidianling/medical/archives/MedicalAddNewArchivesActivity.kt

@@ -3,15 +3,22 @@ package com.yidianling.medical.archives
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.ColorSpace
+import android.graphics.Typeface
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.provider.CalendarContract
 import android.text.Editable
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.TextWatcher
 import android.text.style.AbsoluteSizeSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.view.*
+import android.widget.EditText
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.view.dialog.NormalDialog
@@ -22,7 +29,6 @@ import com.yidianling.uikit.custom.http.ServiceImpl
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.medical_add_new_archives_activity.*
-import kotlin.concurrent.thread
 
 
 /**
@@ -70,6 +76,8 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
         mMarried = -1
         mRelation = -1
         initStatus()
+
+
         group_merried.setOnCheckedChangeListener { group, checkedId ->
             //婚姻状态
             when (checkedId) {
@@ -134,7 +142,6 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
             //保存新增问诊人
             checkInfo()
         }
-
         EditTextUtils.disableCopyAndPaste(et_name)
 
         et_idcard.addTextChangedListener(object :TextWatcher{
@@ -151,7 +158,7 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
                 if(sLength > oldLength){
                     val msp = SpannableString(s.toString())
                     msp.setSpan(
-                        AbsoluteSizeSpan(20, true),
+                        AbsoluteSizeSpan(22, true),
                         Math.max(s.toString().length - 1,0),
                         s.toString().length,
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -161,7 +168,7 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
                     et_idcard.setSelection(sLength)
                     var message = Message()
                     message.what = AUTOSIZE;
-                    mHandler.sendMessageDelayed(message,1000)
+                    mHandler.sendMessageDelayed(message,3000)
                 }else{
                     oldLength = sLength
                 }
@@ -252,5 +259,4 @@ class MedicalAddNewArchivesActivity : BaseActivity() {
         StatusBarUtils.setTransparentForImageView(this@MedicalAddNewArchivesActivity, null)
         StatusBarUtils.statusBarLightMode(this@MedicalAddNewArchivesActivity)
     }
-
 }
\ No newline at end of file

m-im/src/main/res/drawable/medical_edit_cursor_bg.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="2dp"/>
+    <solid android:color="@color/medical_color_3464ec"/>
+
+</shape>
\ No newline at end of file

m-im/src/main/res/layout/medical_add_new_archives_activity.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="match_parent">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
@@ -69,15 +69,16 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:background="@null"
-            android:textStyle="bold"
             android:hint="请输入真实姓名"
             android:maxEms="15"
             android:maxLength="15"
-            tools:text="123456789012345678910111212"
+            android:textCursorDrawable="@drawable/medical_edit_cursor_bg"
             android:textColor="@color/medical_color_0c1d31"
             android:textColorHint="@color/medical_color_c0c9d4"
             android:textSize="16sp"
-            app:layout_constraintTop_toBottomOf="@id/tv_name" />
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@id/tv_name"
+            tools:text="" />
 
         <View
             android:id="@+id/line_name"
@@ -104,14 +105,17 @@
             android:layout_width="match_parent"
             android:layout_height="22dp"
             android:layout_marginTop="8dp"
-            android:digits="0123456789xX"
-            android:inputType="number"
             android:background="@null"
-            android:textStyle="bold"
+            android:digits="0123456789xX"
             android:hint="请输入真实身份证号码"
+            android:inputType="number"
+            android:maxEms="18"
+            android:maxLength="18"
             android:textColor="@color/medical_color_0c1d31"
             android:textColorHint="@color/medical_color_c0c9d4"
+            android:textCursorDrawable="@drawable/medical_edit_cursor_bg"
             android:textSize="16sp"
+            android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@id/tv_idcard" />
 
         <View
@@ -218,8 +222,8 @@
             <RadioButton
                 android:id="@+id/me"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="32dp"
+                android:layout_weight="1"
                 android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
                 android:button="@null"
                 android:gravity="center"
@@ -229,9 +233,9 @@
             <RadioButton
                 android:id="@+id/parent"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
                 android:button="@null"
                 android:gravity="center"
@@ -241,9 +245,9 @@
             <RadioButton
                 android:id="@+id/spouse"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
                 android:button="@null"
                 android:gravity="center"
@@ -253,9 +257,9 @@
             <RadioButton
                 android:id="@+id/children"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
                 android:button="@null"
                 android:gravity="center"
@@ -265,9 +269,9 @@
             <RadioButton
                 android:id="@+id/other"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/medical_radiobutton_f2f5f8_1a3464ec_bg"
                 android:button="@null"
                 android:gravity="center"

m-user/src/main/java/com/yidianling/user/ui/login/OneKeyLoginHelp.kt

@@ -337,7 +337,7 @@ object OneKeyLoginHelp {
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
                 .setNumFieldOffsetY(220)
-                .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
+                .setLogBtnBackgroundPath("bg_one_click_medical_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮文字颜色
                 .setLogBtnTextSize(17)
                 .setLogBtnHeight(78)
@@ -386,7 +386,7 @@ object OneKeyLoginHelp {
                 .setNumberColor(Color.parseColor("#242424"))
                 .setNumberSize(24)
                 .setNumFieldOffsetY(40)
-                .setLogBtnBackgroundPath("bg_one_click_login") //  设置登录按钮背景图片
+                .setLogBtnBackgroundPath("bg_one_click_medical_login") //  设置登录按钮背景图片
                 .setLogBtnTextColor(Color.parseColor("#ffffff")) //  设置登录按钮颜色
                 .setLogBtnTextSize(17)
                 .setLogBtnHeight(78)

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

@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <stroke android:width="0.5dp" android:color="#999999"/>
 
-    <corners android:radius="22dp" />
+    <corners android:radius="8dp" />
 
 </shape>
\ No newline at end of file

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

@@ -2,10 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="22dp" />
+    <corners android:radius="8dp" />
 
     <gradient
-        android:startColor="#22BFFF"
-        android:endColor="#159CEF"/>
+        android:angle="270"
+        android:startColor="#4D86FF"
+        android:endColor="#3464ec"/>
 
 </shape>
\ No newline at end of file

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

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
-        android:src="@drawable/user_secret_top_bg" />
+        android:src="@drawable/medical_user_secret_top_bg" />
 
     <RelativeLayout
         android:id="@+id/user_top_rl"
@@ -22,8 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="25dp"
-            android:layout_marginTop="40dp"
-            android:text="壹点灵"
+            android:text="壹点灵心理医生"
             android:textColor="#242424"
             android:textSize="28dp"
             android:textStyle="bold" />
@@ -93,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="《用户使用协议》"
-            android:textColor="#159CEF"
+            android:textColor="#3464ec"
             android:textSize="14dp" />
 
         <TextView
@@ -108,7 +107,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="《隐私保护政策》"
-            android:textColor="#159CEF"
+            android:textColor="#3464ec"
             android:textSize="14dp" />
     </LinearLayout>
 
@@ -116,15 +115,26 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:layout_marginBottom="40dp"
-        android:orientation="horizontal"
+        android:orientation="vertical"
         android:background="#ffffff">
 
         <TextView
+            android:id="@+id/user_secret_agree"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:layout_marginLeft="5.5dp"
+            android:layout_weight="1"
+            android:background="@drawable/user_secret_right_btn_bg"
+            android:gravity="center"
+            android:text="同意并继续"
+            android:textColor="#FFFFFF"
+            android:textSize="16dp" />
+        <TextView
             android:id="@+id/user_secret_no_agree"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="44dp"
             android:layout_marginRight="5.5dp"
             android:layout_weight="1"
@@ -134,17 +144,7 @@
             android:textColor="#999999"
             android:textSize="16dp" />
 
-        <TextView
-            android:id="@+id/user_secret_agree"
-            android:layout_width="0dp"
-            android:layout_height="44dp"
-            android:layout_marginLeft="5.5dp"
-            android:layout_weight="1"
-            android:background="@drawable/user_secret_right_btn_bg"
-            android:gravity="center"
-            android:text="同意并继续"
-            android:textColor="#FFFFFF"
-            android:textSize="16dp" />
+
 
     </LinearLayout>