Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
 import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
 import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
 import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
+import com.xingdata.zzdpos.ui.splash.dialog.UpgradeDialog;
 import com.xingdata.zzdpos.util.Global;
 
 import java.util.ArrayList;
@@ -39,6 +40,7 @@ import io.reactivex.schedulers.Schedulers;
 public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements
         MainContract.View {
     public static MainActivity mainActivity;
+    UpgradeDialog upgradeDialog = new UpgradeDialog();
     private long mExitTime;
     private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
     private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R
@@ -83,26 +85,26 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
             }
         }).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Consumer<View>() {
-            int i = 0;
+                    int i = 0;
 
-            @Override
-            public void accept(View view) throws Exception {
+                    @Override
+                    public void accept(View view) throws Exception {
 
-                ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
-                itemMenuBottomBinding.text.setText(titleInts[i]);
-                if (i == 0) {
-                    itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
-                            .red_guanyu));
-                }
-                itemMenuBottomBinding.img.setImageResource(iconList[i]);
-                itemMenuBottomBindings.add(itemMenuBottomBinding);
-                itemMenuBottomBinding.getRoot().setMinimumHeight(200);
-                mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
+                        ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
+                        itemMenuBottomBinding.text.setText(titleInts[i]);
+                        if (i == 0) {
+                            itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
+                                    .red_guanyu));
+                        }
+                        itemMenuBottomBinding.img.setImageResource(iconList[i]);
+                        itemMenuBottomBindings.add(itemMenuBottomBinding);
+                        itemMenuBottomBinding.getRoot().setMinimumHeight(200);
+                        mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
 
 
-                i++;
-            }
-        });
+                        i++;
+                    }
+                });
 
 
         mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@@ -200,4 +202,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
         return super.dispatchTouchEvent(ev);
     }
 
+    @Override
+    public void showUptateDialog(String updateUrl, String version) {
+        upgradeDialog.setupdateData(updateUrl, version);
+        upgradeDialog.show(this);
+    }
+
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java

@@ -24,7 +24,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
 
     @Override
     public int getTitle() {
-        return R.string.handover_hint;
+        return -1;
     }
 
     @Override
@@ -48,6 +48,8 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
         mViewBinding.setBank(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getPos(), true));
         mViewBinding.handoverTvSumamt.setText(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getFinallyAmt(), true));
         mViewBinding.setOrderNum(String.valueOf(MainPresenter.handoverInfo.getSumOrder()));
+
+        setBtnName("取消","交班");
     }
 
 

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -48,7 +48,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
         integers.add(110);
         integers.add(111);
         mMySelfRecyclerAdapter = new MySelfRecyclerAdapter(getActivity(), integers);
-        mViewBinding.fragmentMyselfRecycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 1, getResources().getColor(R.color.gray_kongming)));
+
         mMySelfRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentMyselfRecycler);
         mMySelfRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -61,7 +61,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
                         ActivityUtils.startActivity(getActivity(), FeedBackActivity.class);
                         break;
                     case C.MENU.MENU_UPDATE://升级
-                        ToastUtils.showShort("已经是最新版本");
+                        mPresenter.checkUpdate();
                         break;
 
                     case C.MENU.MENU_HELP://帮助

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -47,7 +47,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
         list.add(C.MENU.MENU_MS_TICKET);
         list.add(C.MENU.MENU_MS_RECHARGE);
         list.add(C.MENU.MENU_MS_MS);
-        list.add(C.MENU.MENU_MS_SMS);
+//        list.add(C.MENU.MENU_MS_SMS);
 
         marketingMenuAdapter = new MarketingMenuAdapter(list);
         mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);

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

 package com.xingdata.zzdpos.ui.settle;
 
 
+import android.widget.TextView;
+
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.StringUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
@@ -384,7 +387,12 @@ public class SettlePresenter extends SettleContract.Presenter {
     private void paySucc(Saleorder saleorder) {
         mView.showPaySuccFragment(saleorder);
         this.updateHandover(MainPresenter.handoverInfo);
-        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
+        try{
+            ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, saleorder);
+        }catch (Exception e){
+            ToastUtils.showShort("打印异常");
+        }
+
     }
 
     /**

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

+package com.xingdata.zzdpos.util;
+
+import android.content.Context;
+
+/**
+ * Created by Administrator on 2018/1/22.
+ */
+
+
+public class DensityUtil {
+
+    /**
+     * 根据手机的分辨率从 dp 的单位 转成为 px(像素)
+     */
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    /**
+     * 根据手机的分辨率从 px(像素) 的单位 转成为 dp
+     */
+    public static int px2dip(Context context, float pxValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+}

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

@@ -140,6 +140,7 @@ public class RecyclerViewUtil {
         private StatisticsCallback mStatisticsCallback;
         private int mDividerHight = 1;
         private Paint mColorPaint;
+        private Context mContext;
 
 
         public final int[] ATRRS = new int[]{android.R.attr.listDivider};
@@ -147,6 +148,7 @@ public class RecyclerViewUtil {
         public StatisticsItemDecoration(Context context) {
             final TypedArray ta = context.obtainStyledAttributes(ATRRS);
             this.mDividerDarwable = ta.getDrawable(0);
+            mContext = context;
             ta.recycle();
         }
 
@@ -189,13 +191,13 @@ public class RecyclerViewUtil {
                 SectionEntity sectionEntity = mStatisticsCallback.getItem(position);
                 if (sectionEntity != null) {
                     if (!sectionEntity.isHeader) {
-                        final int left = child.getLeft() - params.leftMargin - mDividerHight + 200;
+                        final int left = child.getLeft() - params.leftMargin - mDividerHight + DensityUtil.dip2px(mContext, 65);
                         final int right = child.getRight() + params.rightMargin;
                         int top = 0;
                         int bottom = 0;
 
 
-                        top = child.getBottom() + params.bottomMargin +1;
+                        top = child.getBottom() + params.bottomMargin + 1;
                         bottom = top + mDividerHight;
                         //画分割线
                         mDividerDarwable.setBounds(left, top, right, bottom);

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

@@ -68,8 +68,7 @@
                 android:paddingTop="@dimen/all_padding"
                 android:text="共0人次盘库记录"
                 android:textColor="@color/black_baozheng"
-                android:textSize="@dimen/all_text_size_low"
-                android:textStyle="bold" />
+                android:textSize="@dimen/all_text_size_low" />
 
         </RelativeLayout>
 

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

@@ -32,19 +32,20 @@
             app:layout_constraintStart_toStartOf="@id/item_tv"
             app:layout_constraintTop_toTopOf="@id/item_tv" />
 
+
         <View
             android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/item_tv"
+            android:layout_height="@dimen/all_padding"
+            android:background="@color/gray_zhouyu"
             app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
+            app:layout_constraintStart_toStartOf="@id/item_tv"
+            app:layout_constraintTop_toBottomOf="@id/item_tv" />
 
         <View
             android:layout_width="0dp"
-            android:layout_height="@dimen/all_padding"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@id/item_tv"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintBottom_toBottomOf="@id/item_tv"
             app:layout_constraintEnd_toEndOf="@id/item_tv"
             app:layout_constraintStart_toStartOf="@id/item_tv" />