version:1.3.4

fix:修复闪退
update:优化联系人添加
This commit is contained in:
2024-10-23 09:19:18 +08:00
parent b5b12c3e83
commit d215329e28
74 changed files with 2251 additions and 1138 deletions

View File

@@ -5,6 +5,7 @@
tools:context=".activity.contact.AddContactActivity">
<data>
<variable
name="click"
type="com.xxpatx.os.activity.contact.AddContactActivity.BtnClick" />
@@ -12,11 +13,11 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:background="#FAF8F8"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#FAF8F8">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3"
android:id="@+id/cl_exit"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="@drawable/general_setting_bg"
@@ -26,11 +27,11 @@
<ImageView
android:id="@+id/iv_cancel"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:onClick="@{click::exit}"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:onClick="@{click::exit}"
android:scaleType="centerInside"
android:src="@drawable/add_contact_back"
app:layout_constraintBottom_toBottomOf="parent"
@@ -49,41 +50,26 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_confirm"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:adjustViewBounds="true"
android:onClick="@{click::confirm}"
android:scaleType="centerInside"
android:src="@drawable/icon_confirm"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout3">
app:layout_constraintBottom_toTopOf="@+id/cl_bottom"
app:layout_constraintTop_toBottomOf="@+id/cl_exit"
tools:layout_editor_absoluteX="16dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/cl_confirm"
app:layout_constraintBottom_toTopOf="@+id/constraintLayout27"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="wrap_content"
android:orientation="vertical">
<com.shehuan.niv.NiceImageView
android:id="@+id/nv_avatar"
@@ -99,25 +85,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_margin="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="保存至本机"
android:textColor="@color/black"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
@@ -162,7 +129,7 @@
android:layout_marginEnd="8dp"
android:background="@null"
android:ellipsize="end"
android:hint="姓名"
android:hint="请输入微信昵称"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
@@ -183,7 +150,7 @@
android:background="@drawable/add_wechat_contact_background">
<ImageView
android:id="@+id/imageView8"
android:id="@+id/imageView9"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="12dp"
@@ -220,7 +187,7 @@
android:layout_marginEnd="8dp"
android:background="@null"
android:ellipsize="end"
android:hint="号码"
android:hint="请输入手机号码"
android:inputType="phone"
android:maxLines="1"
android:singleLine="true"
@@ -234,6 +201,65 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="8dp"
android:background="@drawable/add_wechat_contact_background">
<ImageView
android:id="@+id/imageView11"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="12dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_avatar"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView30"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@null"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:singleLine="true"
android:text="微信"
android:textColor="@color/black"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_tag"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:background="@null"
android:ellipsize="end"
android:hint="请输入微信标签"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:text="@string/app_name"
android:textColor="@color/black"
android:textColorHint="@color/ok_button"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView30"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
@@ -262,16 +288,89 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="8dp"
android:visibility="gone"
android:background="@drawable/add_wechat_contact_background">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="保存到SIM卡"
android:textColor="@color/black"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.xxpatx.os.view.ToggleButton
android:id="@+id/tb_sim"
android:layout_width="37dp"
android:layout_height="20dp"
android:layout_marginEnd="32dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_margin="8dp"
android:background="@drawable/add_wechat_contact_background"
android:visibility="gone">
<ImageView
android:id="@+id/imageView8"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="12dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_phone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_wechat_id"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@null"
android:ellipsize="end"
android:hint="微信号码(可空)"
android:inputType="phone"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="@color/gray"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView8"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_confirm"
android:id="@+id/constraintLayout27"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_margin="8dp"
android:onClick="@{click::confirm}"
android:background="@drawable/add_contact_confirm_background"
android:onClick="@{click::addContact}"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="14dp">
@@ -296,5 +395,12 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_bottom"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>