[*]将电磁版本的唤醒心跳改成两秒，唤醒之后回到30一次心跳 [*]整体版本页面显示的绝对安全换成了安全 [*]自定义语音修改和优化，添加了无声的选择

陈奇

2018-11-07 3bd6e9023e011336da840e11a9d48bb31c7a0261

 app/src/main/res/layout/ac_register_layout.xml

@@ -12,6 +12,7 @@
        android:layout_gravity="center_horizontal"
        android:layout_marginTop="@dimen/y40"
        android:src="@mipmap/logo_login" />

    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -20,12 +21,14 @@
        android:layout_marginTop="@dimen/x16"
        android:background="@mipmap/bg_edit"
        android:padding="@dimen/x14">

        <ImageView
            android:id="@+id/iv1"
            android:layout_width="@dimen/x16"
            android:layout_height="@dimen/x16"
            android:layout_centerVertical="true"
            android:src="@mipmap/icon_account_phone"/>
            android:src="@mipmap/icon_account_phone" />

        <View
            android:id="@+id/line1"
            android:layout_width="1dp"
@@ -33,35 +36,38 @@
            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/x8"
            android:layout_toRightOf="@+id/iv1"
            android:background="@color/red_txt" />
            android:background="@color/blue_txt" />

        <EditText
            android:id="@+id/et_phone"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_toRightOf="@+id/line1"
            android:layout_centerVertical="true"
            android:hint="请输入注册手机号"
            android:textColorHint="@color/red_txt"
            android:textColor="@color/red_txt"
            android:layout_toRightOf="@+id/line1"
            android:background="@null"
            android:hint="请输入注册手机号"
            android:inputType="number"
            android:paddingLeft="@dimen/x10"
            android:paddingRight="@dimen/x10"
            android:textColor="@color/blue_txt"
            android:textColorHint="@color/blue_txt"
            android:textSize="16sp" />

        <TextView
            android:id="@+id/bt_code"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_alignParentRight="true"
            android:textColor="@color/white"
            android:gravity="center"
            android:background="@mipmap/bt_red_small"
            android:gravity="center"
            android:paddingBottom="@dimen/x2"
            android:paddingLeft="@dimen/x8"
            android:paddingRight="@dimen/x8"
            android:paddingBottom="@dimen/x2"
            android:paddingTop="@dimen/x2"
            android:text="获取验证码"/>
            android:text="获取验证码"
            android:textColor="@color/white" />
    </RelativeLayout>

    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@@ -83,15 +89,15 @@
            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/x8"
            android:layout_toRightOf="@+id/iv2"
            android:background="@color/red_txt" />
            android:background="@color/blue_txt" />
        <EditText
            android:id="@+id/et_code"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:hint="请输入验证码"
            android:inputType="number"
            android:textColorHint="@color/red_txt"
            android:textColor="@color/red_txt"
            android:textColorHint="@color/blue_txt"
            android:textColor="@color/blue_txt"
            android:background="@null"
            android:textSize="16sp"
            android:paddingLeft="@dimen/x10"
@@ -119,7 +125,7 @@
            android:layout_centerVertical="true"
            android:layout_marginLeft="@dimen/x8"
            android:layout_toRightOf="@+id/iv3"
            android:background="@color/red_txt" />
            android:background="@color/blue_txt" />
        <EditText
            android:id="@+id/et_pwd"
            android:layout_width="match_parent"
@@ -127,10 +133,10 @@
            android:layout_toRightOf="@+id/line3"
            android:layout_centerVertical="true"
            android:hint="请输入密码"
            android:textColorHint="@color/red_txt"
            android:textColor="@color/red_txt"
            android:textColorHint="@color/blue_txt"
            android:textColor="@color/blue_txt"
            android:background="@null"
            android:inputType="number"
            android:inputType="textPassword"
            android:paddingLeft="@dimen/x10"
            android:paddingRight="@dimen/x10"
            android:textSize="16sp" />
@@ -142,7 +148,7 @@
        android:layout_marginLeft="@dimen/x20"
        android:layout_marginRight="@dimen/x20"
        android:layout_marginTop="@dimen/x20"
        android:background="@mipmap/bt_red"
        android:background="@mipmap/bt_blue"
        android:gravity="center"
        android:text="注册"
        android:textColor="@color/white"
@@ -154,7 +160,7 @@
        android:layout_height="match_parent"
        android:text="已有账号，返回登录"
        android:gravity="bottom|center_horizontal"
        android:textColor="@color/red_txt"
        android:textColor="@color/blue_txt"
        android:layout_marginBottom="@dimen/x30"
        android:textSize="16sp" />
</LinearLayout>