From ea7b6a457318d0ee3031f70e5af3379e5df48ebe Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Fri, 15 Nov 2024 14:22:59 +0800
Subject: [PATCH] =?UTF-8?q?version:1.4.0=20fix:=20update:=E9=97=B9?=
 =?UTF-8?q?=E9=92=9F=E6=8F=90=E9=86=92=E5=BE=AA=E7=8E=AF=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96sos=E5=92=8C=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../activity/emergency/EmergencyActivity.java |  79 +++++++++---------
 .../os/activity/noti/NoticeActivity.java      |   1 +
 .../os/adapter/EmergencyContactAdapter.java   |  74 ++++++++++++++++
 .../res/drawable-hdpi/icon_notice_alarm.png   | Bin 0 -> 2890 bytes
 app/src/main/res/drawable/bt_alarm_bg.xml     |  14 ++++
 app/src/main/res/drawable/bt_sos_bg.xml       |  14 ++++
 app/src/main/res/drawable/tv_sos_bg.xml       |  14 ++++
 .../main/res/layout/activity_emergency.xml    |  55 +++++++++---
 .../main/res/layout/activity_notice_info.xml  |  62 ++++++++++++--
 .../res/layout/item_emergency_contact.xml     |  77 +++++++++++++++++
 app/src/main/res/values/colors.xml            |   2 +-
 app/src/main/res/values/styles.xml            |   8 ++
 14 files changed, 347 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java
 create mode 100644 app/src/main/res/drawable-hdpi/icon_notice_alarm.png
 create mode 100644 app/src/main/res/drawable/bt_alarm_bg.xml
 create mode 100644 app/src/main/res/drawable/bt_sos_bg.xml
 create mode 100644 app/src/main/res/drawable/tv_sos_bg.xml
 create mode 100644 app/src/main/res/layout/item_emergency_contact.xml

diff --git a/app/build.gradle b/app/build.gradle
index c0c0b01..fe45dd0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.xxpatx.os"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1039
-        versionName "1.3.8"
+        versionCode 1040
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73b984b..238d9cb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -208,7 +208,7 @@
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/FloatingWindow" />
+            android:theme="@style/AppBlackTheme" />
         <activity android:name=".activity.APPListActivity" />
         <activity
             android:name=".activity.alarm.list.AlarmListActivity"
diff --git a/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java b/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java
index 8585409..3c7b6c3 100644
--- a/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/emergency/EmergencyActivity.java
@@ -12,7 +12,7 @@ import com.tencent.mmkv.MMKV;
 import com.trello.rxlifecycle4.RxLifecycle;
 import com.trello.rxlifecycle4.android.ActivityEvent;
 import com.xxpatx.os.R;
-import com.xxpatx.os.adapter.SosNnmberAdapter;
+import com.xxpatx.os.adapter.EmergencyContactAdapter;
 import com.xxpatx.os.base.mvvm.BaseMvvmActivity;
 import com.xxpatx.os.bean.BaseResponse;
 import com.xxpatx.os.bean.Contact;
@@ -32,16 +32,18 @@ import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, ActivityEmergencyBinding> {
-    private String TAG = "EmergencyActivity";
+    private static final String TAG = "EmergencyActivity";
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
-    private SosNnmberAdapter mSosNnmberAdapter;
+    //    private SosNnmberAdapter mSosNnmberAdapter;
+    private EmergencyContactAdapter mEmergencyContactAdapter;
 
-    private Disposable subscribe;
-    private boolean needDial = false;
-    private boolean isCalling = false;
-    private List<Contact> phoneList;
+
+    private Disposable mDisposable;
+    private boolean mNeedDial = false;
+    private boolean mCalling = false;
+    private List<Contact> mContactList;
 
     @Override
     protected int getLayoutId() {
@@ -62,22 +64,23 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
 //        Intent bootIntent = new Intent(BootReceiver.SOS);
 //        bootIntent.setComponent(new ComponentName("com.xxpatx.sn", "com.xxpatx.sn.receiver.BootReceiver"));
 //        sendBroadcast(bootIntent);
+
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
         linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         mViewDataBinding.rvContact.setLayoutManager(linearLayoutManager);
-        mSosNnmberAdapter = new SosNnmberAdapter();
-        mViewDataBinding.rvContact.setAdapter(mSosNnmberAdapter);
+        mEmergencyContactAdapter = new EmergencyContactAdapter();
+        mViewDataBinding.rvContact.setAdapter(mEmergencyContactAdapter);
 
         AmapManager.getInstance().startLocation();
 
         final Long time = 3L;
-        subscribe = Observable.interval(1, TimeUnit.SECONDS)
+        mDisposable = Observable.interval(1, TimeUnit.SECONDS)
                 .compose(RxLifecycle.bindUntilEvent(getLifecycleSubject(), ActivityEvent.DESTROY))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(aLong -> {
                     Log.e("TAG", "倒计时：" + aLong);
-                    if (aLong < time && !subscribe.isDisposed()) {
+                    if (aLong < time && !mDisposable.isDisposed()) {
                         mViewDataBinding.tvCountdown.setText("倒计时（" + (time - aLong - 1) + "）秒");
                         Log.e(TAG, "accept: " + (time - aLong - 1));
                     } else {
@@ -109,22 +112,22 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
                                     }
                                 });
 
-                        needDial = true;
+                        mNeedDial = true;
 
-                        if (phoneList == null || phoneList.isEmpty()) {
+                        if (mContactList == null || mContactList.isEmpty()) {
                             Toaster.showLong("没有设置紧急联系人");
                             finish();
                             return;
                         }
 
                         Intent intent = new Intent(Intent.ACTION_CALL);
-                        Uri data = Uri.parse("tel:" + phoneList.get(0).getMobile());
+                        Uri data = Uri.parse("tel:" + mContactList.get(0).getMobile());
                         intent.setData(data);
                         startActivity(intent);
-                        phoneList.remove(0);
-                        mSosNnmberAdapter.notifyDataSetChanged();
-                        isCalling = true;
-                        subscribe.dispose();
+                        mContactList.remove(0);
+                        mEmergencyContactAdapter.notifyDataSetChanged();
+                        mCalling = true;
+                        mDisposable.dispose();
                     }
                 });
         mViewDataBinding.ivFinish.setOnClickListener(new View.OnClickListener() {
@@ -155,8 +158,8 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
         mViewModel.mContactListData.observe(this, new androidx.lifecycle.Observer<List<Contact>>() {
             @Override
             public void onChanged(List<Contact> contacts) {
-                phoneList = contacts;
-                mSosNnmberAdapter.setPhoneNumberList(phoneList);
+                mContactList = contacts;
+                mEmergencyContactAdapter.setContactList(mContactList);
             }
         });
         mViewModel.getCacheContact();
@@ -167,10 +170,10 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
     protected void onStart() {
         super.onStart();
         Log.e(TAG, "onStart: ");
-        Log.e(TAG, "onStart: phoneList = " + phoneList);
-        Log.e(TAG, "onStart: needDial = " + needDial);
-        if (needDial) {
-            if (phoneList != null && !phoneList.isEmpty()) {
+        Log.e(TAG, "onStart: phoneList = " + mContactList);
+        Log.e(TAG, "onStart: needDial = " + mNeedDial);
+        if (mNeedDial) {
+            if (mContactList != null && !mContactList.isEmpty()) {
                 Observable.timer(3, TimeUnit.SECONDS)
                         .compose(RxLifecycle.bindUntilEvent(getLifecycleSubject(), ActivityEvent.DESTROY))
                         .subscribeOn(Schedulers.io())
@@ -185,10 +188,10 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
                             public void onNext(@NonNull Long aLong) {
                                 Log.e(TAG, "timer onNext: " + aLong);
                                 Intent intent = new Intent(Intent.ACTION_CALL);
-                                String phone = phoneList.get(0).getMobile();
-                                isCalling = true;
-                                phoneList.remove(0);
-                                mSosNnmberAdapter.notifyDataSetChanged();
+                                String phone = mContactList.get(0).getMobile();
+                                mCalling = true;
+                                mContactList.remove(0);
+                                mEmergencyContactAdapter.notifyDataSetChanged();
                                 Uri data = Uri.parse("tel:" + phone);
                                 intent.setData(data);
                                 startActivity(intent);
@@ -220,9 +223,9 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
     protected void onDestroy() {
         super.onDestroy();
         Log.e(TAG, "onDestroy: ");
-        if (subscribe != null && !subscribe.isDisposed()) {
-            subscribe.dispose();
-            subscribe = null;
+        if (mDisposable != null && !mDisposable.isDisposed()) {
+            mDisposable.dispose();
+            mDisposable = null;
         }
     }
 
@@ -280,22 +283,22 @@ public class EmergencyActivity extends BaseMvvmActivity<EmergencyViewModel, Acti
 
     public class BtnClick{
         public void call(View view){
-            needDial = true;
+            mNeedDial = true;
 
-            if (phoneList == null || phoneList.isEmpty()) {
+            if (mContactList == null || mContactList.isEmpty()) {
                 Toaster.showLong("没有设置紧急联系人");
                 finish();
                 return;
             }
 
             Intent intent = new Intent(Intent.ACTION_CALL);
-            Uri data = Uri.parse("tel:" + phoneList.get(0).getMobile());
+            Uri data = Uri.parse("tel:" + mContactList.get(0).getMobile());
             intent.setData(data);
             startActivity(intent);
-            phoneList.remove(0);
-            mSosNnmberAdapter.notifyDataSetChanged();
-            isCalling = true;
-            subscribe.dispose();
+            mContactList.remove(0);
+            mEmergencyContactAdapter.notifyDataSetChanged();
+            mCalling = true;
+            mDisposable.dispose();
         }
     }
 }
diff --git a/app/src/main/java/com/xxpatx/os/activity/noti/NoticeActivity.java b/app/src/main/java/com/xxpatx/os/activity/noti/NoticeActivity.java
index 1eeb95d..adf0fda 100644
--- a/app/src/main/java/com/xxpatx/os/activity/noti/NoticeActivity.java
+++ b/app/src/main/java/com/xxpatx/os/activity/noti/NoticeActivity.java
@@ -68,6 +68,7 @@ public class NoticeActivity extends BaseDataBindingActivity {
         mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, maxVolume, AudioManager.FLAG_PLAY_SOUND);
 
         mMediaPlayer = MediaPlayer.create(this, R.raw.ni);
+        mMediaPlayer.setLooping(true);
         // 开始播放
         mMediaPlayer.start();
 
diff --git a/app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java b/app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java
new file mode 100644
index 0000000..4a1c515
--- /dev/null
+++ b/app/src/main/java/com/xxpatx/os/adapter/EmergencyContactAdapter.java
@@ -0,0 +1,74 @@
+package com.xxpatx.os.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.shehuan.niv.NiceImageView;
+import com.xxpatx.os.R;
+import com.xxpatx.os.bean.Contact;
+import com.xxpatx.os.utils.GlideLoadUtils;
+
+import java.util.List;
+
+public class EmergencyContactAdapter extends RecyclerView.Adapter<EmergencyContactAdapter.EmergencyContactHolder> {
+
+    private Context mContext;
+    private List<Contact> mContactList;
+
+    public void setContactList(List<Contact> contactList) {
+        mContactList = contactList;
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public EmergencyContactHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        mContext = parent.getContext();
+        return new EmergencyContactHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_emergency_contact, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull EmergencyContactHolder holder, int position) {
+        Contact contact = mContactList.get(position);
+        GlideLoadUtils.getInstance().glideLoad(mContext, contact.getAvatar(), holder.iv_avatar, R.drawable.default_avatar);
+        holder.tv_name.setText(contact.getName());
+        holder.tv_phone.setText(contact.getMobile());
+        holder.root.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(Intent.ACTION_CALL);
+                Uri data = Uri.parse("tel:" + contact.getMobile());
+                intent.setData(data);
+                mContext.startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return mContactList == null ? 0 : mContactList.size();
+    }
+
+    public class EmergencyContactHolder extends RecyclerView.ViewHolder {
+        ConstraintLayout root;
+        NiceImageView iv_avatar;
+        TextView tv_name, tv_phone;
+
+        public EmergencyContactHolder(@NonNull View itemView) {
+            super(itemView);
+            root = itemView.findViewById(R.id.root);
+            iv_avatar = itemView.findViewById(R.id.iv_avatar);
+            tv_name = itemView.findViewById(R.id.tv_name);
+            tv_phone = itemView.findViewById(R.id.tv_phone);
+        }
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/icon_notice_alarm.png b/app/src/main/res/drawable-hdpi/icon_notice_alarm.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f061cd779d463dabc1119ac8027d3dd14bab592
GIT binary patch
literal 2890
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/bt_alarm_bg.xml b/app/src/main/res/drawable/bt_alarm_bg.xml
new file mode 100644
index 0000000..57478c4
--- /dev/null
+++ b/app/src/main/res/drawable/bt_alarm_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="#0362ff" />
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="8dp" />
+
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bt_sos_bg.xml b/app/src/main/res/drawable/bt_sos_bg.xml
new file mode 100644
index 0000000..d7618f8
--- /dev/null
+++ b/app/src/main/res/drawable/bt_sos_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="@color/sos_text_color" />
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="8dp" />
+
+    <!--    <padding-->
+    <!--        android:bottom="0dp"-->
+    <!--        android:left="8dp"-->
+    <!--        android:right="8dp"-->
+    <!--        android:top="0dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tv_sos_bg.xml b/app/src/main/res/drawable/tv_sos_bg.xml
new file mode 100644
index 0000000..050a706
--- /dev/null
+++ b/app/src/main/res/drawable/tv_sos_bg.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 内部颜色 -->
+    <solid android:color="#303133" />
+    <!-- 圆角的幅度 -->
+
+    <corners android:radius="8dp" />
+
+    <padding
+        android:bottom="8dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="8dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_emergency.xml b/app/src/main/res/layout/activity_emergency.xml
index 238912d..c90e0e2 100644
--- a/app/src/main/res/layout/activity_emergency.xml
+++ b/app/src/main/res/layout/activity_emergency.xml
@@ -15,17 +15,48 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/imageView18"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_marginTop="32dp"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            android:src="@drawable/home_icon_sos"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout12"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/bt_sos_bg"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:maxLines="1"
+                    android:text="SOS"
+                    android:textColor="@color/white"
+                    android:textSize="50sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:maxLines="1"
+                    android:text="紧急服务"
+                    android:textColor="@color/white"
+                    android:textSize="26sp" />
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:id="@+id/textView12"
@@ -42,7 +73,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageView18" />
+            app:layout_constraintTop_toBottomOf="@+id/constraintLayout12" />
 
         <TextView
             android:id="@+id/tv_countdown"
@@ -73,11 +104,11 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_contact"
             android:layout_width="match_parent"
-            android:layout_height="160dp"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@+id/constraintLayout7"
             app:layout_constraintTop_toBottomOf="@+id/textView4"
             tools:layout_editor_absoluteX="32dp"
-            tools:listitem="@layout/item_sosnumber" />
+            tools:listitem="@layout/item_emergency_contact" />
 
         <ImageView
             android:id="@+id/iv_finish"
diff --git a/app/src/main/res/layout/activity_notice_info.xml b/app/src/main/res/layout/activity_notice_info.xml
index 8fd5f13..2f27b3e 100644
--- a/app/src/main/res/layout/activity_notice_info.xml
+++ b/app/src/main/res/layout/activity_notice_info.xml
@@ -12,17 +12,64 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout9"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_margin="8dp"
+            android:background="@drawable/bt_alarm_bg"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteX="8dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ImageView
+                    android:id="@+id/imageView13"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:adjustViewBounds="true"
+
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_notice_alarm"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:text="闹钟提醒"
+                    android:textColor="@color/white"
+                    android:textSize="20sp"
+                    android:visibility="visible"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/imageView13"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="16dp"
             android:text="爱心提醒"
             android:textColor="@color/white"
             android:textSize="30sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/constraintLayout9" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_voice"
@@ -74,11 +121,15 @@
 
             <ImageView
                 android:id="@+id/imageView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="300dp"
+                android:layout_height="300dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
-                android:src="@drawable/icon_nodata" />
+                android:src="@drawable/icon_nodata"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <Button
@@ -94,5 +145,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_emergency_contact.xml b/app/src/main/res/layout/item_emergency_contact.xml
new file mode 100644
index 0000000..641790d
--- /dev/null
+++ b/app/src/main/res/layout/item_emergency_contact.xml
@@ -0,0 +1,77 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/tv_sos_bg"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.shehuan.niv.NiceImageView
+            android:id="@+id/iv_avatar"
+            app:is_circle="true"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/default_avatar" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/iv_avatar"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    tools:text="姓名" />
+
+                <TextView
+                    android:id="@+id/tv_phone"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    tools:text="12345678987" />
+
+            </LinearLayout>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index fef054c..81cfb3b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -30,7 +30,7 @@
     <color name="main_default_text_gray">#808080</color>
     <color name="NormalCircleColor">#99FFFFFF</color>
     <color name="SelectedCircleColor">#ffffff</color>
-    <color name="sos_text_color">#ff5257</color>
+    <color name="sos_text_color">#E84446</color>
 
     <color name="voice_color">#00D56B</color>
     <color name="weathet_bg_color">#ffffff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1e88e32..4398925 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,6 +26,14 @@
         <item name="android:windowBackground">@color/gray</item>
     </style>
 
+    <style name="AppBlackTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorAccent">@color/black</item>
+        <item name="android:windowBackground">@color/black</item>
+    </style>
+
     <style name="activity_styles" parent="Theme.AppCompat.Light.DarkActionBar">
         <!--        <item name="android:windowFullscreen">true</item>-->
         <!--设置dialog的背景-->