Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -58,8 +58,11 @@ public class C {
     }
 
     public static final class URL {
-        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
-        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+//        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
+//        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+
+        public static final String BASE_URL = "http://121.40.56.52:8080/";
+        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
 
         private static final String PKG = "/tk/";
 
@@ -447,8 +450,8 @@ public class C {
         public static final String IS_NULL_INFO = "参数错误";
         public static final String IS_ERR_INFO = "参数错误";
         public static final String OPERATION_ERR_INFO = "操作失败";
-        public static final String SERVER_ERR_INFO = "服务器异常，请稍后重试";
-        public static final String SERVER_SQL_ERR_INFO = "服务器异常，请检查数据后重试";
+        public static final String SERVER_ERR_INFO = "网络异常，请稍后重试";
+        public static final String SERVER_SQL_ERR_INFO = "网络异常，请检查数据后重试";
         public static final String LOGIN_CAN_NOT_ERR_INFO = "用户已被锁定或已注销";
     }
 
@@ -580,6 +583,8 @@ public class C {
         public static final int SKU_DETAIL = 6;
         public static final int ADD_SKU = 7;
         public static final int SKU_EDITOR = 8;
+        public static final int SKU_MANAGER = 9;
+        public static final int SKU_ADDER = 10;
     }
 
     public final class PAY_STATE {

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

 package com.xingdata.zzdpos.ui.login;
 
 import android.content.Intent;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -22,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.splash.SplashActivity;
 import com.xingdata.zzdpos.util.Global;
+import com.xingdata.zzdpos.util.SystemUtil;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 import java.util.ArrayList;
@@ -48,7 +50,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
 //                    ("errMsg"));
 //
 //        }
-
+        getSyatemMessage();
         LogUtils.e("LoginActivity + initView");
         loadRootFragment(R.id.fra, mPresenter.signInFragment);
         mViewBinding.setText1(": 400 - 800 - 9406");
@@ -349,6 +351,41 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         return super.dispatchTouchEvent(ev);
     }
 
+    int tempVolumeDown = 0;
+    int tempVolumeUp = 0;
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+            if (mViewBinding.svMessage.getVisibility() == View.INVISIBLE) {
+                mViewBinding.svMessage.setVisibility(View.GONE);
+            } else {
+                tempVolumeDown++;
+                if (tempVolumeUp > 5) {
+                    tempVolumeUp = 0;
+                }
+            }
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && tempVolumeDown == 5) {
+            tempVolumeUp++;
+            if (tempVolumeUp == 2) {
+                mViewBinding.svMessage.setVisibility(View.VISIBLE);
+                tempVolumeDown = 0;
+                tempVolumeUp = 0;
+            }
+        } else {
+            tempVolumeDown = 0;
+            tempVolumeUp = 0;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void getSyatemMessage() {
+        String str = "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" +
+                SystemUtil
+                        .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n " +
+                "程序版本号：" +
+                SystemUtil.getVersionName();
+        mViewBinding.tvSn.setText(str);
+    }
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java

@@ -20,6 +20,7 @@ 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.util.OnClickListener;
+import com.xingdata.zzdpos.util.SystemUtil;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 
@@ -46,7 +47,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
         mViewBinding.etPwd.setInputType(InputType.TYPE_CLASS_NUMBER | InputType
                 .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);
@@ -167,6 +167,7 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
 
     public void setPhone(String phone) {
         mViewBinding.etPhone.setText(phone);
+        mViewBinding.etPhone.setSelection(mViewBinding.etPhone.getText().toString().length());
     }
 
     public void setErrorMsg(String tableName, String errCode, String errMsg) {

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java

@@ -24,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
+import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
@@ -42,6 +43,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     private VipFragment mVipFragment = new VipFragment();
 
     private LoadingDialog mLoadingDialog = new LoadingDialog();
+    private ScanFragment mScanFragment = new ScanFragment();
 
     @Override
     public int getLayoutId() {
@@ -50,7 +52,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
 
     @Override
     public void initView() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
         this.loadRootFragment(R.id.f_sssku, mManagerFragment);
 
         mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
@@ -61,6 +63,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
             }
             return false;
         });
+        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding.getTitleMode()));
         mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
     }
 
@@ -140,9 +143,31 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
     }
 
+    @Override
+    public void showScanFragment(int scanMode) {
+        switch (scanMode) {
+            case C.TITLE_MODE.SKU_MANAGER:
+                mScanFragment.setOnScanCompletedListener(barcode -> {
+                    this.pop();
+                    showSearchFragment(C.TITLE_MODE.SKU);
+                    mPresenter.searchSku(barcode);
+                });
+                mScanFragment.setOnBackPressedListener(this::backToManagerFragment);
+                break;
+            case C.TITLE_MODE.SKU_ADDER:
+                mScanFragment.setOnScanCompletedListener(barcode -> {
+                    this.pop();
+                    mAddFragment.loadBarcode(barcode);
+                });
+                mScanFragment.setOnBackPressedListener(this::backToAddFragment);
+                break;
+        }
+        this.start(mScanFragment);
+    }
+
     @Override
     public void showAddFragment() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
         mViewBinding.tvTitle.setText(R.string.sssku_add);
         this.start(mAddFragment);
     }
@@ -216,7 +241,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
 
     @Override
     public void backToManagerFragment() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
         mViewBinding.tvTitle.setText(R.string.sssku_title);
         this.resetSearchBar();
         this.pop();
@@ -229,6 +254,14 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.pop();
     }
 
+    @Override
+    public void backToAddFragment() {
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
+        mViewBinding.tvTitle.setText(R.string.sssku_title);
+        this.resetSearchBar();
+        this.pop();
+    }
+
     @Override
     public void backToMenuActivity() {
         mPresenter.doOnFinish();

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java

@@ -98,6 +98,13 @@ public interface SsskuContract {
          */
         void showSearchFragment(String keyword, int searchType);
 
+        /**
+         * 显示扫描页面
+         *
+         * @param scanMode 扫描模式
+         */
+        void showScanFragment(int scanMode);
+
         /**
          * 显示添加检查页面
          */
@@ -157,6 +164,11 @@ public interface SsskuContract {
          */
         void backToDetailFragment();
 
+        /**
+         * 返回添加页面
+         */
+        void backToAddFragment();
+
         /**
          * 返回菜单页面
          */
@@ -342,6 +354,13 @@ public interface SsskuContract {
          */
         public abstract void clickSkuMenu();
 
+        /**
+         * 主页面 - 点击扫描按钮
+         *
+         * @param titleMode 标题模式
+         */
+        public abstract void clickScan(int titleMode);
+
         /**
          * 主页面 - 关闭
          */

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -218,7 +218,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                         sssku1 -> {
                             mView.showMsg("添加成功");
                             isNeedSync = true;
-                            mView.backToEditFragment();
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
@@ -245,7 +244,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                         sssku1 -> {
                             mView.showMsg("添加成功");
                             isNeedSync = true;
-                            mView.backToEditFragment();
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
@@ -266,6 +264,11 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mView.showSkuMenuDialog();
     }
 
+    @Override
+    public void clickScan(int titleMode) {
+        mView.showScanFragment(titleMode);
+    }
+
     @Override
     public void doOnFinish() {
         if (!isNeedSync) return;

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java

@@ -63,6 +63,11 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
         mSkuAdapter.setNewData(ssskus);
     }
 
+    public void loadBarcode(String barcode) {
+        if (mViewBinding == null) return;
+        mViewBinding.etBarcode.setText(barcode);
+    }
+
     @Override
     public boolean onBackPressedSupport() {
         ((SsskuActivity) getActivity()).backToManagerFragment();

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java

 package com.xingdata.zzdpos.ui.marketing.ms.fragment;
 
 
+import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import android.widget.TextView;
 
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -40,6 +43,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
         // set other
         mViewBinding.llAdd.setOnClickListener(view -> mPresenter.clickAdd());
 
+        // set empty
+        @SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string.ms_empty_hint);
+        mMsAdapter.setEmptyView(emptyView);
+        mMsAdapter.isUseEmpty(false);
+
         // init data
         refreshMs();
     }

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java

@@ -42,7 +42,7 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
         mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
                 ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
         mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
+                TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-MM-dd"))));
 
 
     }

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -155,9 +155,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                     vips.add(vip);
                     mView.loadVips(vips);
                 },
-                throwable -> {
-                    mView.loadVips(new ArrayList<>());
-                });
+                throwable -> mView.loadVips(new ArrayList<>()));
     }
 
     @Override
@@ -319,9 +317,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                                     break;
                             }
                         },
-                        throwable -> {
-                            mView.showPayFailFragment(throwable, mSaleorder);
-                        });
+                        throwable -> mView.showPayFailFragment(throwable, mSaleorder));
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -28,8 +28,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-//        return DeviceUtils.getModel();
-        return "AECRC10";
+        return DeviceUtils.getModel();
+//        return "AECRC10";
     }
 
 
@@ -57,9 +57,10 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-//        return deviceSN;
-        return "5484965656";
+        return deviceSN;
+//        return "5484965656";
     }
+
     /**
      * 获取应用名称
      *

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

@@ -31,23 +31,49 @@
                   android:background="@color/appBack"
                   android:orientation="vertical">
 
-
-        <FrameLayout
-            android:id="@+id/fra"
+        <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:layout_weight="8"
-            android:background="@color/appBack"
-            />
+            android:layout_weight="8">
+
+            <FrameLayout
+                android:id="@+id/fra"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="@color/appBack"/>
+
+            <ScrollView
+                android:id="@+id/sv_message"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:focusable="false"
+                android:visibility="visible">
+
+                <TextView
+                    android:id="@+id/tv_sn"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="@dimen/all_margin_left"
+                    android:focusable="false"
+                    android:gravity="right|bottom"
+                    android:text="忘记密码 ？"
+                    android:textColor="@color/black_baozheng"/>
+            </ScrollView>
+
+
+        </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:visibility="gone"
             android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/tv_company_info"

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

@@ -6,6 +6,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="titleMode"
             type="int" />
@@ -39,7 +41,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/all_margin"
-                android:visibility="@{titleMode==1||titleMode==6||titleMode==8?8:0}"
+                android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?8:0}"
                 app:layout_constraintBottom_toTopOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_back"
                 app:layout_constraintRight_toRightOf="parent"
@@ -63,7 +65,7 @@
                 android:text="@string/sssku_title"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_sub_title_size"
-                android:visibility="@{titleMode==1||titleMode==6||titleMode==8?0:8}"
+                android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?0:8}"
                 app:layout_constraintLeft_toRightOf="parent"
                 app:layout_constraintRight_toLeftOf="parent" />
 
@@ -94,6 +96,16 @@
                 android:visibility="@{titleMode==6?0:8}"
                 app:layout_constraintRight_toRightOf="parent" />
 
+            <ImageButton
+                android:id="@+id/btn_scan"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:background="?attr/actionBarItemBackground"
+                android:contentDescription="@string/store_scan"
+                android:src="@mipmap/but_sweep_yard"
+                android:visibility="@{titleMode==9||titleMode==10?View.VISIBLE:View.GONE}"
+                app:layout_constraintRight_toRightOf="parent" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/all_line_width"

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

@@ -119,5 +119,6 @@
                 android:textColor="@color/black_baozheng"/>
         </RelativeLayout>
 
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -133,6 +133,38 @@
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_sub_title_size" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:layout_marginStart="@dimen/all_margin"
+                    android:background="@color/gray_kongming" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:paddingEnd="@null"
+                        android:paddingStart="@dimen/all_margin"
+                        android:text="@string/sku_barcode"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="3"
+                        android:gravity="center_vertical"
+                        android:text="@{ConvertUtil.longToString(sku.spuBarcode)}"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size" />
+                </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/all_line_width"

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

@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:id="@+id/cl_vip"
-        android:layout_width="90dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="vertical">

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

@@ -122,12 +122,21 @@
                 android:layout_marginStart="@dimen/all_margin"
                 android:layout_marginTop="@dimen/all_margin">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/ms_editor_type_gift_text5"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/big_text_size" />
+
                 <EditText
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_marginEnd="@dimen/all_spacing"
+                    android:layout_marginStart="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:hint="@string/ms_editor_type_gift_search_hint"
                     android:inputType="text"

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

@@ -329,7 +329,7 @@
     <string name="ms_user_hint">营销计划功能限时免费使用 1 个月</string>
     <string name="ms_count">共%s个营销计划</string>
     <string name="ms_search_hint">请输入活动名称</string>
-    <string name="ms_empty_hint">没有搜到此计划\n请重新搜索，或点击添加按钮进行添加~</string>
+    <string name="ms_empty_hint">没有找到营销计划~</string>
     <string name="ms_editor_title">管理-营销计划</string>
     <string name="ms_editor_setting">设置营销计划</string>
     <string name="ms_editor_subtitle_info">基本信息</string>
@@ -369,6 +369,7 @@
     <string name="ms_editor_type_gift_text2">元</string>
     <string name="ms_editor_type_gift_text3">加</string>
     <string name="ms_editor_type_gift_text4">1件</string>
+    <string name="ms_editor_type_gift_text5">换购</string>
     <string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
     <string name="ms_editor_type_gift_name">品名:</string>
     <string name="ms_editor_type_gift_price">售价:</string>