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
Expand all Hide 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 diff is collapsed.
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
// }
LogUtils.e("LoginActivity + initView");
loadRootFragment(R.id.fra, mPresenter.signInFragment);
loadRootFragment(R.id.fra, mPresenter.bindingCounterFragment);
mViewBinding.setText1(": 400 - 800 - 9406");
mViewBinding.setOnClickListener(v -> {
switch (v.getId()) {
......
app/src/main/res/layout/fragment_input_password.xml
View file @ bcadfa76
......@@ -55,16 +55,15 @@
<Button
android:id="@+id/btn_next"
style="@style/view_base"
style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
/>
<RelativeLayout
style="@style/view_base"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
......@@ -72,6 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ bcadfa76
......@@ -13,97 +13,102 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
android:gravity="center"
android:orientation="vertical">'
android:orientation="vertical">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<include layout="@layout/title"></include>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/et_height"
android:layout_marginTop="@dimen/et_margin_logo">
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/et_height"
android:layout_marginTop="@dimen/et_margin_logo">
<EditText
android:id="@+id/et_phone"
style="@style/editText"
android:digits="1234567890"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
android:inputType="phone|number"
android:maxLength="11"/>
<LinearLayout
android:layout_width="@dimen/smscodefragment_drop_get_sms_width"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:orientation="horizontal">
<View
android:layout_width="@dimen/all_line_width"
android:layout_height="match_parent"
android:background="@color/blue"></View>
<TextView
android:id="@+id/tv_getsms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:onClick="@{onClickListener}"
android:paddingBottom="@dimen/et_padding"
android:paddingTop="@dimen/et_padding"
android:text="@string/login_smscodefragment_tv_get_sms"
android:textColor="@color/blue"/>
</LinearLayout>
</RelativeLayout>
<EditText
android:id="@+id/et_phone"
android:id="@+id/et_sms_code"
style="@style/editText"
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:inputType="phone|number"
android:maxLength="11"/>
android:maxLength="11"
/>
<LinearLayout
android:layout_width="@dimen/smscodefragment_drop_get_sms_width"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:orientation="horizontal">
<Button
android:id="@+id/btn_next"
style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
/>
<View
android:layout_width="@dimen/all_line_width"
android:layout_height="match_parent"
android:background="@color/blue"></View>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
android:id="@+id/tv_getsms"
android:layout_width="match_parent"
android:id="@+id/tv_existing_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:paddingBottom="@dimen/et_padding"
android:paddingTop="@dimen/et_padding"
android:text="@string/login_smscodefragment_tv_get_sms"
android:textColor="@color/blue"/>
</LinearLayout>
</RelativeLayout>
<EditText
android:id="@+id/et_sms_code"
style="@style/editText"
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:inputType="phone|number"
android:maxLength="11"
/>
<Button
android:id="@+id/btn_next"
style="@style/view_base"
android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
android:id="@+id/tv_existing_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</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 @@
<dimen name="text_primary_title">28sp</dimen>
<!--二级标题-->
<dimen name="text_secondary_title">20sp</dimen>
<!--三级标题-->
<dimen name="text_three_title">18sp</dimen>
<!--标题控件宽度-->
<dimen name="title_width">84dp</dimen>
<!--Dialog-->
......@@ -91,13 +93,13 @@
<dimen name="smscodefragment_drop_get_sms_width">84dp</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="create_store_btn_width">110dp</dimen>
<dimen name="create_store_btn_height">40dp</dimen>
<!--绑定款台界面-->
<dimen name="new_counter_btn_width">150dp</dimen>
<dimen name="new_counter_btn_height">40dp</dimen>
<dimen name="new_counter_btn_width">120dp</dimen>
<dimen name="new_counter_btn_height">30dp</dimen>
<dimen name="new_counter_btn_margin_left">10dp</dimen>
<dimen name="bingding_counter_btn_width">110dp</dimen>
<dimen name="bingding_counter_btn_height">40dp</dimen>
......@@ -105,8 +107,9 @@
<dimen name="nicespinner_height">40dp</dimen>
<dimen name="counter_bar_width">350dp</dimen>
<dimen name="counter_input_height">45dp</dimen>
<dimen name="counter_input_select">35dp</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 @@
<string name="login_createstorefragment_tv_storename">门店名称</string>
<string name="login_createstorefragment_tv_storetype">门店类型</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_storeaddress_hint">请选择门店地址（省/市/县）</string>
<string name="login_createstorefragment_et_nickname_hint">请输入昵称</string>
......
app/src/main/res/values/styles.xml
View file @ bcadfa76
......@@ -273,7 +273,7 @@
<style name="view_base" parent="android:ButtonBar">
<item name="android:layout_height">@dimen/et_height</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_marginRight">@dimen/all_margin_left</item>
</style>
......@@ -282,8 +282,16 @@
<item name=" android:background">@drawable/transparent_border</item>
<item name="android:padding">@dimen/et_padding</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:textColorHint">@color/hint</item>
</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>
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