Commit dc28521e by llxqb

购物车界面-部分

parent 21ce32a3
...@@ -21,6 +21,7 @@ public class LoginActivity extends AppCompatActivity implements LoginDialog.Logi ...@@ -21,6 +21,7 @@ public class LoginActivity extends AppCompatActivity implements LoginDialog.Logi
mGoMember.setOnClickListener(v -> { mGoMember.setOnClickListener(v -> {
LoginDialog loginDialog = LoginDialog.newInstance(); LoginDialog loginDialog = LoginDialog.newInstance();
loginDialog.setListener(LoginActivity.this); loginDialog.setListener(LoginActivity.this);
DialogFactory.showDialogFragment(getSupportFragmentManager(), loginDialog, LoginDialog.TAG); DialogFactory.showDialogFragment(getSupportFragmentManager(), loginDialog, LoginDialog.TAG);
}); });
......
...@@ -25,12 +25,15 @@ import com.freemud.app.facepay.adapter.CartGoodsAdapter; ...@@ -25,12 +25,15 @@ import com.freemud.app.facepay.adapter.CartGoodsAdapter;
import com.freemud.app.facepay.adapter.ShoppingBagAdapter; import com.freemud.app.facepay.adapter.ShoppingBagAdapter;
import com.freemud.app.facepay.entity.Goods; import com.freemud.app.facepay.entity.Goods;
import com.freemud.app.facepay.entity.ShoppingBag; import com.freemud.app.facepay.entity.ShoppingBag;
import com.freemud.app.facepay.help.DialogFactory;
import com.freemud.app.facepay.views.CustomPopWindow; import com.freemud.app.facepay.views.CustomPopWindow;
import com.freemud.app.facepay.views.LoginDialog;
import com.freemud.app.facepay.views.MainDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class MainActivity extends AppCompatActivity implements View.OnClickListener { public class MainActivity extends AppCompatActivity implements View.OnClickListener, MainDialog.MainDialogListener {
public static String TAG = "MainActivity"; public static String TAG = "MainActivity";
private RecyclerView mMainRecyclerView; private RecyclerView mMainRecyclerView;
private CartGoodsAdapter mCartGoodsAdapter; private CartGoodsAdapter mCartGoodsAdapter;
...@@ -67,14 +70,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -67,14 +70,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
Toast.makeText(MainActivity.this, "退出", Toast.LENGTH_SHORT).show(); Toast.makeText(MainActivity.this, "退出", Toast.LENGTH_SHORT).show();
break; break;
case R.id.main_barcode_hands://手动输入条形码 case R.id.main_barcode_hands://手动输入条形码
MainDialog mainDialog = MainDialog.newInstance();
mainDialog.setListener(MainActivity.this);
DialogFactory.showDialogFragment(getSupportFragmentManager(), mainDialog, LoginDialog.TAG);
break; break;
case R.id.main_ll_addbag://添加购物袋 case R.id.main_ll_addbag://添加购物袋
initPopWindow(v); initPopWindow();
break; break;
} }
} }
private void initPopWindow(View view) { private void initPopWindow() {
initBagData(); initBagData();
View contentView = LayoutInflater.from(this).inflate(R.layout.popwindow_bag, null); View contentView = LayoutInflater.from(this).inflate(R.layout.popwindow_bag, null);
//处理popWindow 显示内容 //处理popWindow 显示内容
...@@ -177,4 +183,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -177,4 +183,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
} }
@Override
public void mainDialogBtnOkListener(boolean mainFlag) {
}
} }
...@@ -12,7 +12,6 @@ import android.widget.RelativeLayout; ...@@ -12,7 +12,6 @@ import android.widget.RelativeLayout;
import com.freemud.app.facepay.R; import com.freemud.app.facepay.R;
import com.freemud.app.facepay.help.DialogFactory; import com.freemud.app.facepay.help.DialogFactory;
/** /**
* 公用提示的dialog * 公用提示的dialog
* *
......
package com.freemud.app.facepay.views;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.freemud.app.facepay.R;
import com.freemud.app.facepay.help.DialogFactory;
/**
* 公用提示的dialog
*
* @author li
*/
public class MainDialog extends BaseDialogFragment {
public static final String TAG = MainDialog.class.getSimpleName();
private MainDialogListener dialogBtnListener;
// private int mActivityFlag;
public static MainDialog newInstance() {
return new MainDialog();
}
public void setListener(MainDialogListener dialogBtnListener) {
this.dialogBtnListener = dialogBtnListener;
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_main_dialog, container, true);
LinearLayout mDialogLayouyMain = view.findViewById(R.id.dialog_layout_main);
LinearLayout mDialogLiExit = view.findViewById(R.id.dialog_ll_exit);
LinearLayout mDialogLlNumDelete = view.findViewById(R.id.dialog_ll_num_delete);
EditText mDialogEtCardNum = view.findViewById(R.id.dialog_et_card_num);
Button mDialogBtnMain = view.findViewById(R.id.dialog_btn_main);
mDialogLiExit.setOnClickListener(this);
mDialogLlNumDelete.setOnClickListener(this);
mDialogBtnMain.setOnClickListener(this);
return view;
}
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.dialog_layout_main:
closeLoginDialog();
break;
case R.id.dialog_ll_exit:
closeLoginDialog();
break;
case R.id.dialog_btn_main:
toLogin();
break;
}
}
private boolean toLogin() {
if (dialogBtnListener != null) {
closeLoginDialog();
dialogBtnListener.mainDialogBtnOkListener(true);
}
return true;
}
public interface MainDialogListener {
void mainDialogBtnOkListener(boolean mainFlag);
}
public void closeLoginDialog() {
try {
this.dismiss();
} catch (Exception e) {
DialogFactory.dismissDialogFragment(getActivity().getSupportFragmentManager(), TAG);
}
}
}
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape> <shape>
<solid android:color="@color/colorF7" /> <solid android:color="@color/colorF7" />
<corners android:radius="2dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
<!-- 普通状态 --> <!-- 普通状态 -->
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<!--android:endColor="@color/write" android:startColor="@color/write" --> <!--android:endColor="@color/write" android:startColor="@color/write" -->
<gradient android:angle="270" android:endColor="@color/colorF8" android:startColor="@color/colorF8" android:type="linear" /> <gradient android:angle="270" android:endColor="@color/colorF8" android:startColor="@color/colorF8" android:type="linear" />
<corners android:radius="2dp" /> <corners android:radius="4dp" />
</shape> </shape>
</item> </item>
<!-- 禁用状态 --> <!-- 禁用状态 -->
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
android:layout_marginStart="@dimen/height_80px" android:layout_marginStart="@dimen/height_80px"
android:layout_marginTop="@dimen/height_114px" android:layout_marginTop="@dimen/height_114px"
android:background="@null" android:background="@null"
android:hint="@string/card_hint" android:hint="@string/card_hint_login"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_tv_hint" /> app:layout_constraintTop_toBottomOf="@id/dialog_tv_hint" />
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
android:layout_width="@dimen/height_30px" android:layout_width="@dimen/height_30px"
android:layout_height="@dimen/height_30px" android:layout_height="@dimen/height_30px"
android:layout_marginEnd="@dimen/height_30px" android:layout_marginEnd="@dimen/height_30px"
android:layout_marginTop="@dimen/height_114px" android:layout_marginTop="@dimen/height_120px"
android:src="@drawable/delete_normal" android:src="@drawable/delete_normal"
app:layout_constraintLeft_toRightOf="@id/dialog_et_card_num" app:layout_constraintLeft_toRightOf="@id/dialog_et_card_num"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/dialog_layout_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#90000000"
android:gravity="center"
android:orientation="vertical">
<android.support.constraint.ConstraintLayout
android:layout_width="@dimen/height_520px"
android:layout_height="@dimen/height_800px"
android:background="@drawable/app_write_bg">
<LinearLayout
android:id="@+id/dialog_ll_exit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/height_8px"
android:background="@drawable/dialog_iv_exit_selector"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/dialog_iv_exit"
android:layout_width="@dimen/height_38px"
android:layout_height="@dimen/height_38px"
android:layout_margin="@dimen/height_28px"
android:contentDescription="@string/app_name"
android:src="@drawable/exit" />
</LinearLayout>
<ImageView
android:id="@+id/dialog_main_iv_hint"
android:layout_width="@dimen/height_300px"
android:layout_height="@dimen/height_160px"
android:src="@drawable/code_sample"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/dialog_et_card_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/height_80px"
android:layout_marginStart="@dimen/height_80px"
android:layout_marginTop="@dimen/height_50px"
android:background="@null"
android:hint="@string/card_hint_main"
android:singleLine="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_main_iv_hint" />
<ImageView
android:id="@+id/dialog_iv_num_clear"
android:layout_width="@dimen/height_30px"
android:layout_height="@dimen/height_30px"
android:layout_marginEnd="@dimen/height_30px"
android:layout_marginTop="@dimen/height_58px"
android:src="@drawable/delete_normal"
app:layout_constraintLeft_toRightOf="@id/dialog_et_card_num"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_main_iv_hint" />
<View
android:id="@+id/dialog_view_line"
android:layout_width="match_parent"
android:layout_height="0.6dp"
android:layout_marginEnd="@dimen/height_80px"
android:layout_marginStart="@dimen/height_80px"
android:background="@color/color888"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_et_card_num" />
<TextView
android:id="@+id/dialog_tv_nocard_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/height_80px"
android:layout_marginStart="@dimen/height_80px"
android:layout_marginTop="@dimen/height_14px"
android:text="@string/no_shopping_hint"
android:textColor="@color/hint_red_color"
android:textSize="@dimen/sp_20px"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_view_line" />
<android.support.v7.widget.GridLayout
android:id="@+id/dialog_gridLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/height_80px"
android:layout_marginStart="@dimen/height_80px"
android:layout_marginTop="@dimen/height_54px"
app:columnCount="3"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_tv_nocard_hint"
app:orientation="horizontal"
app:rowCount="4">
<Button
android:id="@+id/dialog_btn_num_1"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num1"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_2"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num2"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_3"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num3"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_4"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num4"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_5"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num5"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_6"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num6"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_7"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num7"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_8"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num8"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_9"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num9"
app:layout_columnWeight="1"
app:layout_rowWeight="1" />
<Button
android:id="@+id/dialog_btn_num_0"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:text="@string/num0"
app:layout_columnSpan="2"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1" />
<LinearLayout
android:id="@+id/dialog_ll_num_delete"
android:layout_width="wrap_content"
android:layout_height="@dimen/height_60px"
android:layout_margin="1dp"
android:background="@drawable/dialog_btn_num_selector"
android:gravity="center"
android:orientation="vertical"
app:layout_columnWeight="1"
app:layout_rowWeight="1">
<ImageView
android:id="@+id/dialog_iv_num_delete"
android:layout_width="@dimen/height_34px"
android:layout_height="@dimen/height_26px"
android:contentDescription="@string/app_name"
android:src="@drawable/button_delete" />
</LinearLayout>
</android.support.v7.widget.GridLayout>
<Button
android:id="@+id/dialog_btn_main"
android:layout_width="match_parent"
android:layout_height="@dimen/height_74px"
android:layout_marginEnd="@dimen/height_80px"
android:layout_marginStart="@dimen/height_80px"
android:layout_marginTop="@dimen/height_18px"
android:background="@drawable/dialog_btn_login_normal"
android:text="@string/sure"
android:textColor="@color/write"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_gridLayout" />
</android.support.constraint.ConstraintLayout>
</LinearLayout>
\ No newline at end of file
...@@ -8,8 +8,10 @@ ...@@ -8,8 +8,10 @@
<!--dialog --> <!--dialog -->
<string name="dialog_title">会员登录</string> <string name="dialog_title">会员登录</string>
<string name="dialog_title_desc">扫描会员卡条码也可登录</string> <string name="dialog_title_desc">扫描会员卡条码也可登录</string>
<string name="card_hint">请输入会员卡号</string> <string name="card_hint_login">请输入会员卡号</string>
<string name="card_hint_main">请输入商品条码下数字</string>
<string name="no_card_hint">没找到会员信息,请检查或联系店员协助</string> <string name="no_card_hint">没找到会员信息,请检查或联系店员协助</string>
<string name="no_shopping_hint">没找到此商品,请检查或联系店员协助</string>
<string name="num0">0</string> <string name="num0">0</string>
<string name="num1">1</string> <string name="num1">1</string>
<string name="num2">2</string> <string name="num2">2</string>
...@@ -21,6 +23,7 @@ ...@@ -21,6 +23,7 @@
<string name="num8">8</string> <string name="num8">8</string>
<string name="num9">9</string> <string name="num9">9</string>
<string name="login">登陆</string> <string name="login">登陆</string>
<string name="sure">确定</string>
<!--main--> <!--main-->
<string name="main_hint_title">请在下方扫描区扫描商品条码</string> <string name="main_hint_title">请在下方扫描区扫描商品条码</string>
......
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