增加备注信息

app/src/main/java/com/fxy/putIn/TallyMainActivity.java

@@ -106,6 +106,8 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
     @BindView(R.id.mt_putin_qty)
     MarqueeTextView mtPutinQty;
 
+    @BindView(R.id.mt_hold_remark)
+    MarqueeTextView mtHoldRemark;
 
     @BindView(R.id.mt_customer_code)
     MarqueeTextView mtCustomerCode;
@@ -121,7 +123,8 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
     @BindView(R.id.ll_customer_code)
     LinearLayout llCustomerCode;
 
-
+    @BindView(R.id.ll_hold_remark)
+    LinearLayout llHoldRemark;
 
 
     @BindView(R.id.btn_change_confirm)
@@ -848,6 +851,14 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             mtSendWay.setText(send_way);
             mtPutinQty.setText(putin_qty);
 
+            if (jsonObject.has("hold_remark") && !jsonObject.getString("hold_remark").isEmpty()){
+                mtHoldRemark.setText(jsonObject.getString("hold_remark"));
+                llHoldRemark.setVisibility(View.VISIBLE);
+            }else{
+                mtHoldRemark.setText("");
+                llHoldRemark.setVisibility(View.GONE);
+            }
+
             customerCode = "";
 
         }catch (JSONException e) {
@@ -865,9 +876,11 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
         llCustomerCode.setVisibility(View.GONE);
         if (isAll){
             llContainer.setVisibility(View.VISIBLE);
+            llHoldRemark.setVisibility(View.GONE);
             mtContainerCode.setText("");
             mtSendWay.setText("");
             mtPutinQty.setText("");
+            mtHoldRemark.setText("");
             etContainerCode.setText("");
             etContainerCode.requestFocus();
         }else{

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

@@ -190,6 +190,29 @@
 
                 </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/ll_hold_remark"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="5dp"
+                    android:paddingTop="5dp"
+                    android:visibility="gone"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:text="备注信息" />
+                    <TextView
+                        style="@style/tvLeftStyle"
+                        android:text="：" />
+
+                    <com.fxy.baselibrary.views.MarqueeTextView
+                        style="@style/mtRightStyle"
+                        android:id="@+id/mt_hold_remark"
+                        />
+
+                </LinearLayout>
+
 
                 <LinearLayout
                     android:id="@+id/ll_customer_code"

config.gradle

@@ -8,7 +8,7 @@ ext {
             minSdkVersion    : 17,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.7.0",
+            versionName      : "2.7.1",
             versionApi       : "2.7",
             versionRealm     : 2,
     ]