From f1d9cdd68992623725e7d8d1bef6f42e8e03e5c1 Mon Sep 17 00:00:00 2001 From: liup <1454939542@qq.com> Date: Thu, 19 Sep 2024 20:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .idea/easycode.ignore | 13 ++++ .idea/git_toolbox_blame.xml | 6 ++ .../bnframework/business/ConfigData.java | 1 + .../common/db/util/DBListDataUtil.java | 52 +++++++++++++++ .../activity/BottomNavigation2Activity.java | 63 ++++++++++++++++--- .../activity/BottomNavigationNewActivity.java | 3 +- 7 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 .idea/easycode.ignore create mode 100644 .idea/git_toolbox_blame.xml diff --git a/.gitignore b/.gitignore index 2b75303a..2a0d26c5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /build /captures .externalNativeBuild +*.apk diff --git a/.idea/easycode.ignore b/.idea/easycode.ignore new file mode 100644 index 00000000..be585df4 --- /dev/null +++ b/.idea/easycode.ignore @@ -0,0 +1,13 @@ +node_modules/ +dist/ +vendor/ +cache/ +.*/ +*.min.* +*.test.* +*.spec.* +*.bundle.* +*.bundle-min.* +*.*.js +*.*.ts +*.log diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 00000000..7dc12496 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java index 9c9648c7..8b67b483 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java +++ b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java @@ -1100,6 +1100,7 @@ public class ConfigData { try { String str = ConfigName.getInstance().SaasAddress + ConfigName.getInstance().UpdateGoods; // String str="http://192.168.1.7:5000/api/CommInteface/SendGoodsInfo"; + OkGo.>post(str).tag(context).upRequestBody(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), new Gson().toJson(update))).headers(new HttpHeaders("TenantId", ConfigName.getInstance().organizeMode.companyId)).execute(new JsonDialogCallback>(context) { @Override public void onSuccess(Response> response) { diff --git a/app/src/main/java/com/bonait/bnframework/common/db/util/DBListDataUtil.java b/app/src/main/java/com/bonait/bnframework/common/db/util/DBListDataUtil.java index cea3d536..2bb1c348 100644 --- a/app/src/main/java/com/bonait/bnframework/common/db/util/DBListDataUtil.java +++ b/app/src/main/java/com/bonait/bnframework/common/db/util/DBListDataUtil.java @@ -328,4 +328,56 @@ public class DBListDataUtil { } return false; } + public static boolean addGoodsList( List list) { + if(list==null || list.isEmpty()){ + return true; + } + QueryDB.lock.lock(); + SQLiteDatabase db = DBHelper.getInstance(ConfigName.getInstance().dishesCon).getWritableDatabase(); + try { + long insert=-1; + db.beginTransaction(); + for(int i = 0; i < list.size(); i++){ + ContentValues cv = new ContentValues(); + + Map map = Tools.getObjValue(list.get(i)); + if (map.get("id").toString().isEmpty()) + return false; + for (String key : map.keySet()) { + Object value = map.get(key); + if (value instanceof String) { + cv.put(key, (String) value); + } else if (value instanceof Integer) { + cv.put(key, ((Integer) value).intValue()); + } else if (value instanceof Double) { + cv.put(key, ((Double) value).doubleValue()); + } else if (value instanceof Float) { + cv.put(key, ((Float) value).floatValue()); + } else if (value instanceof Long) { + cv.put(key, ((Long) value).longValue()); + } else if (value instanceof Boolean) { + cv.put(key, ((Boolean) value).booleanValue()); + } + } + insert = db.insertOrThrow(BPA_GOODS.class.getSimpleName(), null, cv); + if (insert == -1) { + throw new Exception("Failed to insert data at index " + i); + } + } + LogUtils.d("removeList 批量添加工序"); + + db.setTransactionSuccessful(); + return insert > 0; + } catch (Exception e) { + LogUtils.d("addList 批量新增异常"); + } finally { + db.endTransaction(); + db.close(); + QueryDB.lock.unlock(); + } + return false; + } + + + } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java index 0f8860b9..59f3c14d 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java @@ -4,13 +4,17 @@ import android.os.Bundle; import androidx.annotation.NonNull; +import com.apkfuns.logutils.LogUtils; +import com.bonait.bnframework.MainApplication; import com.bonait.bnframework.business.ConfigData; import com.bonait.bnframework.business.UpDataModel; import com.bonait.bnframework.common.constant.ConfigName; import com.bonait.bnframework.common.constant.DataBus; import com.bonait.bnframework.common.db.QueryDB; +import com.bonait.bnframework.common.db.file.DBHelper; import com.bonait.bnframework.common.db.mode.BPA_GOODS; import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE; +import com.bonait.bnframework.common.db.util.DBListDataUtil; import com.bonait.bnframework.common.helper.BatchSync; import com.bonait.bnframework.common.helper.HttpServer; import com.bonait.bnframework.common.helper.I.IRunT; @@ -98,18 +102,57 @@ public class BottomNavigation2Activity extends BaseActivity { // }catch (Exception e){} // }).start(); +// new Thread(new Runnable() { +// @Override +// public void run() { +// List goodsList = QueryDB.GetGoodsALL(); +// List newgoodsList = QueryDB.GetGoodsALL(); +// for(int i=0;i goodsrecipes = QueryDB.GetGoodsSrecipeALL(); +// +// for (int i=0;i{ - try { - Thread.sleep(3000); - ConfigData.getInstance().GetMainConsoleData(); - }catch (Exception e){} - }).start(); - } +// new Thread(new Runnable() { +// @Override +// public void run() { +// +// List goodsrecipes = QueryDB.GetGoodsALL(); +// +// for (int i=0;i{ +// try { +// Thread.sleep(3000); +// ConfigData.getInstance().GetMainConsoleData(); +// }catch (Exception e){} +// }).start(); +// } } @Override diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java index d1e388e3..b08bcd62 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java @@ -13,6 +13,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.apkfuns.logutils.LogUtils; import com.bonait.bnframework.R; import com.bonait.bnframework.business.ConfigData; import com.bonait.bnframework.business.ExecuteTheRecipe; @@ -27,6 +28,7 @@ import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE; import com.bonait.bnframework.common.db.mode.BPA_MATERIAL; import com.bonait.bnframework.common.db.mode.BPA_PROCESS; import com.bonait.bnframework.common.db.mode.BPA_PROCESSModel; +import com.bonait.bnframework.common.db.util.DBListDataUtil; import com.bonait.bnframework.common.helper.CountDownTimerExt; import com.bonait.bnframework.common.helper.HttpServer; import com.bonait.bnframework.common.helper.I.IRunT; @@ -117,7 +119,6 @@ public class BottomNavigationNewActivity extends BaseActivity { - bottomNavigationView.mListener = new MyClickListener() { @Override public void clickListener(View v, Object data) {