Skip to content

T
TangKuPos
Commit e9d75761 authored by 王海's avatar 王海
Browse files
Options

提交很多代码

parent 4025cd2d
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 67 deletions
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/InputPasswordFragment.java
View file @ e9d75761
package com.xingdata.zzdpos.ui.login.fragment;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.text.InputFilter;
import android.text.InputType;
import android.view.View;
......@@ -111,6 +113,38 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
break;
}
});
mViewBinding.etOnePassword.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.login_pwd02);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etOnePassword.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.login_pwd01);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etOnePassword.setCompoundDrawables(img_off, null, null, null);
}
}
});
mViewBinding.etTwoPassword.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.pwd_two02);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etTwoPassword.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.pwd_two01);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etTwoPassword.setCompoundDrawables(img_off, null, null, null);
}
}
});
}
public void setStartway(int _startWay) {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ e9d75761
package com.xingdata.zzdpos.ui.login.fragment;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.text.InputFilter;
import android.text.InputType;
......@@ -77,8 +79,9 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
new android.os.Handler().postDelayed(new Runnable() {
@Override
public void run() {
mPresenter.downList(mViewBinding.etPhone, PopupWindowDownList
.CLERK_LOGIN, null);
mPresenter.downList(mViewBinding.etPhone,
PopupWindowDownList
.CLERK_LOGIN, null);
}
}, time);
......@@ -86,9 +89,10 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
}
break;
case R.id.btn_login: {
if (mViewBinding.etPwd.getText().toString().isEmpty() || mViewBinding.etPhone
if (mViewBinding.etPwd.getText().toString().isEmpty() ||
mViewBinding.etPhone
.getText().toString().isEmpty()) {
.getText().toString().isEmpty()) {
ToastUtils.showLong("账号密码不能为空");
} else {
promptDialog = new PromptDialog().setDialogType(PromptDialog
......@@ -96,7 +100,8 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
mLoadingDialog.show((BaseActivity) getActivity());
mPresenter.signIn(mViewBinding.etPhone.getText().toString(),
mViewBinding
.etPwd.getText().toString(), promptDialog, mLoadingDialog);
.etPwd.getText().toString(), promptDialog,
mLoadingDialog);
}
}
......@@ -121,6 +126,38 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
}
}
});
mViewBinding.etPhone.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.login_username2);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPhone.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.login_username1);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPhone.setCompoundDrawables(img_off, null, null, null);
}
}
});
mViewBinding.etPwd.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.login_pwd02);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPwd.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.login_pwd01);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPwd.setCompoundDrawables(img_off, null, null, null);
}
}
});
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java
View file @ e9d75761
package com.xingdata.zzdpos.ui.login.fragment;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.view.View;
import com.xingdata.zzdpos.R;
......@@ -82,6 +84,38 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
break;
}
});
mViewBinding.etPhone.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.login_username2);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPhone.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.login_username1);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etPhone.setCompoundDrawables(img_off, null, null, null);
}
}
});
mViewBinding.etSmsCode.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
Resources res = getResources();
Drawable img_off;
if (b) {
img_off = res.getDrawable(R.mipmap.sms02);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etSmsCode.setCompoundDrawables(img_off, null, null, null);
} else {
img_off = res.getDrawable(R.mipmap.sms01);
img_off.setBounds(0, 0, img_off.getMinimumWidth(), img_off.getMinimumHeight());
mViewBinding.etSmsCode.setCompoundDrawables(img_off, null, null, null);
}
}
});
}
public void sendSmsSucc() {
......
app/src/main/res/drawable/blue_border.xml
View file @ e9d75761
......@@ -3,6 +3,6 @@
<corners android:radius="@dimen/all_radius" />
<solid android:color="@color/blue_mawu" />
<solid android:color="@color/red_guanyu" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/selector_white_background_stroke.xml
View file @ e9d75761
......@@ -2,8 +2,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/all_transparent" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" />
<item android:drawable="@drawable/shape_gray_round_line_stroke" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_line_blue" android:state_focused="true" />
<item android:drawable="@drawable/singleline_white_gray" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_white_background_stroke_new.xml 0 → 100644
View file @ e9d75761
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/all_transparent" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_round_line_stroke.xml 0 → 100644
View file @ e9d75761
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/red_guanyu"/>
</shape>
</item>
<item android:bottom="1.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/shape_white_round_line_blue.xml 0 → 100644
View file @ e9d75761
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/red_guanyu"/>
</shape>
</item>
<item android:bottom="1.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/singleline_white_gray.xml
View file @ e9d75761
......@@ -7,7 +7,7 @@
</shape>
</item>
<item android:bottom="1dp">
<item android:bottom="1.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
......
app/src/main/res/layout/activity_splash.xml
View file @ e9d75761
......@@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:SpinKit_Color="@color/white"/>
app:SpinKit_Color="@color/black_zhangfei"/>
<TextView
android:id="@+id/tv_progress"
......@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="0 %"
android:textColor="@color/white"/>
android:textColor="@color/black_zhangfei"/>
</RelativeLayout>
<TextView
......@@ -55,7 +55,7 @@
android:layout_marginTop="@dimen/all_padding"
android:gravity="center"
android:text="正在加载数据..."
android:textColor="@color/white"/>
android:textColor="@color/black_zhangfei"/>
</LinearLayout>
......
app/src/main/res/layout/fragment_binding_counter.xml
View file @ e9d75761
......@@ -11,12 +11,12 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
android:background="@color/white"
>
<include
android:id="@+id/ic_title"
layout="@layout/title_appback"/>
layout="@layout/title"/>
<LinearLayout
......@@ -50,7 +50,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center|left"
android:text="北京浙星信息技术有限公司"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
</LinearLayout>
......@@ -73,7 +73,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center|left"
android:text="丰台万达店"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
</LinearLayout>
......@@ -96,7 +96,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical"
android:text="北京市丰台区万达广场一区"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
</LinearLayout>
......@@ -108,8 +108,7 @@
android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible"
>
android:visibility="visible">
<RelativeLayout
android:layout_width="match_parent"
......@@ -193,7 +192,7 @@
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:text="10号款台（新增）"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
......
app/src/main/res/layout/fragment_choice_store.xml
View file @ e9d75761
......@@ -12,11 +12,11 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack">
android:background="@color/white">
<include
android:id="@+id/ic_title"
layout="@layout/title_appback"/>
layout="@layout/title"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -48,7 +48,7 @@
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical"
android:text="北京浙星信息技术有限公司"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
</LinearLayout>
......
app/src/main/res/layout/fragment_create_store.xml
View file @ e9d75761
......@@ -12,11 +12,11 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack">
android:background="@color/white">
<include
android:id="@+id/ic_title"
layout="@layout/title_appback"></include>
layout="@layout/title"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_nickname"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
......@@ -59,7 +59,7 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_nickname"
style="@style/editText"
style="@style/editText_new"
android:ems="10"
android:hint="@string/login_createstorefragment_et_nickname_hint"
android:lines="1"
......@@ -79,13 +79,13 @@
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storename"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_storename"
style="@style/editText"
style="@style/editText_new"
android:ems="10"
android:hint="@string/login_createstorefragment_et_storename_hint"
android:lines="1"
......@@ -136,13 +136,13 @@
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storeaddress"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView
android:id="@+id/tv_storeaddress"
style="@style/editText"
style="@style/editText_new"
android:drawablePadding="@dimen/all_padding"
android:drawableRight="@mipmap/createstore_drop_down"
android:ems="10"
......@@ -163,13 +163,13 @@
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storeaddressmessage"
android:textColor="@color/white"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/tv_storedetailedaddress"
style="@style/editText"
style="@style/editText_new"
android:ems="15"
android:hint="@string/login_createstorefragment_et_storedetailedaddress_hint"
android:lines="1"
......
app/src/main/res/layout/fragment_input_password.xml
View file @ e9d75761
......@@ -12,11 +12,13 @@
<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:background="@color/white"
android:gravity="center"
android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title_appback"/>
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -30,29 +32,25 @@
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">
<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"/>
</RelativeLayout>
<EditText
android:id="@+id/et_one_password"
style="@style/editText_new"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
<EditText
android:id="@+id/et_two_password"
style="@style/editText"
style="@style/editText_new"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/pwd_two01"
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
......@@ -81,7 +79,7 @@
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
android:textColor="@color/black_baozheng"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_sign_in.xml
View file @ e9d75761
......@@ -7,12 +7,16 @@
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
<variable
name="OnFocusChangeListener"
type="android.view.View.OnFocusChangeListener"></variable>
</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:background="@color/white"
android:gravity="center"
android:orientation="vertical">
......@@ -30,8 +34,9 @@
<EditText
android:id="@+id/et_phone"
style="@style/editText"
style="@style/editText_new"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_username1"
android:ems="10"
android:hint="@string/login_et_phone_hint"
android:inputType="phone"
......@@ -62,9 +67,10 @@
<EditText
android:id="@+id/et_pwd"
style="@style/editText"
style="@style/editText_new"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:ems="10"
android:hint="@string/login_et_password_hint"
android:inputType="textPassword"
......@@ -98,7 +104,8 @@
android:layout_height="wrap_content"
android:onClick="@{onClickListener}"
android:text="注册 >"
android:textColor="@color/white"/>
android:textColor="@color/black_baozheng"
/>
<TextView
android:id="@+id/tv_forgotPassword"
......@@ -107,7 +114,7 @@
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="忘记密码 ？"
android:textColor="@color/white"/>
android:textColor="@color/black_baozheng"/>
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ e9d75761
......@@ -12,10 +12,12 @@
<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:background="@color/white"
android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title_appback"></include>
<include
android:id="@+id/ic_title"
layout="@layout/title"></include>
<LinearLayout
android:layout_width="match_parent"
......@@ -36,8 +38,9 @@
<EditText
android:id="@+id/et_phone"
style="@style/editText"
style="@style/editText_new"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
......@@ -67,7 +70,7 @@
android:paddingBottom="@dimen/et_padding"
android:paddingTop="@dimen/et_padding"
android:text="@string/login_smscodefragment_tv_get_sms"
android:textColor="@color/blue"/>
android:textColor="@color/black_baozheng"/>
</LinearLayout>
......@@ -75,9 +78,10 @@
<EditText
android:id="@+id/et_sms_code"
style="@style/editText"
style="@style/editText_new"
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890"
android:drawableLeft="@mipmap/sms01"
android:ems="10"
android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:inputType="phone|number"
......@@ -106,7 +110,7 @@
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
android:textColor="@color/black_baozheng"/>
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/mipmap-hdpi/splash.png
View replaced file @ 4025cd2d View file @ e9d75761
app/src/main/res/mipmap-hdpi/splash.png

36.6 KB | W: | H:

app/src/main/res/mipmap-hdpi/splash.png

36.4 KB | W: | H:

app/src/main/res/mipmap-hdpi/splash.png
app/src/main/res/mipmap-hdpi/splash.png
app/src/main/res/mipmap-hdpi/splash.png
app/src/main/res/mipmap-hdpi/splash.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/values/styles.xml
View file @ e9d75761
......@@ -17,9 +17,9 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="vicescreen_textview_stlye">
......@@ -314,6 +314,15 @@
<item name="android:textColorHint">@color/hint</item>
</style>
<style name="editText_new" parent="view_base">
<item name=" android:background">@drawable/selector_white_background_stroke</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="Base.Widget.Design.TabLayout" parent="android:Widget">
<item name="tabBackground">@color/white_caocao</item>
<item name="tabIndicatorColor">#FFF</item>
......
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