1. 重烧登窑 焦点 产品条码

2. 安卓10 升级闪退
3. 点数装板 产品型号不一致 暂时注掉(新代码)

src/com/jiaju/activity/LoadKilnCarActivity.java

@@ -1865,6 +1865,7 @@ public class LoadKilnCarActivity extends BaseActivity {
 									}
 								}
 							}
+							 
 
 						} else {
 
@@ -2149,14 +2150,19 @@ public class LoadKilnCarActivity extends BaseActivity {
 					kilncarno.setEnabled(false);
 					//kilncarno.setFocusable(false);
 				}
-				
-				if (cartlist != null && cartlist.size() > 0) {
-
+				//
+ 			if (cartlist != null && cartlist.size() > 0) {
+ 				if (adapter == null) {
 					adapter = new LoadKilnCarListMessageAdapter(
 							LoadKilnCarActivity.this,cartlist);
 					mListView.setAdapter(adapter);
-					saveBtn.setText("±£´æ(" + cartlist.size() + ")");
+
+				} else {
+					adapter.notifyDataSetChanged();
 				}
+ 					saveBtn.setText("±£´æ(" + cartlist.size() + ")");
+ 			}
+ 			 
 				barcode.setEnabled(true);
 				barcode.setText("");
 				barcode.setFocusable(true);

src/com/jiaju/activity/PieceActivity.java

@@ -51,7 +51,7 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
-
+//点数装板
 public class PieceActivity extends Activity {
 	private EditText met; // 工号
 	private EditText barcode; // 条码
@@ -1862,6 +1862,7 @@ public class PieceActivity extends Activity {
 								out_goodsID = object1.getString("out_goodsID");
 								piece.setGoodsId(out_goodsID);
 								out_goodsCode = object1.getString("out_goodsCode");
+								String outGoodsCodeForCheck=object1.optString("out_goodsCode");
 								piece.setGoodsCode(out_goodsCode);
 								out_goodsName = object1.getString("out_goodsName");
 								piece.setGoodsName(out_goodsName);
@@ -1954,7 +1955,7 @@ public class PieceActivity extends Activity {
 							     String orginalGoodsModelForCheck=p2.getGoodsModel();
 							     String  originalGoodsCode=p2.getGoodsCode();
 									if(spm_011.equals("1")) {
-									if(!logoId.equals(originalLogoId))	{
+									if(!logoId.equals(originalLogoId))	{ 
 										Bundle bundle=new Bundle();
 										bundle.putInt("Status",0);
 										bundle.putString("Message","此产品【"+outbarcode+"】的商标【"+logoName+"】与此批次商标【"+originalLogoName+"】不同，不能进行该操作。");
@@ -1968,6 +1969,12 @@ public class PieceActivity extends Activity {
 									
 									if(spm_012.equals("1")) {
 										if(!goodsModelForCheck.equals(orginalGoodsModelForCheck)) {
+											//注掉为点数装板 限制同型号装板
+											//由于H01412M与H01412M-G物料编码一致
+											//这两个产品可以装入一板内
+											//要是不让装入一板将上面if注释 
+											//而这个注释打开
+											// if(!outGoodsCodeForCheck.equals(originalGoodsCode)) {
 											Bundle bundle=new Bundle();
 											bundle.putInt("Status",0);
 											bundle.putString("Message","此产品【"+outbarcode+"】的型号【"+out_goodsCode+"】与此批次型号【"+originalGoodsCode+"】不同，不能进行该操作。");

src/com/jiaju/utils/CommonUtil.java

@@ -73,6 +73,7 @@ import android.os.Environment;
 import android.os.IBinder;
  
 import android.os.Vibrator;
+import android.support.v4.content.FileProvider;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.view.MotionEvent;
@@ -720,11 +721,24 @@ public class CommonUtil {
 		if (!apkfile.exists()) {
 			return;
 		}
-		Intent i = new Intent(Intent.ACTION_VIEW);
-		i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-		i.setDataAndType(Uri.parse("file://" + apkfile.toString()),
-				"application/vnd.android.package-archive");
-		context.startActivity(i);
+//		Intent i = new Intent(Intent.ACTION_VIEW);
+//		i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//		i.setDataAndType(Uri.parse("file://" + apkfile.toString()),
+//				"application/vnd.android.package-archive");
+//		context.startActivity(i);
+		Intent intent = new Intent();
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setAction(Intent.ACTION_VIEW);
+        if (Build.VERSION.SDK_INT >= 24) {// °²×¿7 Ö®ºó ÓÐÏÞÖÆ
+            Uri apkUri = FileProvider.getUriForFile(context, "com.jiaju.activity.fileprovider", apkfile);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.setDataAndType(apkUri, "application/vnd.android.package-archive");
+        } else {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(Uri.parse("file://" + apkfile.toString()), "application/vnd.android.package-archive");
+        }
+        context.startActivity(intent);
 		android.os.Process.killProcess(android.os.Process.myPid());
 	}