表格样式修改

app/src/main/java/com/uas/jlt_storage/activity/SplashActivity.java

@@ -86,12 +86,12 @@ public class SplashActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
             //结束你的activity
             finish();
             return;
         }
+        super.onCreate(savedInstanceState);
     }
 
     @Override

app/src/main/java/com/uas/jlt_storage/fragment/JLTPickMaterialOutBoxFragment.java

@@ -1,7 +1,9 @@
 package com.uas.jlt_storage.fragment;
 
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -15,8 +17,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
 import com.bin.david.form.data.column.ArrayColumn;
 import com.bin.david.form.data.format.IFormat;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.uas.jlt_storage.R;
 import com.uas.jlt_storage.activity.FunctionActivity;
@@ -91,11 +97,21 @@ public class JLTPickMaterialOutBoxFragment extends BaseFragment implements JLTPi
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(8)
-                .setColumnTitleVerticalPadding(8)
-                .setHorizontalPadding(10)
-                .setSequenceHorizontalPadding(10)
-                .setColumnTitleHorizontalPadding(10);
+                .setVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
 
         mPosColumn = new ArrayColumn<Long>("序号", "POS");
         mPosColumn.setFixed(true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTPickMaterialOutFragment.java

@@ -1,7 +1,9 @@
 package com.uas.jlt_storage.fragment;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
@@ -23,9 +25,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
 import com.bin.david.form.data.column.ArrayColumn;
 import com.bin.david.form.data.column.Column;
 import com.bin.david.form.data.format.IFormat;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.bin.david.form.listener.OnColumnItemClickListener;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -109,11 +115,21 @@ public class JLTPickMaterialOutFragment extends BaseFragment implements OnColumn
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(8)
-                .setColumnTitleVerticalPadding(8)
-                .setHorizontalPadding(10)
-                .setSequenceHorizontalPadding(10)
-                .setColumnTitleHorizontalPadding(10);
+                .setVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
 
         mPosColumn = new ArrayColumn<Long>("序号", "RN");
         mPosColumn.setFixed(true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTStockInquiryLocationFragment.java

@@ -1,6 +1,8 @@
 package com.uas.jlt_storage.fragment;
 
+import android.graphics.Color;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -16,8 +18,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
 import com.bin.david.form.data.column.ArrayColumn;
 import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.uas.jlt_storage.R;
@@ -84,11 +90,21 @@ public class JLTStockInquiryLocationFragment extends BaseFragment {
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(8)
-                .setColumnTitleVerticalPadding(8)
-                .setHorizontalPadding(10)
-                .setSequenceHorizontalPadding(10)
-                .setColumnTitleHorizontalPadding(10);
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
 
         mPosColumn = new Column<Long>("序号", "RN");
         mPosColumn.setFixed(true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTStockInquiryModelFragment.java

@@ -1,5 +1,7 @@
 package com.uas.jlt_storage.fragment;
 
+import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -14,7 +16,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
 import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.uas.jlt_storage.R;
 import com.uas.jlt_storage.activity.FunctionActivity;
@@ -78,11 +84,21 @@ public class JLTStockInquiryModelFragment extends BaseFragment {
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(8)
-                .setColumnTitleVerticalPadding(8)
-                .setHorizontalPadding(10)
-                .setSequenceHorizontalPadding(10)
-                .setColumnTitleHorizontalPadding(10);
+                .setVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
 
         mPosColumn = new Column<Long>("序号", "RN");
         mPosColumn.setFixed(true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageMaterialMoveFragment.java

@@ -1,6 +1,8 @@
 package com.uas.jlt_storage.fragment;
 
+import android.graphics.Color;
 import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -14,10 +16,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.core.TableConfig;
+import com.bin.david.form.data.CellInfo;
 import com.bin.david.form.data.column.ArrayColumn;
 import com.bin.david.form.data.column.Column;
 import com.bin.david.form.data.column.ColumnInfo;
 import com.bin.david.form.data.format.IFormat;
+import com.bin.david.form.data.format.bg.BaseCellBackgroundFormat;
+import com.bin.david.form.data.style.FontStyle;
 import com.bin.david.form.data.table.TableData;
 import com.bin.david.form.listener.OnColumnClickListener;
 import com.bin.david.form.listener.OnColumnItemClickListener;
@@ -86,11 +92,21 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(8)
-                .setColumnTitleVerticalPadding(8)
-                .setHorizontalPadding(10)
-                .setSequenceHorizontalPadding(10)
-                .setColumnTitleHorizontalPadding(10);
+                .setVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,10))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
+                    @Override
+                    public int getBackGroundColor(CellInfo cellInfo) {
+                        if (cellInfo.row % 2 == 0) {
+                            return ContextCompat.getColor(mActivity, R.color.blue_50);
+                        }
+                        return TableConfig.INVALID_COLOR;
+                    }
+                });
 
         mPosColumn = new ArrayColumn<Long>("序号", "POS");
         mPosColumn.setFixed(true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTUpperShelfBoxFragment.java

@@ -167,6 +167,12 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
         if (!TextUtils.isEmpty(whcode)) {
             mWhcodeEditText.setText(whcode);
             checkWhcode();
+        } else {
+            whcode = SharedPreUtil.getString(mActivity, Constants.FLAG.DEFAULT_WAREHOUSE_CACHE + CommonUtil.getUserName(mActivity), "");
+            if (!TextUtils.isEmpty(whcode)) {
+                mWhcodeEditText.setText(whcode);
+                checkWhcode();
+            }
         }
     }
 

app/src/main/java/com/uas/jlt_storage/fragment/JltStorageInFilterFragment.java

@@ -130,9 +130,14 @@ public class JltStorageInFilterFragment extends BaseFragment implements View.OnC
 
     @Override
     protected void initDatas() {
-        String whcode = SharedPreUtil.getString(mActivity, Constants.FLAG.JLT_UPPER_SHELF_BOX, "");
+        String whcode = SharedPreUtil.getString(mActivity, Constants.FLAG.JLT_STORAGE_IN_BOX, "");
         if (!TextUtils.isEmpty(whcode)) {
             mWhcodeEditText.setText(whcode);
+        } else {
+            whcode = SharedPreUtil.getString(mActivity, Constants.FLAG.DEFAULT_WAREHOUSE_CACHE + CommonUtil.getUserName(mActivity), "");
+            if (!TextUtils.isEmpty(whcode)) {
+                mWhcodeEditText.setText(whcode);
+            }
         }
     }
 
@@ -168,6 +173,8 @@ public class JltStorageInFilterFragment extends BaseFragment implements View.OnC
                 JltStorageInFilterListFragment filterListFragment = new JltStorageInFilterListFragment();
                 String supplier = mSupplierEditText.getText().toString().trim();
                 String whcode = mWhcodeEditText.getText().toString().trim();
+                SharedPreUtil.saveString(mActivity, Constants.FLAG.JLT_STORAGE_IN_BOX, whcode);
+
                 String startDate = mStartdatTextView.getText().toString().trim();
                 String endDate = mEnddateTextView.getText().toString().trim();
 

app/src/main/java/com/uas/jlt_storage/util/CommonUtil.java

@@ -18,6 +18,7 @@ import android.text.TextWatcher;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -300,6 +301,34 @@ public class CommonUtil {
         return (int) (pxValue / scale + 0.5f);
     }
 
+
+    /**
+     * sp转px
+     *
+     * @param context
+     * @return
+     */
+
+    public static int sp2px(Context context, float spVal) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
+
+                spVal, context.getResources().getDisplayMetrics());
+
+    }
+
+
+    /**
+     * px转sp
+     *
+     * @param pxVal
+     * @return
+     */
+
+    public static float px2sp(Context context, float pxVal) {
+        return (pxVal / context.getResources().getDisplayMetrics().scaledDensity);
+    }
+
+
     /**
      * 检测网络是否可用
      *

app/src/main/java/com/uas/jlt_storage/util/Constants.java

@@ -104,6 +104,8 @@ public interface Constants {
         String JLT_PICK_MATERIAL_NUM = "jlt_pick_material_num";
         //按箱上架-仓库缓存
         String JLT_UPPER_SHELF_BOX = "jlt_upper_shelf_box";
+        //入库筛选-仓库缓存
+        String JLT_STORAGE_IN_BOX = "jlt_storage_in_box";
 
 
         /******************************************

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

@@ -69,70 +69,45 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="总计"
-            android:textColor="#333333" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="型号："
             android:textColor="#333333" />
 
         <TextView
             android:id="@+id/jlt_stock_inquiry_location_model_tv"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="2"
+            android:layout_weight="3"
             android:textColor="#333333"
             tools:text="1232" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="个"
-            android:textColor="#333333" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="数量："
             android:textColor="#333333" />
 
         <TextView
             android:id="@+id/jlt_stock_inquiry_location_quantity_tv"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="3"
             android:textColor="#333333"
             tools:text="1232" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="总计"
-            android:textColor="#333333"
-            android:visibility="invisible" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="箱数："
             android:textColor="#333333" />
 
         <TextView
             android:id="@+id/jlt_stock_inquiry_location_box_tv"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="2"
+            android:layout_weight="3"
             android:textColor="#333333"
             tools:text="1232" />
     </LinearLayout>

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

@@ -89,18 +89,12 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="总计"
-            android:textColor="#333333" />
+        android:layout_marginTop="6dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="仓库："
             android:textColor="#333333" />
 
@@ -115,7 +109,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="仓位："
             android:textColor="#333333" />
 
@@ -126,25 +120,17 @@
             android:layout_weight="3"
             android:textColor="#333333"
             tools:text="1232" />
+
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="总计"
-            android:textColor="#333333"
-            android:visibility="invisible" />
-
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="数量："
             android:textColor="#333333" />
 
@@ -159,7 +145,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="4dp"
             android:text="箱数："
             android:textColor="#333333" />
 

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

@@ -2,16 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical"
-    android:padding="16dp"
-    android:background="@color/white">
+    android:padding="12dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
         <TextView
             style="@style/inputItemCaption"
@@ -33,8 +33,8 @@
             android:id="@+id/jlt_upper_shelf_box_search_iv"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:padding="10dp"
             android:background="@color/white"
+            android:padding="10dp"
             android:src="@drawable/icon_search" />
     </LinearLayout>
 
@@ -87,12 +87,23 @@
             android:hint="请采集箱号" />
     </LinearLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:text="已选箱号"
-        android:textColor="#333333" />
+        android:layout_margin="12dp">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已选箱号"
+            android:textColor="#333333" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="*"
+            android:paddingHorizontal="4dp"
+            android:textColor="@color/red" />
+    </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/jlt_upper_shelf_box_box_rv"