Skip to content

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

Merge remote-tracking branch 'origin/master'

parents e4258168 c4fa9ba3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 570 additions and 428 deletions
app/src/main/AndroidManifest.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.xingdata.zzdpos">
package="com.xingdata.zzdpos">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SEND_SMS"/>
<application
android:name=".App"
......@@ -19,15 +19,18 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/main_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden">
android:windowSoftInputMode="adjustUnspecified|stateHidden" >
</activity>
<activity
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
......@@ -46,13 +49,7 @@
<activity
android:name=".ui.payment.PaymentActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ 340a980f
......@@ -48,7 +48,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
// }
LogUtils.e("LoginActivity + initView");
loadRootFragment(R.id.fra, mPresenter.bindingCounterFragment);
loadRootFragment(R.id.fra, mPresenter.signInFragment);
mViewBinding.setText1(": 400 - 800 - 9406");
mViewBinding.setOnClickListener(v -> {
switch (v.getId()) {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/BindingCounterFragment.java
View file @ 340a980f
......@@ -4,10 +4,6 @@ import android.view.View;
import android.widget.AdapterView;
import com.blankj.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -16,6 +12,10 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
/**
* 绑定款台界面
......@@ -39,6 +39,13 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("绑定款台");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
if (LoginPresenter.userStoreInfo.getMerchant() != null) {
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
());
......@@ -94,7 +101,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
}
break;
case R.id.ll_new_counter: {
isNewCounterCount= 0;
isNewCounterCount = 0;
setNewCounter(true);
}
......@@ -109,7 +116,6 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
/**
* 设置新增款台或者绑定款台的ui信息
*
*/
private void setNewCounter(Boolean b) {
if (b) {
......@@ -129,7 +135,8 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
mShops = shops;
setType();
}
private void setType(){
private void setType() {
if (mShops != null && mShops.getCashers() != null && mShops.getCashers().size() > 0) {
isNewCounterCount = 1;
} else {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java
View file @ 340a980f
......@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.databinding.FragmentChoiceStoreBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
......@@ -33,7 +34,13 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("绑定款台");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java
View file @ 340a980f
......@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
......@@ -46,6 +47,13 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("创建门店");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
if (startway == 1) {
mViewBinding.etNickname.setVisibility(View.VISIBLE);
mViewBinding.tvNickname.setVisibility(View.GONE);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/InputPasswordFragment.java
View file @ 340a980f
......@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.login.fragment;
import android.text.InputFilter;
import android.text.InputType;
import android.view.View;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
......@@ -10,6 +11,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentInputPasswordBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
/**
* 输入密码界面
......@@ -32,6 +34,13 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("输入密码");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
InputFilter[] inputFilter = new InputFilter[]{new InputFilter.LengthFilter(6)};
mViewBinding.etOnePassword.setInputType(InputType.TYPE_CLASS_NUMBER | InputType
.TYPE_NUMBER_VARIATION_PASSWORD);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ 340a980f
......@@ -45,7 +45,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
.TYPE_NUMBER_VARIATION_PASSWORD);
mViewBinding.etPwd.setFilters(inputFilter);
if (SPUtils.getInstance().getInt(C.SP_KEY.IS_SHOW_SIGNUP_BTN) != 0) {
mViewBinding.tvSignUp.setVisibility
(View.INVISIBLE);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java
View file @ 340a980f
package com.xingdata.zzdpos.ui.login.fragment;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSmsCodeBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.concurrent.TimeUnit;
......@@ -39,6 +42,13 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("发送验证码");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
// mViewBinding.tvTwo.setOnClickListener(view -> mPresenter.checkSmsCode("",""));
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
......@@ -51,7 +61,7 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
case R.id.btn_next: {
mLoadingDialog.show((BaseActivity) getActivity());
mPresenter.checkSmsCode(mViewBinding.etPhone.getText().toString(),
mViewBinding.etSmsCode.getText().toString(),mLoadingDialog);
mViewBinding.etSmsCode.getText().toString(), mLoadingDialog);
// start(mPresenter.inputPasswordFragment);
}
......
app/src/main/res/drawable/blue_border.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_shape_radius" />
<corners android:radius="@dimen/all_radius" />
<solid android:color="@color/blue" />
<solid android:color="@color/blue_mawu" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/gra_border.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_shape_radius" />
<corners android:radius="@dimen/all_radius" />
<solid android:color="@color/gray" />
<solid android:color="@color/gray_huanggai" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/gray_line.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">
<stroke
android:width="2dp"
android:color="@color/gray_huanggai"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/red_border_allradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_radius" />
<solid android:color="@color/red_guanyu" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_gray_button_background.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_blue_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke" />
......
app/src/main/res/drawable/selector_gradient_gray_button_background_noradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless_noradius" android:state_pressed="true" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke_noradius" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke_noradius" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_blue_button_background.xml → app/src/main/res/drawable/selector_gradient_red_button_background.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_blue_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_grey_round_rectangle_strokeless" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_blue_round_rectangle" />
<item android:drawable="@drawable/shape_gradient_red_round_rectangle" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_red_button_background_noradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless_noradius" android:state_pressed="true"/>
<item android:drawable="@drawable/shape_grey_round_rectangle_strokeless_noradius" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_gradient_red_round_rectangle_noradius"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_blue_round_rectangle.xml → app/src/main/res/drawable/shape_gradient_gray_round_rectangle_stroke_noradius.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<stroke
android:width="@dimen/all_line_width"
android:width="@dimen/all_slight_line_width"
android:color="@color/passive_stroke" />
<gradient
android:angle="90"
android:endColor="@color/positive_gradient_end"
android:startColor="@color/positive_gradient_start" />
android:endColor="@color/passive_gradient_end"
android:startColor="@color/passive_gradient_start" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_red_round_rectangle.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius"/>
<stroke
android:width="@dimen/all_line_width"
android:color="@color/red_guanyu"/>
<gradient
android:angle="90"
android:endColor="@color/red_guanyu"
android:startColor="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_red_round_rectangle_noradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/all_line_width"
android:color="@color/red_guanyu"/>
<gradient
android:angle="90"
android:endColor="@color/red_guanyu"
android:startColor="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_round_rectangle_stroke.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<corners android:radius="@dimen/all_shape_radius"/>
<stroke
android:width="@dimen/edit_border"
android:color="@color/gary" />
android:color="@color/gary"/>
<solid android:color="@color/lyt_main_bg" />
<solid android:color="@color/lyt_main_bg"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_round_rectangle_stroke_noradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/edit_border"
android:color="@color/gary"/>
<solid android:color="@color/lyt_main_bg"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_grey_round_rectangle_strokeless.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/gray" />
......
app/src/main/res/drawable/shape_blue_round_rectangle_strokeless.xml → app/src/main/res/drawable/shape_grey_round_rectangle_strokeless_noradius.xml
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/pressed_solid" />
<solid android:color="@color/gray" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_round_rectangle_strokeless.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius"/>
<solid android:color="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_round_rectangle_strokeless_noradius.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/singleline.xml 0 → 100644
View file @ 340a980f
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/gray_huanggai"/>
</shape>
</item>
<item android:bottom="1dp">
<shape>
<solid android:color="@color/appBack"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_error_dialog.xml
View file @ 340a980f
......@@ -111,7 +111,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_gradient_blue_button_background"
android:background="@drawable/selector_gradient_red_button_background"
android:onClick="@{onClickListener}"
android:text="@{ok}"
android:textColor="@color/white"/>
......
app/src/main/res/layout/dialog_prompt.xml
View file @ 340a980f
......@@ -68,7 +68,7 @@
<Button
android:id="@+id/btn_custom"
style="@style/button_positive"
style="@style/button_positive_allradius"
android:layout_width="@dimen/dialog_button_width"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
......@@ -87,7 +87,7 @@
<Button
android:id="@+id/btn_cancel"
style="@style/button_positive_bg_gray"
style="@style/button_positive_bg_gray_noradius"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -95,7 +95,7 @@
<Button
android:id="@+id/btn_ok"
style="@style/button_positive"
style="@style/button_positive_noradius"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......
app/src/main/res/layout/fragment_create_store.xml
View file @ 340a980f
......@@ -9,17 +9,19 @@
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack">
<include layout="@layout/title"></include>
<include
android:id="@+id/ic_title"
layout="@layout/title"></include>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ic_title"
android:layout_marginTop="@dimen/all_padding"
android:orientation="vertical">
......@@ -42,6 +44,7 @@
android:id="@+id/tv_nickname"
android:layout_width="@dimen/et_width"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint"
......@@ -140,12 +143,12 @@
<TextView
android:id="@+id/tv_storeaddress"
style="@style/editText"
android:drawablePadding="@dimen/all_padding"
android:drawableRight="@mipmap/createstore_drop_down"
android:ems="10"
android:hint="@string/login_createstorefragment_tv_storeaddress_hint"
android:maxLength="11"
android:onClick="@{onClickListener}"
/>
android:onClick="@{onClickListener}"/>
</LinearLayout>
<LinearLayout
......@@ -175,66 +178,37 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/red_guanyu"></View>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
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:gravity="center"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_last"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:background="@drawable/red_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_next"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:background="@drawable/red_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
<org.angmarch.views.NiceSpinner
android:id="@+id/nice_spinner"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="123"/>
</LinearLayout>
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/all_margin"
android:padding="@dimen/all_padding">
<Button
android:id="@+id/btn_last"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_next"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_input_password.xml
View file @ 340a980f
......@@ -14,68 +14,75 @@
android:layout_height="match_parent"
android:background="@color/appBack"
android:gravity="center"
android:orientation="vertical">'
android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title"/>
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<EditText
android:id="@+id/et_one_password"
style="@style/editText"
android:background="@drawable/transparent_border"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="11"/>
<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="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
</RelativeLayout>
<EditText
android:id="@+id/et_one_password"
style="@style/editText"
android:background="@drawable/transparent_border"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="11"/>
<EditText
android:id="@+id/et_two_password"
style="@style/editText"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
</RelativeLayout>
<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"
/>
<EditText
android:id="@+id/et_two_password"
style="@style/editText"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
<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_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
<Button
android:id="@+id/btn_next"
style="@style/button"
android:layout_marginTop="@dimen/et_margin_logo"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
android:text="@string/login_smscodefragment_btn_next"
/>
<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_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_sms_code.xml
View file @ 340a980f
......@@ -15,7 +15,7 @@
android:background="@color/appBack"
android:orientation="vertical">
<include layout="@layout/title"></include>
<include android:id="@+id/ic_title" layout="@layout/title"></include>
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/title.xml
View file @ 340a980f
......@@ -13,7 +13,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/appBack"
android:background="@drawable/singleline"
android:orientation="horizontal">
......@@ -31,10 +31,9 @@
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:textSize="@dimen/text_secondary_title"
android:textStyle="bold"/>
......
app/src/main/res/values/colors.xml
View file @ 340a980f
......@@ -14,6 +14,7 @@
<color name="black_transparent">#88000000</color>
<color name="borderYello">#ffa002</color>
<color name="red900">#B71c1c</color>
<color name="bg">#f5f7f9</color>
<!--提示颜色-->
<color name="succ">#2484e8</color>
<color name="error">#fb3b3b</color>
......
app/src/main/res/values/dimens.xml
View file @ 340a980f
<resources>
<!--ALL-->
<dimen name="all_shape_radius">3dp</dimen>
<dimen name="all_radius">100dp</dimen>
<dimen name="all_line_width">0.5dp</dimen>
<dimen name="all_slight_line_width">0.5dp</dimen>
<dimen name="all_margin">18dp</dimen>
......@@ -41,7 +42,7 @@
<dimen name="dialog_padding">12sp</dimen>
<dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框-->
<dimen name="prompt_dialog_width">450dp</dimen>
<dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">250dp</dimen>
<dimen name="prompt_dialog_logo_size">64dp</dimen>
<!--商品页面-->
......@@ -96,19 +97,19 @@
<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="create_store_btn_height">44dp</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>
<dimen name="nicespinner_width">430dp</dimen>
<dimen name="nicespinner_width">280dp</dimen>
<dimen name="nicespinner_height">40dp</dimen>
<dimen name="counter_bar_width">350dp</dimen>
<dimen name="counter_input_height">45dp</dimen>
<dimen name="counter_input_height">43dp</dimen>
<dimen name="counter_input_select">35dp</dimen>
<dimen name="counter_tv_width">590dp</dimen>
<dimen name="counter_tv_width">400dp</dimen>
<dimen name="center_height">380dp</dimen>
<!-- 副屏 -->
......
app/src/main/res/values/styles.xml
View file @ 340a980f
......@@ -240,13 +240,26 @@
</style>
<style name="button_positive" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_blue_button_background</item>
<item name="android:background">@drawable/selector_gradient_red_button_background</item>
<item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="button_positive_noradius" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_red_button_background_noradius</item>
<item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="button_positive_allradius" parent="android:ButtonBar">
<item name="android:background">@drawable/red_border_allradius</item>
<item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="button_positive_bg_gray" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_gray_button_background</item>
<item name="android:textColor">@color/blue</item>
......@@ -254,7 +267,13 @@
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="button_positive_bg_gray_noradius" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_gray_button_background_noradius</item>
<item name="android:textColor">@color/blue</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="xuline_margin">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
......@@ -294,4 +313,14 @@
<item name=" android:textColor">@color/white</item>
<item name="android:textColorHint">@color/hint</item>
</style>
<style name="textView_title">
<item name="android:layout_height">@dimen/et_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:textSize">@dimen/text_three_title</item>
<item name="android:background">@color/transparent</item>
<item name=" android:textColor">@color/gary</item>
<item name="android:gravity">center|left</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