购物车界面-部分

app/src/main/java/com/freemud/app/facepay/LoginActivity.java

@@ -21,6 +21,7 @@ public class LoginActivity extends AppCompatActivity implements LoginDialog.Logi
         mGoMember.setOnClickListener(v -> {
             LoginDialog loginDialog = LoginDialog.newInstance();
             loginDialog.setListener(LoginActivity.this);
+
             DialogFactory.showDialogFragment(getSupportFragmentManager(), loginDialog, LoginDialog.TAG);
         });
 

app/src/main/java/com/freemud/app/facepay/MainActivity.java

@@ -25,12 +25,15 @@ import com.freemud.app.facepay.adapter.CartGoodsAdapter;
 import com.freemud.app.facepay.adapter.ShoppingBagAdapter;
 import com.freemud.app.facepay.entity.Goods;
 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.LoginDialog;
+import com.freemud.app.facepay.views.MainDialog;
 
 import java.util.ArrayList;
 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";
     private RecyclerView mMainRecyclerView;
     private CartGoodsAdapter mCartGoodsAdapter;
@@ -67,14 +70,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 Toast.makeText(MainActivity.this, "退出", Toast.LENGTH_SHORT).show();
                 break;
             case R.id.main_barcode_hands://手动输入条形码
+                MainDialog mainDialog = MainDialog.newInstance();
+                mainDialog.setListener(MainActivity.this);
+                DialogFactory.showDialogFragment(getSupportFragmentManager(), mainDialog, LoginDialog.TAG);
                 break;
             case R.id.main_ll_addbag://添加购物袋
-                initPopWindow(v);
+                initPopWindow();
                 break;
         }
     }
 
-    private void initPopWindow(View view) {
+    private void initPopWindow() {
         initBagData();
         View contentView = LayoutInflater.from(this).inflate(R.layout.popwindow_bag, null);
         //处理popWindow 显示内容
@@ -177,4 +183,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     }
 
 
+    @Override
+    public void mainDialogBtnOkListener(boolean mainFlag) {
+
+    }
 }

app/src/main/java/com/freemud/app/facepay/views/LoginDialog.java

@@ -12,7 +12,6 @@ import android.widget.RelativeLayout;
 import com.freemud.app.facepay.R;
 import com.freemud.app.facepay.help.DialogFactory;
 
-
 /**
  * 公用提示的dialog
  *

app/src/main/java/com/freemud/app/facepay/views/MainDialog.java

+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);
+        }
+    }
+}

app/src/main/res/drawable/app_btn_main_exit_selector.xml

@@ -4,7 +4,7 @@
     <item android:state_pressed="true">
         <shape>
             <solid android:color="@color/colorF7" />
-            <corners android:radius="2dp" />
+            <corners android:radius="4dp" />
         </shape>
     </item>
     <!-- 普通状态 -->
@@ -12,7 +12,7 @@
         <shape android:shape="rectangle">
             <!--android:endColor="@color/write" android:startColor="@color/write"  -->
             <gradient android:angle="270" android:endColor="@color/colorF8" android:startColor="@color/colorF8" android:type="linear" />
-            <corners android:radius="2dp" />
+            <corners android:radius="4dp" />
         </shape>
     </item>
     <!-- 禁用状态 -->

app/src/main/res/layout/fragment_login_dialog.xml

@@ -65,7 +65,7 @@
             android:layout_marginStart="@dimen/height_80px"
             android:layout_marginTop="@dimen/height_114px"
             android:background="@null"
-            android:hint="@string/card_hint"
+            android:hint="@string/card_hint_login"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/dialog_tv_hint" />
@@ -75,7 +75,7 @@
             android:layout_width="@dimen/height_30px"
             android:layout_height="@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"
             app:layout_constraintLeft_toRightOf="@id/dialog_et_card_num"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/values/strings.xml

@@ -8,8 +8,10 @@
     <!--dialog -->
     <string name="dialog_title">会员登录</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_shopping_hint">没找到此商品,请检查或联系店员协助</string>
     <string name="num0">0</string>
     <string name="num1">1</string>
     <string name="num2">2</string>
@@ -21,6 +23,7 @@
     <string name="num8">8</string>
     <string name="num9">9</string>
     <string name="login">登陆</string>
+    <string name="sure">确定</string>
 
     <!--main-->
     <string name="main_hint_title">请在下方扫描区扫描商品条码</string>