1

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jiaju.activity"
     android:versionCode="1"
-    android:versionName="1.1.22.0703"  >
+    android:versionName="1.1.24.0513"  >
 
     <uses-sdk
         android:minSdkVersion="14"

bin/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jiaju.activity"
     android:versionCode="1"
-    android:versionName="1.1.22.0703"  >
+    android:versionName="1.1.24.0513"  >
 
     <uses-sdk
         android:minSdkVersion="14"

gen/com/jiaju/activity/R.java

@@ -2063,7 +2063,7 @@ containing a value of this type.
     }
     public static final class id {
         public static final int AddBtn=0x7f09028d;
-        public static final int CurrentVersionTxtTitle=0x7f090487;
+        public static final int CurrentVersionTxtTitle=0x7f09048a;
         public static final int InKilnTime=0x7f0903c4;
         public static final int InKilnTimeLay=0x7f09018f;
         public static final int IpTitle=0x7f09004f;
@@ -2072,17 +2072,17 @@ containing a value of this type.
         public static final int ItemText2=0x7f090351;
         public static final int ItemText3=0x7f090352;
         public static final int ItemText4=0x7f090353;
-        public static final int Itemt1=0x7f09040a;
-        public static final int Itemt2=0x7f09040b;
-        public static final int Itemt3=0x7f09040c;
-        public static final int Itemt4=0x7f09040d;
-        public static final int ReLayout=0x7f090409;
+        public static final int Itemt1=0x7f09040d;
+        public static final int Itemt2=0x7f09040e;
+        public static final int Itemt3=0x7f09040f;
+        public static final int Itemt4=0x7f090410;
+        public static final int ReLayout=0x7f09040c;
         public static final int Refresh=0x7f090177;
         public static final int Search=0x7f090176;
         public static final int UpdateBtn=0x7f09028c;
-        public static final int VersionLay=0x7f090485;
+        public static final int VersionLay=0x7f090488;
         public static final int about=0x7f0901bb;
-        public static final int action_settings=0x7f09049b;
+        public static final int action_settings=0x7f09049e;
         public static final int addIv=0x7f09038d;
         public static final int addlay=0x7f09028b;
         public static final int afterDescendants=0x7f09003b;
@@ -2105,9 +2105,9 @@ containing a value of this type.
         public static final int badBilletLst=0x7f0901d0;
         public static final int badBilletProcedure=0x7f0902db;
         public static final int badCount=0x7f0902e0;
-        public static final int badcount=0x7f090495;
+        public static final int badcount=0x7f090498;
         public static final int badnumTv=0x7f0903e0;
-        public static final int badpercent=0x7f090496;
+        public static final int badpercent=0x7f090499;
         public static final int badstatisticslst=0x7f090290;
         public static final int bar_code=0x7f0900ec;
         public static final int barcode=0x7f090295;
@@ -2138,7 +2138,7 @@ containing a value of this type.
         public static final int batchNoLay=0x7f09030f;
         public static final int batchNoTitle=0x7f09030e;
         public static final int beforeDescendants=0x7f09003c;
-        public static final int beginTimeSelector=0x7f09045b;
+        public static final int beginTimeSelector=0x7f09045e;
         public static final int billetDateTv=0x7f0902f7;
         public static final int billetLin=0x7f0903c9;
         public static final int billetflag=0x7f0903ca;
@@ -2147,7 +2147,7 @@ containing a value of this type.
         public static final int body=0x7f09009f;
         public static final int bodyLin=0x7f09013a;
         public static final int bodyScroll=0x7f0901c5;
-        public static final int body_area=0x7f09046d;
+        public static final int body_area=0x7f090470;
         public static final int bodylay=0x7f09019c;
         public static final int both=0x7f09000c;
         public static final int bottom=0x7f090059;
@@ -2158,9 +2158,9 @@ containing a value of this type.
         public static final int btnCheckAll=0x7f0900d1;
         public static final int btnCheckallTxt=0x7f0900d2;
         public static final int btnGroutingLineSearch=0x7f090101;
-        public static final int btnOK=0x7f09041c;
+        public static final int btnOK=0x7f09041f;
         public static final int btnSave=0x7f0900d3;
-        public static final int btnSearch=0x7f09045f;
+        public static final int btnSearch=0x7f090462;
         public static final int btnSelectProcedure=0x7f090270;
         public static final int btnSubmit=0x7f0903a3;
         public static final int btnSure=0x7f0900f9;
@@ -2171,7 +2171,7 @@ containing a value of this type.
         public static final int btnsave=0x7f090125;
         public static final int btnselectWorker=0x7f090245;
         public static final int btnsure=0x7f09018a;
-        public static final int bugLocLay=0x7f09044c;
+        public static final int bugLocLay=0x7f09044f;
         public static final int bugLocSpinner=0x7f09029b;
         public static final int bugProductTitle=0x7f090255;
         public static final int bugimg=0x7f09025a;
@@ -2180,7 +2180,7 @@ containing a value of this type.
         public static final int bugnamelay=0x7f090234;
         public static final int bugnametxt=0x7f090237;
         public static final int bugnnamelay=0x7f090236;
-        public static final int bugnoEdt=0x7f090482;
+        public static final int bugnoEdt=0x7f090485;
         public static final int bugnoSpinner=0x7f090299;
         public static final int bugnoTitle=0x7f090232;
         public static final int bugnolay=0x7f090231;
@@ -2201,7 +2201,7 @@ containing a value of this type.
         public static final int cancel_listview=0x7f090097;
         public static final int cancelloadcar=0x7f0903f3;
         public static final int cancelrecheck_save=0x7f0900a6;
-        public static final int cancle=0x7f090410;
+        public static final int cancle=0x7f090413;
         public static final int cancleScrapBtn=0x7f090079;
         public static final int cartLocTitle=0x7f0903b7;
         public static final int cartLoclay=0x7f0903b6;
@@ -2269,9 +2269,9 @@ containing a value of this type.
         public static final int codetxt=0x7f0900a5;
         public static final int collect=0x7f09034f;
         public static final int completeProcedure=0x7f0902df;
-        public static final int completeProcedureLay=0x7f090431;
-        public static final int completeProcedureTitle=0x7f090430;
-        public static final int completeProcedureTxt=0x7f090432;
+        public static final int completeProcedureLay=0x7f090434;
+        public static final int completeProcedureTitle=0x7f090433;
+        public static final int completeProcedureTxt=0x7f090435;
         public static final int configDate=0x7f09034b;
         public static final int configdateTitle=0x7f09012a;
         public static final int configdatelay=0x7f090129;
@@ -2288,8 +2288,8 @@ containing a value of this type.
         public static final int currentMonthRadio=0x7f0901db;
         public static final int currentProcedureFinishedTime=0x7f0902eb;
         public static final int currentProcedureName=0x7f0902ea;
-        public static final int currentVersionLay=0x7f090486;
-        public static final int currentVersionTxt=0x7f090488;
+        public static final int currentVersionLay=0x7f090489;
+        public static final int currentVersionTxt=0x7f09048b;
         public static final int current_bind_barcode_lst=0x7f090081;
         public static final int dataSumTv=0x7f0901c9;
         public static final int dateIv=0x7f090119;
@@ -2308,7 +2308,7 @@ containing a value of this type.
         public static final int decode_succeeded=0x7f090003;
         public static final int defaultPosition=0x7f090025;
         public static final int defectDeductionLay=0x7f09037a;
-        public static final int defectFineTv=0x7f09043f;
+        public static final int defectFineTv=0x7f090442;
         public static final int defect_deduction=0x7f09037b;
         public static final int defect_fines=0x7f090344;
         public static final int defectdeductionTitle=0x7f09024a;
@@ -2317,7 +2317,7 @@ containing a value of this type.
         public static final int defectfineTitle=0x7f090247;
         public static final int defectfinelay=0x7f090246;
         public static final int defectfinetxt=0x7f090248;
-        public static final int del=0x7f09047d;
+        public static final int del=0x7f090480;
         public static final int delbtn=0x7f090397;
         public static final int deleteGroutingDate=0x7f090307;
         public static final int deleteMakeBillet=0x7f09030c;
@@ -2331,7 +2331,7 @@ containing a value of this type.
         public static final int detailRemarksTv=0x7f0902ce;
         public static final int disabled=0x7f09000f;
         public static final int dutyProcedure=0x7f0902dc;
-        public static final int dutyProcedureTv=0x7f09041f;
+        public static final int dutyProcedureTv=0x7f090422;
         public static final int dutyperson_relative=0x7f09035e;
         public static final int editt=0x7f0900fe;
         public static final int edtBarCode=0x7f090080;
@@ -2341,24 +2341,24 @@ containing a value of this type.
         public static final int edtGroutingLine=0x7f090100;
         public static final int edtGroutingLineCode=0x7f090090;
         public static final int edtMouldCode=0x7f09007e;
-        public static final int edtSpotCheckResult=0x7f090455;
+        public static final int edtSpotCheckResult=0x7f090458;
         public static final int edtWaterLabel=0x7f0902b0;
         public static final int edt_barcode=0x7f0900ff;
-        public static final int edt_goodscode=0x7f090458;
-        public static final int edt_water_efficiency_label=0x7f09048c;
+        public static final int edt_goodscode=0x7f09045b;
+        public static final int edt_water_efficiency_label=0x7f09048f;
         public static final int edtbarcode=0x7f0900c7;
         public static final int empty=0x7f090192;
         public static final int encode_failed=0x7f090004;
         public static final int encode_succeeded=0x7f090005;
-        public static final int endTimeSelector=0x7f09045e;
+        public static final int endTimeSelector=0x7f090461;
         public static final int enddateselector=0x7f0901af;
         public static final int enddatetxt=0x7f0901ae;
         public static final int errmsgtxt=0x7f0901c3;
         public static final int errormessagelay=0x7f0901c1;
         public static final int errormsgtitle=0x7f0901c2;
-        public static final int et_popup_window_newpw=0x7f090415;
-        public static final int et_popup_window_okpw=0x7f090416;
-        public static final int et_popup_window_oldpw=0x7f090414;
+        public static final int et_popup_window_newpw=0x7f090418;
+        public static final int et_popup_window_okpw=0x7f090419;
+        public static final int et_popup_window_oldpw=0x7f090417;
         public static final int etbarcode=0x7f09025e;
         public static final int exit=0x7f0901be;
         public static final int expandablelay=0x7f09016e;
@@ -2375,26 +2375,27 @@ containing a value of this type.
         public static final int goodPercent=0x7f090377;
         public static final int goodType=0x7f090375;
         public static final int good_code=0x7f090407;
-        public static final int good_cpbm=0x7f090452;
-        public static final int good_date=0x7f090453;
-        public static final int good_gh=0x7f09040f;
-        public static final int good_ghmc1=0x7f090450;
-        public static final int good_scx=0x7f090451;
+        public static final int good_cpbm=0x7f090455;
+        public static final int good_date=0x7f090456;
+        public static final int good_gh=0x7f090412;
+        public static final int good_ghmc1=0x7f090453;
+        public static final int good_remarks=0x7f09040a;
+        public static final int good_scx=0x7f090454;
         public static final int good_tm=0x7f090408;
-        public static final int goodcount=0x7f090493;
-        public static final int goodpercent=0x7f090494;
+        public static final int goodcount=0x7f090496;
+        public static final int goodpercent=0x7f090497;
         public static final int goodsCode=0x7f0902dd;
         public static final int goodsCodeTitle=0x7f0900d8;
         public static final int goodsCodeTv=0x7f0901c8;
         public static final int goodsCodeTxt=0x7f090338;
-        public static final int goodsCount=0x7f09044f;
+        public static final int goodsCount=0x7f090452;
         public static final int goodsLevel=0x7f09026b;
-        public static final int goodsLevelTv=0x7f09043e;
-        public static final int goodsLevelTypeTxt=0x7f090480;
+        public static final int goodsLevelTv=0x7f090441;
+        public static final int goodsLevelTypeTxt=0x7f090483;
         public static final int goodsModelTv=0x7f0902f2;
         public static final int goodsModelTxt=0x7f0902d1;
-        public static final int goodsName=0x7f09044e;
-        public static final int goodsPercent=0x7f090421;
+        public static final int goodsName=0x7f090451;
+        public static final int goodsPercent=0x7f090424;
         public static final int goodsQuantity=0x7f0903a4;
         public static final int goodsSpecificationTv=0x7f0902f3;
         public static final int goodsTypeNameTv=0x7f0902f0;
@@ -2422,14 +2423,14 @@ containing a value of this type.
         public static final int groutingLineLay=0x7f090154;
         public static final int groutingLineTitle=0x7f090153;
         public static final int groutingLineTxt=0x7f090155;
-        public static final int groutingLinetxt=0x7f090429;
+        public static final int groutingLinetxt=0x7f09042c;
         public static final int groutingNum=0x7f0903cd;
         public static final int groutingNumTxt=0x7f0902d2;
         public static final int groutingTime=0x7f0902ec;
         public static final int groutingUserCodeTv=0x7f0902f4;
-        public static final int groutingUserTitle=0x7f09042d;
-        public static final int groutingUserlay=0x7f09042e;
-        public static final int groutingUsertxt=0x7f09042f;
+        public static final int groutingUserTitle=0x7f090430;
+        public static final int groutingUserlay=0x7f090431;
+        public static final int groutingUsertxt=0x7f090432;
         public static final int groutingWorkNo=0x7f090268;
         public static final int groutingWorkNoLay=0x7f090159;
         public static final int groutingWorkNoTitle=0x7f0900d5;
@@ -2451,8 +2452,8 @@ containing a value of this type.
         public static final int groutingdateTitle=0x7f090304;
         public static final int groutingdateTxt=0x7f090306;
         public static final int groutingdateselector=0x7f090308;
-        public static final int groutinglineTitle=0x7f090427;
-        public static final int groutinglinelay=0x7f090428;
+        public static final int groutinglineTitle=0x7f09042a;
+        public static final int groutinglinelay=0x7f09042b;
         public static final int groutingnoLay=0x7f090300;
         public static final int groutingnoTitle=0x7f0902ff;
         public static final int groutingnoTxt=0x7f090301;
@@ -2465,11 +2466,11 @@ containing a value of this type.
         public static final int handoverlst=0x7f090116;
         public static final int hardware=0x7f090028;
         public static final int head=0x7f090311;
-        public static final int head_arrowImageView=0x7f090441;
-        public static final int head_contentLayout=0x7f090440;
-        public static final int head_lastUpdatedTextView=0x7f090444;
-        public static final int head_progressBar=0x7f090442;
-        public static final int head_tipsTextView=0x7f090443;
+        public static final int head_arrowImageView=0x7f090444;
+        public static final int head_contentLayout=0x7f090443;
+        public static final int head_lastUpdatedTextView=0x7f090447;
+        public static final int head_progressBar=0x7f090445;
+        public static final int head_tipsTextView=0x7f090446;
         public static final int high=0x7f090020;
         public static final int horizontal=0x7f090018;
         public static final int hour=0x7f090404;
@@ -2509,23 +2510,23 @@ containing a value of this type.
         public static final int k50Tv=0x7f0903ee;
         public static final int kilin_code=0x7f090189;
         public static final int kilnCarLin=0x7f09039a;
-        public static final int kilnCode=0x7f090420;
+        public static final int kilnCode=0x7f090423;
         public static final int kilnEdt=0x7f0903ad;
         public static final int kilnNo=0x7f090374;
         public static final int kilnTitle=0x7f0903ac;
-        public static final int kiln_area=0x7f090470;
+        public static final int kiln_area=0x7f090473;
         public static final int kiln_car_ack=0x7f090211;
         public static final int kiln_car_code=0x7f09009d;
-        public static final int kiln_car_listView=0x7f090473;
-        public static final int kiln_car_location=0x7f09047c;
-        public static final int kiln_car_location_lay=0x7f09047b;
-        public static final int kiln_car_number=0x7f090472;
-        public static final int kiln_car_number_title=0x7f090471;
-        public static final int kiln_car_save=0x7f09046c;
+        public static final int kiln_car_listView=0x7f090476;
+        public static final int kiln_car_location=0x7f09047f;
+        public static final int kiln_car_location_lay=0x7f09047e;
+        public static final int kiln_car_number=0x7f090475;
+        public static final int kiln_car_number_title=0x7f090474;
+        public static final int kiln_car_save=0x7f09046f;
         public static final int kiln_car_title=0x7f09009c;
         public static final int kiln_code=0x7f09009a;
         public static final int kiln_title=0x7f090099;
-        public static final int kiln_txt=0x7f09046f;
+        public static final int kiln_txt=0x7f090472;
         public static final int kilncarCodeTxt=0x7f090197;
         public static final int kilncarMissScanLin=0x7f0903f4;
         public static final int kilncarNo=0x7f0903c3;
@@ -2537,7 +2538,7 @@ containing a value of this type.
         public static final int kilncarno=0x7f090312;
         public static final int kilncarproductlst=0x7f090199;
         public static final int kilncarstatisticstxt=0x7f09018d;
-        public static final int kilncarstatuslay=0x7f090423;
+        public static final int kilncarstatuslay=0x7f090426;
         public static final int kilncarstatuslst=0x7f090198;
         public static final int kilnlay=0x7f0903ab;
         public static final int kilnlocation=0x7f0903bd;
@@ -2555,7 +2556,7 @@ containing a value of this type.
         public static final int lin2=0x7f09009b;
         public static final int lin3=0x7f09008f;
         public static final int lin4=0x7f090212;
-        public static final int lin5=0x7f090424;
+        public static final int lin5=0x7f090427;
         public static final int line1=0x7f0903fa;
         public static final int line2=0x7f09022c;
         public static final int line5=0x7f0903fd;
@@ -2564,7 +2565,7 @@ containing a value of this type.
         public static final int liner1=0x7f090228;
         public static final int linerlayout01=0x7f090220;
         public static final int linerlayout02=0x7f090223;
-        public static final int listView=0x7f09041d;
+        public static final int listView=0x7f090420;
         public static final int listcount1=0x7f09021f;
         public static final int listlin=0x7f090164;
         public static final int listv1=0x7f090171;
@@ -2577,7 +2578,7 @@ containing a value of this type.
         public static final int listvwcollect=0x7f0900fd;
         public static final int ll_Head=0x7f0900c8;
         public static final int ll_barcode=0x7f090109;
-        public static final int ll_cancel=0x7f090419;
+        public static final int ll_cancel=0x7f09041c;
         public static final int ll_cost=0x7f0901ee;
         public static final int ll_grouting_count=0x7f0901f9;
         public static final int ll_grouting_line=0x7f090145;
@@ -2586,16 +2587,18 @@ containing a value of this type.
         public static final int ll_mould_no=0x7f090106;
         public static final int ll_mould_quantity=0x7f090064;
         public static final int ll_new_barcode=0x7f090204;
-        public static final int ll_ok=0x7f090417;
+        public static final int ll_ok=0x7f09041a;
         public static final int ll_parent=0x7f0903ce;
         public static final int ll_product_code=0x7f09005c;
         public static final int ll_standard_grouting_count=0x7f090068;
         public static final int ll_weight=0x7f0901eb;
         public static final int ll_work_no=0x7f0901f5;
+        public static final int llay_remarks=0x7f090409;
+        public static final int llay_remarks_view=0x7f09040b;
         public static final int loadcar=0x7f0903f2;
-        public static final int loading_process_dialog_progressBar=0x7f09044b;
+        public static final int loading_process_dialog_progressBar=0x7f09044e;
         public static final int loadkilnstatistics=0x7f09038b;
-        public static final int locEdt=0x7f090483;
+        public static final int locEdt=0x7f090486;
         public static final int locTitle=0x7f090239;
         public static final int locale=0x7f09002b;
         public static final int loclay=0x7f090238;
@@ -2649,9 +2652,9 @@ containing a value of this type.
         public static final int mimalay=0x7f0901a3;
         public static final int min=0x7f090405;
         public static final int missing_defect_dutyperson=0x7f090343;
-        public static final int missing_defect_dutyperson_lay=0x7f09047f;
+        public static final int missing_defect_dutyperson_lay=0x7f090482;
         public static final int missing_defect_workno=0x7f090342;
-        public static final int missing_defect_workno_lay=0x7f09047e;
+        public static final int missing_defect_workno_lay=0x7f090481;
         public static final int missingdefectbtnselectWorker=0x7f090253;
         public static final int missingdefectbugnolay=0x7f09024e;
         public static final int missingdefectworkernameTitle=0x7f090251;
@@ -2682,7 +2685,7 @@ containing a value of this type.
         public static final int mouldCodeTv=0x7f0902b8;
         public static final int mouldCodeTxt=0x7f090158;
         public static final int mouldInfoChecked=0x7f0902c8;
-        public static final int mouldNo=0x7f09040e;
+        public static final int mouldNo=0x7f090411;
         public static final int mouldNoTxt=0x7f09033a;
         public static final int mouldStatusTxt=0x7f0902d0;
         public static final int mould_barcodeTv=0x7f0902c9;
@@ -2707,11 +2710,11 @@ containing a value of this type.
         public static final int mould_type_spinner=0x7f0901e5;
         public static final int mould_type_title=0x7f0901e4;
         public static final int mouldcode=0x7f0902e8;
-        public static final int mouldingCodeTitle=0x7f09042a;
-        public static final int mouldingCodelay=0x7f09042b;
-        public static final int mouldingCodetxt=0x7f09042c;
+        public static final int mouldingCodeTitle=0x7f09042d;
+        public static final int mouldingCodelay=0x7f09042e;
+        public static final int mouldingCodetxt=0x7f09042f;
         public static final int mouldno=0x7f0903cc;
-        public static final int moveview=0x7f090475;
+        public static final int moveview=0x7f090478;
         public static final int multipleChoice=0x7f090040;
         public static final int multipleChoiceModal=0x7f090041;
         public static final int never=0x7f090024;
@@ -2741,8 +2744,8 @@ containing a value of this type.
         public static final int orderTitle=0x7f0900e5;
         public static final int order_title=0x7f0900e2;
         public static final int orderlst=0x7f0900e8;
-        public static final int organization=0x7f090490;
-        public static final int organizationName=0x7f090464;
+        public static final int organization=0x7f090493;
+        public static final int organizationName=0x7f090467;
         public static final int organizationTitle=0x7f090286;
         public static final int organizationlay=0x7f090285;
         public static final int organizationtxt=0x7f090287;
@@ -2773,7 +2776,7 @@ containing a value of this type.
         public static final int parentRel=0x7f090075;
         public static final int parentlay=0x7f090112;
         public static final int passwordlogo=0x7f0901a4;
-        public static final int pcount=0x7f090491;
+        public static final int pcount=0x7f090494;
         public static final int photo=0x7f0903fc;
         public static final int photoselect=0x7f0903f9;
         public static final int picture=0x7f0903fb;
@@ -2781,8 +2784,8 @@ containing a value of this type.
         public static final int portTitle=0x7f090052;
         public static final int portTxt=0x7f090053;
         public static final int port_area=0x7f0902a4;
-        public static final int post=0x7f090466;
-        public static final int ppercent=0x7f090492;
+        public static final int post=0x7f090469;
+        public static final int ppercent=0x7f090495;
         public static final int preview_view=0x7f09031d;
         public static final int previousMonthRadio=0x7f0901da;
         public static final int printNumEdt=0x7f090368;
@@ -2795,7 +2798,7 @@ containing a value of this type.
         public static final int printerlay=0x7f090070;
         public static final int procedureLay=0x7f09026e;
         public static final int procedureName=0x7f0903c5;
-        public static final int procedureNameTv=0x7f090449;
+        public static final int procedureNameTv=0x7f09044c;
         public static final int procedureNameTxt=0x7f09033b;
         public static final int procedureTitle=0x7f09023d;
         public static final int procedureTv=0x7f09026f;
@@ -2803,23 +2806,23 @@ containing a value of this type.
         public static final int procedurespinner=0x7f090278;
         public static final int proceduretime=0x7f0903c6;
         public static final int proceduretxt=0x7f09018c;
-        public static final int produce_code_area=0x7f09046e;
+        public static final int produce_code_area=0x7f090471;
         public static final int produce_number_title=0x7f0900ea;
         public static final int productCode=0x7f0902e9;
         public static final int productCodeTitle=0x7f09017e;
         public static final int productInfoLst=0x7f090110;
         public static final int productLine=0x7f090216;
-        public static final int productLinetxt=0x7f090426;
+        public static final int productLinetxt=0x7f090429;
         public static final int productNameTv=0x7f0902c4;
         public static final int productRecord=0x7f090386;
         public static final int productSearch=0x7f090122;
         public static final int productSearchBtn=0x7f09011d;
         public static final int productType=0x7f090260;
-        public static final int product_bar_code=0x7f090477;
-        public static final int product_bar_code_lay=0x7f090476;
-        public static final int product_code=0x7f090479;
+        public static final int product_bar_code=0x7f09047a;
+        public static final int product_bar_code_lay=0x7f090479;
+        public static final int product_code=0x7f09047c;
         public static final int product_code_edt=0x7f09005f;
-        public static final int product_code_lay=0x7f090478;
+        public static final int product_code_lay=0x7f09047b;
         public static final int product_code_title=0x7f09005d;
         public static final int product_code_txt=0x7f090209;
         public static final int productcodeTitle=0x7f090150;
@@ -2830,10 +2833,10 @@ containing a value of this type.
         public static final int productioncode=0x7f0903bb;
         public static final int productioncodeTitle=0x7f0903ba;
         public static final int productlineName=0x7f0903f5;
-        public static final int productlineTitle=0x7f090425;
+        public static final int productlineTitle=0x7f090428;
         public static final int productlinelay=0x7f09014e;
         public static final int productlist=0x7f090123;
-        public static final int productpath=0x7f090422;
+        public static final int productpath=0x7f090425;
         public static final int productquantitylist=0x7f090274;
         public static final int productworknoTitle=0x7f09039c;
         public static final int productworknolay=0x7f09039b;
@@ -2846,8 +2849,8 @@ containing a value of this type.
         public static final int pullFromEnd=0x7f090011;
         public static final int pullFromStart=0x7f090012;
         public static final int pullUpFromBottom=0x7f09000e;
-        public static final int pulldown_footer_loading=0x7f090446;
-        public static final int pulldown_footer_text=0x7f090445;
+        public static final int pulldown_footer_loading=0x7f090449;
+        public static final int pulldown_footer_text=0x7f090448;
         public static final int quantityTitle=0x7f09017f;
         public static final int quantityTv=0x7f090382;
         public static final int quit=0x7f090007;
@@ -2866,8 +2869,8 @@ containing a value of this type.
         public static final int refineTitle=0x7f090219;
         public static final int refinelay=0x7f090218;
         public static final int refinetxt=0x7f09021a;
-        public static final int refirecount=0x7f090499;
-        public static final int refirepercent=0x7f09049a;
+        public static final int refirecount=0x7f09049c;
+        public static final int refirepercent=0x7f09049d;
         public static final int refreshBtn=0x7f090148;
         public static final int relativeLayout=0x7f090314;
         public static final int remadeLin=0x7f0901d4;
@@ -2876,7 +2879,7 @@ containing a value of this type.
         public static final int remarksEdt=0x7f0902bd;
         public static final int rememberPasswordTxt=0x7f0901a7;
         public static final int remember_password=0x7f0901a6;
-        public static final int repairFlagTxt=0x7f090481;
+        public static final int repairFlagTxt=0x7f090484;
         public static final int repairTitle=0x7f0900b1;
         public static final int repairlay=0x7f0900b0;
         public static final int repairtxt=0x7f0900b3;
@@ -2885,7 +2888,7 @@ containing a value of this type.
         public static final int restart_preview=0x7f090008;
         public static final int return_mix_area=0x7f0900ee;
         public static final int return_scan_result=0x7f090009;
-        public static final int reworkCount=0x7f09044a;
+        public static final int reworkCount=0x7f09044d;
         public static final int reworkProcedure=0x7f090297;
         public static final int reworkProcedureTitle=0x7f0900b5;
         public static final int reworkProcedureTxt=0x7f0900b6;
@@ -2900,7 +2903,7 @@ containing a value of this type.
         public static final int right=0x7f090027;
         public static final int rightTv=0x7f0903d9;
         public static final int rightsLst=0x7f0903d8;
-        public static final int rl_popup_window=0x7f090412;
+        public static final int rl_popup_window=0x7f090415;
         public static final int rlyt_menu=0x7f0902e1;
         public static final int rootView=0x7f0900f7;
         public static final int rotate=0x7f090014;
@@ -2915,7 +2918,7 @@ containing a value of this type.
         public static final int scrapDateTitle=0x7f09015f;
         public static final int scrapDatelay=0x7f09015e;
         public static final int scrapDatetxt=0x7f090160;
-        public static final int scrapProcedureTv=0x7f09041e;
+        public static final int scrapProcedureTv=0x7f090421;
         public static final int scrapReasonLin=0x7f09013f;
         public static final int scrapReasonSpin=0x7f09016a;
         public static final int scrapReasonTitle=0x7f090169;
@@ -2931,16 +2934,16 @@ containing a value of this type.
         public static final int scrap_reason_title=0x7f090140;
         public static final int scrap_save=0x7f0901fe;
         public static final int scrap_title=0x7f0901fd;
-        public static final int scrapdateTitle=0x7f090434;
-        public static final int scrapdatelay=0x7f090433;
-        public static final int scrapdateselector=0x7f090436;
-        public static final int scrapdatetxt=0x7f090435;
-        public static final int scrapfinesTitle=0x7f090438;
-        public static final int scrapfineslay=0x7f090437;
-        public static final int scrapfinestxt=0x7f090439;
-        public static final int scrapreasonTitle=0x7f09043b;
-        public static final int scrapreasonlay=0x7f09043a;
-        public static final int scrapreasonspin=0x7f09043c;
+        public static final int scrapdateTitle=0x7f090437;
+        public static final int scrapdatelay=0x7f090436;
+        public static final int scrapdateselector=0x7f090439;
+        public static final int scrapdatetxt=0x7f090438;
+        public static final int scrapfinesTitle=0x7f09043b;
+        public static final int scrapfineslay=0x7f09043a;
+        public static final int scrapfinestxt=0x7f09043c;
+        public static final int scrapreasonTitle=0x7f09043e;
+        public static final int scrapreasonlay=0x7f09043d;
+        public static final int scrapreasonspin=0x7f09043f;
         public static final int scrollLay=0x7f09014b;
         public static final int scrolling=0x7f09003a;
         public static final int scrolllay=0x7f09005b;
@@ -2955,7 +2958,7 @@ containing a value of this type.
         public static final int selectflag=0x7f09035f;
         public static final int semiCheckDefectLin=0x7f0901d1;
         public static final int semiCheckDefectLst=0x7f0901d3;
-        public static final int semiCheckTypeTv=0x7f090448;
+        public static final int semiCheckTypeTv=0x7f09044b;
         public static final int semicheckStatus=0x7f090277;
         public static final int semicheckTitle=0x7f0900c0;
         public static final int semicheckWorknoTitle=0x7f0900bb;
@@ -2972,9 +2975,9 @@ containing a value of this type.
         public static final int separator4=0x7f0901d5;
         public static final int serverDescRelative=0x7f09004d;
         public static final int serverIpRelative=0x7f09004e;
-        public static final int serverVersionLay=0x7f090489;
-        public static final int serverVersionTxt=0x7f09048b;
-        public static final int serverVersionTxtTitle=0x7f09048a;
+        public static final int serverVersionLay=0x7f09048c;
+        public static final int serverVersionTxt=0x7f09048e;
+        public static final int serverVersionTxtTitle=0x7f09048d;
         public static final int serviceNameLin=0x7f090054;
         public static final int serviceNameTitle=0x7f090055;
         public static final int serviceNameTxt=0x7f090056;
@@ -2987,7 +2990,7 @@ containing a value of this type.
         public static final int setting=0x7f09038c;
         public static final int setting_collect=0x7f09038e;
         public static final int settlementSearchBtn=0x7f0901dc;
-        public static final int simple_item_0=0x7f090454;
+        public static final int simple_item_0=0x7f090457;
         public static final int singleChoice=0x7f090042;
         public static final int sinteringBatchBtn=0x7f0903b5;
         public static final int sinteringBatchEdt=0x7f0903b4;
@@ -3003,16 +3006,16 @@ containing a value of this type.
         public static final int special_defect=0x7f09037d;
         public static final int specialdefectcheck=0x7f090259;
         public static final int specialdefectlay=0x7f090257;
-        public static final int spotCheckBeginTimeLay=0x7f090459;
-        public static final int spotCheckEndTimeLay=0x7f09045c;
+        public static final int spotCheckBeginTimeLay=0x7f09045c;
+        public static final int spotCheckEndTimeLay=0x7f09045f;
         public static final int spot_check_record_listview=0x7f0902ab;
         public static final int spotcheck_listview=0x7f0902aa;
-        public static final int staffCode=0x7f09048f;
-        public static final int staffName=0x7f090463;
+        public static final int staffCode=0x7f090492;
+        public static final int staffName=0x7f090466;
         public static final int staffNameTxt=0x7f090361;
         public static final int staffSearch=0x7f0902ac;
-        public static final int staffStatus=0x7f090467;
-        public static final int staffWorkType=0x7f090465;
+        public static final int staffStatus=0x7f09046a;
+        public static final int staffWorkType=0x7f090468;
         public static final int staffcode=0x7f090360;
         public static final int staffcodeTitle=0x7f09027d;
         public static final int staffcodelay=0x7f09027c;
@@ -3043,9 +3046,9 @@ containing a value of this type.
         public static final int status=0x7f0903c0;
         public static final int statusLin=0x7f0903be;
         public static final int statusTitle=0x7f0903bf;
-        public static final int substandardcount=0x7f090497;
-        public static final int substandardpercent=0x7f090498;
-        public static final int sure=0x7f090411;
+        public static final int substandardcount=0x7f09049a;
+        public static final int substandardpercent=0x7f09049b;
+        public static final int sure=0x7f090414;
         public static final int sureBtn=0x7f09005a;
         public static final int suspendProcedureNameTxt=0x7f09033c;
         public static final int suspendRemarksTxt=0x7f09033d;
@@ -3088,7 +3091,7 @@ containing a value of this type.
         public static final int tile=0x7f090043;
         public static final int tileLay=0x7f090384;
         public static final int timepicker=0x7f090400;
-        public static final int tip=0x7f090484;
+        public static final int tip=0x7f090487;
         public static final int title=0x7f09038a;
         public static final int titleBadNumTv=0x7f0903df;
         public static final int titleBarcodeNumTv=0x7f0903db;
@@ -3114,7 +3117,7 @@ containing a value of this type.
         public static final int trademarkNameTxt=0x7f090217;
         public static final int trademarkSpinner=0x7f090379;
         public static final int trademarkTitle=0x7f090378;
-        public static final int trademark_lay=0x7f09047a;
+        public static final int trademark_lay=0x7f09047d;
         public static final int trademarklst=0x7f090115;
         public static final int trademarksource=0x7f09012f;
         public static final int tv=0x7f0901b6;
@@ -3122,15 +3125,15 @@ containing a value of this type.
         public static final int tv4=0x7f0901bf;
         public static final int tv5=0x7f0901bd;
         public static final int tvBarcode=0x7f0900c9;
-        public static final int tvBeginTime=0x7f09045a;
+        public static final int tvBeginTime=0x7f09045d;
         public static final int tvBilletDate=0x7f090324;
-        public static final int tvCheckTime=0x7f090460;
-        public static final int tvCheckUserCode=0x7f090461;
+        public static final int tvCheckTime=0x7f090463;
+        public static final int tvCheckUserCode=0x7f090464;
         public static final int tvCurrentWorkNo=0x7f09016c;
-        public static final int tvEndTime=0x7f09045d;
+        public static final int tvEndTime=0x7f090460;
         public static final int tvFinishedBarcode=0x7f090320;
         public static final int tvGoodsCode=0x7f0900ca;
-        public static final int tvGoodsModel=0x7f09048e;
+        public static final int tvGoodsModel=0x7f090491;
         public static final int tvGroutingBatch=0x7f090364;
         public static final int tvGroutingCount=0x7f0900ce;
         public static final int tvGroutingDate=0x7f09007c;
@@ -3150,35 +3153,35 @@ containing a value of this type.
         public static final int tvNoGroutingReason=0x7f0902da;
         public static final int tvOrderNo=0x7f090321;
         public static final int tvOutLabelCode=0x7f090263;
-        public static final int tvPackBarcode=0x7f09048d;
-        public static final int tvProcedureName=0x7f090457;
-        public static final int tvRemarks=0x7f090462;
+        public static final int tvPackBarcode=0x7f090490;
+        public static final int tvProcedureName=0x7f09045a;
+        public static final int tvRemarks=0x7f090465;
         public static final int tvReplaceWorkNo=0x7f09016d;
         public static final int tvReworkProcedure=0x7f0900cf;
-        public static final int tvStaffCode=0x7f090468;
-        public static final int tvStaffName=0x7f090469;
-        public static final int tvTitle=0x7f09041b;
+        public static final int tvStaffCode=0x7f09046b;
+        public static final int tvStaffName=0x7f09046c;
+        public static final int tvTitle=0x7f09041e;
         public static final int tvTrademark=0x7f0900cd;
-        public static final int tvUserCode=0x7f090456;
+        public static final int tvUserCode=0x7f090459;
         public static final int tvWorkno=0x7f09029d;
         public static final int tv_coating=0x7f0903d1;
         public static final int tv_functions=0x7f0903d0;
         public static final int tv_item=0x7f0903cf;
-        public static final int tv_popup_window_cancel=0x7f09041a;
-        public static final int tv_popup_window_ok=0x7f090418;
-        public static final int tv_popup_window_title=0x7f090413;
+        public static final int tv_popup_window_cancel=0x7f09041d;
+        public static final int tv_popup_window_ok=0x7f09041b;
+        public static final int tv_popup_window_title=0x7f090416;
         public static final int tvbarcode=0x7f090319;
         public static final int tvcode=0x7f09031a;
         public static final int tw=0x7f0900fc;
         public static final int tw_code=0x7f090406;
         public static final int twtm=0x7f09036c;
         public static final int typelay=0x7f090240;
-        public static final int typetxt=0x7f09044d;
+        public static final int typetxt=0x7f090450;
         public static final int unbind_barcode_lst=0x7f090091;
-        public static final int unload_title=0x7f09046b;
-        public static final int unloadline=0x7f090474;
+        public static final int unload_title=0x7f09046e;
+        public static final int unloadline=0x7f090477;
         public static final int unrecheckstatisticslst=0x7f090293;
-        public static final int updateBtn=0x7f09043d;
+        public static final int updateBtn=0x7f090440;
         public static final int upgradeLin=0x7f090057;
         public static final int userCodeTxt=0x7f0902d4;
         public static final int userName=0x7f09034a;
@@ -3210,7 +3213,7 @@ containing a value of this type.
         public static final int weight_edt=0x7f0901ed;
         public static final int weight_title=0x7f0901ec;
         public static final int wholelay=0x7f090215;
-        public static final int workJobsSp=0x7f09046a;
+        public static final int workJobsSp=0x7f09046d;
         public static final int work_no_edt=0x7f0901f8;
         public static final int work_no_title=0x7f0901f6;
         public static final int work_no_txt=0x7f09020b;
@@ -3226,7 +3229,7 @@ containing a value of this type.
         public static final int worknoTxt=0x7f0902fe;
         public static final int worknoWorkType=0x7f090363;
         public static final int workno_area=0x7f090294;
-        public static final int workno_edt=0x7f090447;
+        public static final int workno_edt=0x7f09044a;
         public static final int worknolay=0x7f090126;
         public static final int worknolist=0x7f09012c;
         public static final int worknoqualitystatisticslst=0x7f0902b2;

project.properties

@@ -11,5 +11,5 @@
 #proguard.config=proguard-android.txt:proguard-android-optimize.txt
 
 # Project target.
-target=Google Inc.:Google APIs:19
+target=android-19
 

res/layout/piece_head_view.xml

@@ -93,6 +93,55 @@
 
      </LinearLayout>
          <LinearLayout 
+               android:id="@+id/llay_remarks"
+          android:visibility="gone"
+         android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:layout_marginTop="5dp"
+         android:orientation="horizontal"   
+         android:layout_marginLeft="10dp"
+         >
+         <TextView 
+          
+             android:layout_width="100dp"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center"
+             android:text="备注："
+             android:textColor="@color/white"
+             android:textSize="@dimen/textsize_16"
+           
+             />
+
+         <EditText
+             android:id="@+id/good_remarks"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:layout_marginRight="10dp"
+             android:singleLine="true"
+             android:textSize="@dimen/textsize_24"
+             android:background="@null"
+             android:imeOptions="actionGo"
+             android:textColor="@color/white" 
+             android:text=""/>
+      
+         </LinearLayout>
+           <LinearLayout 
+             android:id="@+id/llay_remarks_view"
+             android:visibility="gone"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_marginLeft="110dp"
+             android:layout_marginRight="10dp"
+             android:orientation="vertical"
+             >
+              <View 
+              android:layout_width="fill_parent"
+               android:layout_height="1dp"
+               android:background="@color/text_gray"
+             />
+
+     </LinearLayout>
+         <LinearLayout 
              android:layout_width="fill_parent"
              android:layout_height="wrap_content"
              android:orientation="vertical"

src/com/jiaju/activity/DryRepairActivity.java

@@ -50,10 +50,11 @@ import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
-
+//맴껸
 public class DryRepairActivity extends Activity {
-	private EditText met; // 묏뵀
+	private EditText met,remarks; // 묏뵀
 	private EditText barcode; // 係쯤
+	private LinearLayout llay_remarks,llay_remarks_view;//구鬧꼈애
 	public Button bt2;// 횅땍객숩
 	private ImageButton btnCancle;// 럿쀼
 	private TextView backtext;
@@ -166,10 +167,15 @@ public class DryRepairActivity extends Activity {
 			View head=View.inflate(this,R.layout.piece_head_view,null);
 			btnCancle = (ImageButton) findViewById(R.id.left_img);
 			barcode = (EditText) head.findViewById(R.id.good_tm);
+			llay_remarks = (LinearLayout) head.findViewById(R.id.llay_remarks);
+			llay_remarks_view = (LinearLayout) head.findViewById(R.id.llay_remarks_view);
+			llay_remarks.setVisibility(View.VISIBLE);
+			llay_remarks_view.setVisibility(View.VISIBLE);
 			barcode.setRawInputType(InputType.TYPE_CLASS_NUMBER);
 			met = (EditText)head.findViewById(R.id.good_code);
 			bt2 = (Button) findViewById(R.id.btnsure);
 			backtext = (TextView) findViewById(R.id.back);
+			remarks = (EditText) head.findViewById(R.id.good_remarks);
 			list1 = (ListView) findViewById(R.id.message_listview);
 			list1.addHeaderView(head);
 			pieceAdapter = new PieceListMessageAdapter(DryRepairActivity.this,piecelist);
@@ -1091,6 +1097,7 @@ public class DryRepairActivity extends Activity {
 							if (collectType == 1) {
 								met.setEnabled(true);
 								met.setText("");
+								remarks.setText("");
 								met.setFocusable(true);
 								met.setFocusableInTouchMode(true);
 								met.requestFocus();
@@ -1276,9 +1283,11 @@ public class DryRepairActivity extends Activity {
 
 	private class SavePieceRunnable implements Runnable {
 		Object obj;
+		String remarks ;
 
-		public SavePieceRunnable(Object obj) {
+		public SavePieceRunnable(Object obj,String remarks) {
 			this.obj = obj;
+			this.remarks = remarks;
 		}
 
 		@Override
@@ -1302,7 +1311,8 @@ public class DryRepairActivity extends Activity {
 						String userName = p.getUserName();
 						obj.put("UserName", userName);
 						String barcode = p.getBarCode();
-						obj.put("Barcode", barcode);
+						obj.put("Barcode", barcode); 
+						obj.put("Remarks", remarks);
 						productionDataEntitys.put(obj);
 					}
 
@@ -1543,7 +1553,9 @@ public class DryRepairActivity extends Activity {
 		thread = new HandlerThread("SavePieceThread", 5);
 		thread.start();
 		mHandler = new Handler(thread.getLooper());
-		SavePieceRunnable savePieceRunnable = new SavePieceRunnable(obj);
+		String Remarks=  remarks.getText().toString().trim()
+				.replaceAll("\\n", "");
+		SavePieceRunnable savePieceRunnable = new SavePieceRunnable(obj,Remarks);
 		mHandler.post(savePieceRunnable);
 
 	}