Skip to content

T
TangKuPos
Commit bcadfa76 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 48a3a245 21eaf788
Show whitespace changes
Inline Side-by-side
Showing with 37736 additions and 242 deletions
app/src/main/assets/province.json 0 → 100644
View file @ bcadfa76
This source diff could not be displayed because it is too large. You can view the blob instead.
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ bcadfa76
...@@ -48,7 +48,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin ...@@ -48,7 +48,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
// } // }
LogUtils.e("LoginActivity + initView"); LogUtils.e("LoginActivity + initView");
loadRootFragment(R.id.fra, mPresenter.signInFragment); loadRootFragment(R.id.fra, mPresenter.bindingCounterFragment);
mViewBinding.setText1(": 400 - 800 - 9406"); mViewBinding.setText1(": 400 - 800 - 9406");
mViewBinding.setOnClickListener(v -> { mViewBinding.setOnClickListener(v -> {
switch (v.getId()) { switch (v.getId()) {
......
app/src/main/res/layout/fragment_binding_counter.xml
View file @ bcadfa76
...@@ -11,21 +11,10 @@ ...@@ -11,21 +11,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/all_margin"
android:background="@color/appBack" android:background="@color/appBack"
android:orientation="vertical">' android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView <include layout="@layout/title"/>
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/create_store_logo"/>
</LinearLayout>
<LinearLayout <LinearLayout
...@@ -43,21 +32,22 @@ ...@@ -43,21 +32,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="@string/binding_counter_tv_nickname" android:text="@string/binding_counter_tv_nickname"
android:textColor="@color/white"/> android:textColor="@color/gary"
android:textSize="@dimen/text_three_title"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="北京浙星信息技术有限公司" android:text="北京浙星信息技术有限公司"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -69,21 +59,22 @@ ...@@ -69,21 +59,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="@string/binding_counter_tv_in_store" android:text="@string/binding_counter_tv_in_store"
android:textColor="@color/white"/> android:textColor="@color/gary"
android:textSize="@dimen/text_three_title"/>
<TextView <TextView
android:id="@+id/tv_in_storename" android:id="@+id/tv_in_storename"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="丰台万达店" android:text="丰台万达店"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -95,21 +86,22 @@ ...@@ -95,21 +86,22 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="@string/binding_counter_tv_store_address" android:text="@string/binding_counter_tv_store_address"
android:textColor="@color/white"/> android:textColor="@color/gary"
android:textSize="@dimen/text_three_title"/>
<TextView <TextView
android:id="@+id/tv_storetype" android:id="@+id/tv_storetype"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/et_padding" android:padding="@dimen/all_padding"
android:text="北京市丰台区万达广场一区" android:text="北京市丰台区万达广场一区"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -121,31 +113,25 @@ ...@@ -121,31 +113,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:orientation="vertical">
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/all_padding">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_binding_counter" android:text="@string/binding_counter_tv_binding_counter"
android:textColor="@color/white"/> android:textColor="@color/gary"
android:textSize="@dimen/text_three_title"/>
<org.angmarch.views.NiceSpinner
android:id="@+id/counter_spinner"
android:layout_width="@dimen/nicespinner_width"
android:layout_height="@dimen/counter_input_height"
android:background="@drawable/transparent_border"
android:gravity="center_vertical"
android:paddingLeft="@dimen/et_padding"
android:text=""
android:textSize="@dimen/et_textsize"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_new_counter" android:id="@+id/ll_new_counter"
android:layout_width="@dimen/new_counter_btn_width" android:layout_width="@dimen/new_counter_btn_width"
android:layout_height="@dimen/new_counter_btn_height" android:layout_height="@dimen/new_counter_btn_height"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left" android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:background="@drawable/blue_border" android:background="@drawable/blue_border"
android:gravity="center" android:gravity="center"
...@@ -165,6 +151,19 @@ ...@@ -165,6 +151,19 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
</RelativeLayout>
<org.angmarch.views.NiceSpinner
android:id="@+id/counter_spinner"
android:layout_width="@dimen/et_width"
android:layout_height="@dimen/counter_input_select"
android:layout_marginLeft="@dimen/all_margin_left"
android:background="@drawable/transparent_border"
android:gravity="center_vertical"
android:text=""
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
...@@ -172,15 +171,15 @@ ...@@ -172,15 +171,15 @@
android:id="@+id/ll_already_new_counter" android:id="@+id/ll_already_new_counter"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/all_margin_left"
android:text="@string/binding_counter_tv_binding_counter" android:text="@string/binding_counter_tv_binding_counter"
android:textColor="@color/white"/> android:textColor="@color/white"/>
...@@ -190,11 +189,11 @@ ...@@ -190,11 +189,11 @@
android:layout_width="@dimen/nicespinner_width" android:layout_width="@dimen/nicespinner_width"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="@dimen/et_padding" android:paddingLeft="@dimen/all_margin_left"
android:textColor="@color/white"
android:textStyle="bold"
android:text="10号款台（新增）" android:text="10号款台（新增）"
android:textSize="@dimen/et_textsize"/> android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
<LinearLayout <LinearLayout
android:layout_width="@dimen/new_counter_btn_width" android:layout_width="@dimen/new_counter_btn_width"
...@@ -237,7 +236,7 @@ ...@@ -237,7 +236,7 @@
<View <View
android:layout_width="@dimen/counter_tv_width" android:layout_width="@dimen/counter_tv_width"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/blue"></View> android:background="@color/red_guanyu"></View>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -247,13 +246,9 @@ ...@@ -247,13 +246,9 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
...@@ -261,12 +256,12 @@ ...@@ -261,12 +256,12 @@
android:layout_width="@dimen/create_store_btn_width" android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height" android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/blue_border" android:background="@drawable/red_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:visibility="gone"
android:text="@string/login_createstorefragment_btn_last" android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
android:visibility="gone"
/> />
<Button <Button
...@@ -274,7 +269,7 @@ ...@@ -274,7 +269,7 @@
android:layout_width="@dimen/create_store_btn_width" android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height" android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/blue_border" android:background="@drawable/red_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next" android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white" android:textColor="@color/white"
......
app/src/main/res/layout/fragment_create_store.xml
View file @ bcadfa76
...@@ -13,40 +13,30 @@ ...@@ -13,40 +13,30 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack"
android:orientation="vertical" android:orientation="vertical">
android:padding="@dimen/all_margin">'
<LinearLayout <include layout="@layout/title"></include>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:src="@mipmap/create_store_logo"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:layout_marginTop="@dimen/all_padding"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_nickname" android:text="@string/login_createstorefragment_tv_nickname"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
...@@ -66,19 +56,12 @@ ...@@ -66,19 +56,12 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_nickname" android:id="@+id/et_nickname"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint" android:hint="@string/login_createstorefragment_et_nickname_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -86,30 +69,25 @@ ...@@ -86,30 +69,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storename" android:text="@string/login_createstorefragment_tv_storename"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_storename" android:id="@+id/et_storename"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_storename_hint" android:hint="@string/login_createstorefragment_et_storename_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -148,29 +126,26 @@ ...@@ -148,29 +126,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storeaddress" android:text="@string/login_createstorefragment_tv_storeaddress"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_storeaddress" android:id="@+id/tv_storeaddress"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:drawableRight="@mipmap/createstore_drop_down" android:drawableRight="@mipmap/createstore_drop_down"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_tv_storeaddress_hint" android:hint="@string/login_createstorefragment_tv_storeaddress_hint"
android:maxLength="11" android:maxLength="11"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:padding="@dimen/et_padding" />
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -178,29 +153,25 @@ ...@@ -178,29 +153,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:textColor="@color/white"/> android:text="@string/login_createstorefragment_tv_storeaddressmessage"
android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/tv_storedetailedaddress" android:id="@+id/tv_storedetailedaddress"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="15" android:ems="15"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_storedetailedaddress_hint" android:hint="@string/login_createstorefragment_et_storedetailedaddress_hint"
android:lines="1" android:lines="1"
android:maxLength="30" android:maxLength="30"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
...@@ -211,31 +182,25 @@ ...@@ -211,31 +182,25 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<View <View
android:layout_width="@dimen/et_width" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/blue"></View> android:background="@color/red_guanyu"></View>
</LinearLayout> </LinearLayout>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_marginTop="@dimen/bar_margin" android:layout_marginTop="@dimen/bar_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/et_width" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<Button <Button
...@@ -243,7 +208,7 @@ ...@@ -243,7 +208,7 @@
android:layout_width="@dimen/create_store_btn_width" android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height" android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@drawable/blue_border" android:background="@drawable/red_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last" android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white" android:textColor="@color/white"
...@@ -254,13 +219,13 @@ ...@@ -254,13 +219,13 @@
android:layout_width="@dimen/create_store_btn_width" android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height" android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:background="@drawable/blue_border" android:background="@drawable/red_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next" android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_input_password.xml
View file @ bcadfa76
...@@ -55,16 +55,15 @@ ...@@ -55,16 +55,15 @@
<Button <Button
android:id="@+id/btn_next" android:id="@+id/btn_next"
style="@style/view_base" style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo" android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next" android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white" />
android:textSize="@dimen/et_textsize"/>
<RelativeLayout <RelativeLayout
style="@style/view_base" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo"> android:layout_marginTop="@dimen/et_margin_logo">
<TextView <TextView
...@@ -72,6 +71,7 @@ ...@@ -72,6 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="已有账号 >" android:text="已有账号 >"
android:textColor="@color/white"/> android:textColor="@color/white"/>
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ bcadfa76
...@@ -13,8 +13,15 @@ ...@@ -13,8 +13,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack"
android:orientation="vertical">
<include layout="@layout/title"></include>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical">' android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
...@@ -80,13 +87,11 @@ ...@@ -80,13 +87,11 @@
<Button <Button
android:id="@+id/btn_next" android:id="@+id/btn_next"
style="@style/view_base" style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo" android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next" android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white" />
android:textSize="@dimen/et_textsize"/>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -97,13 +102,13 @@ ...@@ -97,13 +102,13 @@
android:id="@+id/tv_existing_account" android:id="@+id/tv_existing_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="已有账号 >" android:text="已有账号 >"
android:textColor="@color/white"/> android:textColor="@color/white"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/title.xml 0 → 100644
View file @ bcadfa76
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/appBack"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/title_height"
android:layout_height="match_parent"
android:gravity="center"
android:onClick="@{onClickListener}"
android:padding="16dp"
android:src="@mipmap/back_white"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="16dp"
android:text="标题"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ bcadfa76
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
<dimen name="text_primary_title">28sp</dimen> <dimen name="text_primary_title">28sp</dimen>
<!--二级标题--> <!--二级标题-->
<dimen name="text_secondary_title">20sp</dimen> <dimen name="text_secondary_title">20sp</dimen>
<!--三级标题-->
<dimen name="text_three_title">18sp</dimen>
<!--标题控件宽度--> <!--标题控件宽度-->
<dimen name="title_width">84dp</dimen> <dimen name="title_width">84dp</dimen>
<!--Dialog--> <!--Dialog-->
...@@ -91,13 +93,13 @@ ...@@ -91,13 +93,13 @@
<dimen name="smscodefragment_drop_get_sms_width">84dp</dimen> <dimen name="smscodefragment_drop_get_sms_width">84dp</dimen>
<!--创建门店界面--> <!--创建门店界面-->
<dimen name="item_title_width">80dp</dimen> <dimen name="item_title_width">80dp</dimen>
<dimen name="item_title_margin">15dp</dimen> <dimen name="item_title_margin">5dp</dimen>
<dimen name="bar_margin">15dp</dimen> <dimen name="bar_margin">15dp</dimen>
<dimen name="create_store_btn_width">110dp</dimen> <dimen name="create_store_btn_width">110dp</dimen>
<dimen name="create_store_btn_height">40dp</dimen> <dimen name="create_store_btn_height">40dp</dimen>
<!--绑定款台界面--> <!--绑定款台界面-->
<dimen name="new_counter_btn_width">150dp</dimen> <dimen name="new_counter_btn_width">120dp</dimen>
<dimen name="new_counter_btn_height">40dp</dimen> <dimen name="new_counter_btn_height">30dp</dimen>
<dimen name="new_counter_btn_margin_left">10dp</dimen> <dimen name="new_counter_btn_margin_left">10dp</dimen>
<dimen name="bingding_counter_btn_width">110dp</dimen> <dimen name="bingding_counter_btn_width">110dp</dimen>
<dimen name="bingding_counter_btn_height">40dp</dimen> <dimen name="bingding_counter_btn_height">40dp</dimen>
...@@ -105,8 +107,9 @@ ...@@ -105,8 +107,9 @@
<dimen name="nicespinner_height">40dp</dimen> <dimen name="nicespinner_height">40dp</dimen>
<dimen name="counter_bar_width">350dp</dimen> <dimen name="counter_bar_width">350dp</dimen>
<dimen name="counter_input_height">45dp</dimen> <dimen name="counter_input_height">45dp</dimen>
<dimen name="counter_input_select">35dp</dimen>
<dimen name="counter_tv_width">590dp</dimen> <dimen name="counter_tv_width">590dp</dimen>
<dimen name="center_height">230dp</dimen> <dimen name="center_height">380dp</dimen>
<!-- 副屏 --> <!-- 副屏 -->
......
app/src/main/res/values/strings.xml
View file @ bcadfa76
...@@ -227,6 +227,7 @@ ...@@ -227,6 +227,7 @@
<string name="login_createstorefragment_tv_storename">门店名称</string> <string name="login_createstorefragment_tv_storename">门店名称</string>
<string name="login_createstorefragment_tv_storetype">门店类型</string> <string name="login_createstorefragment_tv_storetype">门店类型</string>
<string name="login_createstorefragment_tv_storeaddress">门店地址</string> <string name="login_createstorefragment_tv_storeaddress">门店地址</string>
<string name="login_createstorefragment_tv_storeaddressmessage">详细地址</string>
<string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string> <string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string>
<string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string> <string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string>
<string name="login_createstorefragment_et_nickname_hint">请输入昵称</string> <string name="login_createstorefragment_et_nickname_hint">请输入昵称</string>
......
app/src/main/res/values/styles.xml
View file @ bcadfa76
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<style name="view_base" parent="android:ButtonBar"> <style name="view_base" parent="android:ButtonBar">
<item name="android:layout_height">@dimen/et_height</item> <item name="android:layout_height">@dimen/et_height</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center</item>
<item name="android:layout_marginLeft">@dimen/all_margin_left</item> <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:layout_marginRight">@dimen/all_margin_left</item> <item name="android:layout_marginRight">@dimen/all_margin_left</item>
</style> </style>
...@@ -282,8 +282,16 @@ ...@@ -282,8 +282,16 @@
<item name=" android:background">@drawable/transparent_border</item> <item name=" android:background">@drawable/transparent_border</item>
<item name="android:padding">@dimen/et_padding</item> <item name="android:padding">@dimen/et_padding</item>
<item name=" android:saveEnabled">false</item> <item name=" android:saveEnabled">false</item>
<item name="android:gravity">center|left</item>
<item name="android:textSize">@dimen/et_textsize</item> <item name="android:textSize">@dimen/et_textsize</item>
<item name="android:textColorHint">@color/hint</item> <item name="android:textColorHint">@color/hint</item>
</style> </style>
<style name="button" parent="view_base">
<item name=" android:background">@drawable/red_border</item>
<item name=" android:saveEnabled">false</item>
<item name="android:textSize">@dimen/et_textsize</item>
<item name=" android:textColor">@color/white</item>
<item name="android:textColorHint">@color/hint</item>
</style>
</resources> </resources>
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