From 17d97f58265510ceda0b38959a90424ee07b6910 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 13 Nov 2018 11:42:07 +0800
Subject: [PATCH] 1.0.3-1测试版本 [*]修改重新连接的方式 [*]修改商城连接 [*]修改心跳机制 [*]主要针对oppo和vivo机型添加开启定位服务
---
app/src/main/res/layout/ac_register_layout.xml | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/app/src/main/res/layout/ac_register_layout.xml b/app/src/main/res/layout/ac_register_layout.xml
index 1f111e5..57618ba 100644
--- a/app/src/main/res/layout/ac_register_layout.xml
+++ b/app/src/main/res/layout/ac_register_layout.xml
@@ -6,6 +6,7 @@
android:background="@mipmap/bg_login"
android:fitsSystemWindows="true"
android:orientation="vertical">
+
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
@@ -17,8 +18,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/x20"
- android:layout_marginRight="@dimen/x20"
android:layout_marginTop="@dimen/x16"
+ android:layout_marginRight="@dimen/x20"
android:background="@mipmap/bg_edit"
android:padding="@dimen/x14">
@@ -60,10 +61,10 @@
android:layout_alignParentRight="true"
android:background="@mipmap/bt_red_small"
android:gravity="center"
- android:paddingBottom="@dimen/x2"
android:paddingLeft="@dimen/x8"
- android:paddingRight="@dimen/x8"
android:paddingTop="@dimen/x2"
+ android:paddingRight="@dimen/x8"
+ android:paddingBottom="@dimen/x2"
android:text="���������������"
android:textColor="@color/white" />
</RelativeLayout>
@@ -71,17 +72,19 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@mipmap/bg_edit"
android:layout_marginLeft="@dimen/x20"
- android:layout_marginRight="@dimen/x20"
android:layout_marginTop="@dimen/x16"
+ android:layout_marginRight="@dimen/x20"
+ android:background="@mipmap/bg_edit"
android:padding="@dimen/x14">
+
<ImageView
android:id="@+id/iv2"
android:layout_width="@dimen/x16"
android:layout_height="@dimen/x16"
android:layout_centerVertical="true"
- android:src="@mipmap/icon_code"/>
+ android:src="@mipmap/icon_code" />
+
<View
android:id="@+id/line2"
android:layout_width="1dp"
@@ -90,34 +93,38 @@
android:layout_marginLeft="@dimen/x8"
android:layout_toRightOf="@+id/iv2"
android:background="@color/blue_txt" />
+
<EditText
android:id="@+id/et_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/line2"
+ android:background="@null"
android:hint="������������������"
android:inputType="number"
- android:textColorHint="@color/blue_txt"
- android:textColor="@color/blue_txt"
- android:background="@null"
- android:textSize="16sp"
android:paddingLeft="@dimen/x10"
android:paddingRight="@dimen/x10"
- android:layout_toRightOf="@id/line2"/>
+ android:textColor="@color/blue_txt"
+ android:textColorHint="@color/blue_txt"
+ android:textSize="16sp" />
</RelativeLayout>
+
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/x20"
- android:layout_marginRight="@dimen/x20"
android:layout_marginTop="@dimen/x14"
+ android:layout_marginRight="@dimen/x20"
android:background="@mipmap/bg_edit"
android:padding="@dimen/x14">
+
<ImageView
android:id="@+id/iv3"
android:layout_width="@dimen/x16"
android:layout_height="@dimen/x16"
android:layout_centerVertical="true"
- android:src="@mipmap/icon_password"/>
+ android:src="@mipmap/icon_password" />
+
<View
android:id="@+id/line3"
android:layout_width="1dp"
@@ -126,41 +133,44 @@
android:layout_marginLeft="@dimen/x8"
android:layout_toRightOf="@+id/iv3"
android:background="@color/blue_txt" />
+
<EditText
android:id="@+id/et_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/line3"
android:layout_centerVertical="true"
- android:hint="���������������"
- android:textColorHint="@color/blue_txt"
- android:textColor="@color/blue_txt"
+ android:layout_toRightOf="@+id/line3"
android:background="@null"
+ android:hint="���������������"
android:inputType="textPassword"
android:paddingLeft="@dimen/x10"
android:paddingRight="@dimen/x10"
+ android:textColor="@color/blue_txt"
+ android:textColorHint="@color/blue_txt"
android:textSize="16sp" />
</RelativeLayout>
+
<Button
android:id="@+id/bt_sure"
android:layout_width="match_parent"
android:layout_height="@dimen/x40"
android:layout_marginLeft="@dimen/x20"
- android:layout_marginRight="@dimen/x20"
android:layout_marginTop="@dimen/x20"
+ android:layout_marginRight="@dimen/x20"
android:background="@mipmap/bt_blue"
android:gravity="center"
android:text="������"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textSize="16sp" />
+
<TextView
android:id="@+id/tv_login"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:text="���������������������������"
- android:gravity="bottom|center_horizontal"
- android:textColor="@color/blue_txt"
android:layout_marginBottom="@dimen/x30"
+ android:gravity="bottom|center_horizontal"
+ android:text="���������������������������"
+ android:textColor="@color/blue_txt"
android:textSize="16sp" />
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0