Commit 9e915da7 authored by 王海's avatar 王海

修改部分ui

parent 6b1f03b4
......@@ -58,9 +58,8 @@ public final class SystemUtil {
}
}
// return deviceSN;
return "548496";
return "54849689";
}
/**
* 获取应用名称
*
......@@ -80,8 +79,7 @@ public final class SystemUtil {
}
/**
*
*获取是否存在NavigationBar
* 获取是否存在NavigationBar
*/
public static boolean checkDeviceHasNavigationBar(Context context) {
......
......@@ -55,6 +55,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:paddingLeft="@dimen/all_padding"
android:text="启用状态:"
android:textColor="@color/black_baozheng"
......@@ -181,7 +182,7 @@
android:drawablePadding="@dimen/all_bounced_spacing"
android:gravity="left"
android:paddingLeft="@dimen/all_padding"
android:text="订单实收满 "
android:text="实收满: "
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -232,7 +233,7 @@
android:drawablePadding="@dimen/all_bounced_spacing"
android:gravity="left"
android:paddingLeft="@dimen/all_padding"
android:text="可以使用 "
android:text="可以使用:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......
......@@ -73,6 +73,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="规则名称:"
android:textColor="@color/black_baozheng"
......@@ -112,6 +114,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding"
android:text="启用状态:"
android:textColor="@color/black"
......
......@@ -46,6 +46,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="活动名称:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -83,6 +85,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="启用状态:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
......@@ -163,7 +167,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_weight="2.5"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="优惠券面值:"
......@@ -186,7 +190,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_bounced_padding"
android:layout_weight="2"
android:gravity="right"
android:paddingLeft="@dimen/all_padding"
......@@ -211,7 +214,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_weight="2.5"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="券有效期:"
......@@ -233,6 +236,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_bounced_padding"
android:layout_weight="2"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
......@@ -253,7 +257,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_weight="2.5"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="订单金额满:"
......@@ -300,7 +304,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_weight="2.5"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:text="每单使用:"
......
......@@ -61,11 +61,10 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="@dimen/all_seach_height"
android:layout_weight="1"
android:hint="@string/vip_seach_hint"
android:inputType="number"
android:maxLength="11"
android:hint="@string/vip_seach_hint"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"/>
......
......@@ -120,6 +120,8 @@
android:id="@+id/et_shop_Num"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/selector_edit_frame_blue_background"
android:digits="1234567890"
......@@ -175,6 +177,8 @@
android:id="@+id/et_shop_Num_edit"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:background="@drawable/selector_edit_frame_blue_background"
android:digits="1234567890"
android:ems="5"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment