From b98392c6c0f9f89efaf01b77139e57aac43b11cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Tue, 21 May 2024 10:15:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E6=96=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonait/bnframework/HttpModel/APIService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java index 1c2ff3e5..48b44a91 100644 --- a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java +++ b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java @@ -33,7 +33,7 @@ public class APIService { } private static void GetGoodsInfo(){ - String url = "http://192.168.1.50:5007/api/goods/Getdevicegoods?deviceId=1a2a1d72-752f-44cf-87f8-ec9fe4ea15b8"; + String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=1a2a1d72-752f-44cf-87f8-ec9fe4ea15b8"; APIHelper.PostT(url,null,null,new TypeReference>>(){}).OnSource(s->{ deviceGoodInfo=s.Content; UpdateLocalGoodsInfo(); @@ -41,7 +41,7 @@ public class APIService { } private static void GetMaterialInfo(){ - String url = "http://192.168.1.50:5006/api/ExternalPlatform/Material/GetMaterialPageList"; + String url = "https://cfv.black-pa.com/kitchbase/api/ExternalPlatform/Material/GetMaterialPageList"; String key ="962a5892-0f7f-47b4-a1ec-925bd7914a6d"; APIHelper.PostT(url,new MaterialRequestPar(1,100),key,new TypeReference>(){}).OnSource(s->{ materialModels=s.Content; From 9b2ae300adb5a2118197e2ecda5a61e8688d8f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Tue, 21 May 2024 10:16:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E6=96=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonait/bnframework/HttpModel/APIService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java index 48b44a91..3a83ece7 100644 --- a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java +++ b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java @@ -33,7 +33,7 @@ public class APIService { } private static void GetGoodsInfo(){ - String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=1a2a1d72-752f-44cf-87f8-ec9fe4ea15b8"; + String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=03192d70-bd37-40b2-8c03-2721c236e8f2"; APIHelper.PostT(url,null,null,new TypeReference>>(){}).OnSource(s->{ deviceGoodInfo=s.Content; UpdateLocalGoodsInfo(); @@ -42,7 +42,7 @@ public class APIService { private static void GetMaterialInfo(){ String url = "https://cfv.black-pa.com/kitchbase/api/ExternalPlatform/Material/GetMaterialPageList"; - String key ="962a5892-0f7f-47b4-a1ec-925bd7914a6d"; + String key ="2c39bc05-25c2-46c4-b5c6-dba349058492"; APIHelper.PostT(url,new MaterialRequestPar(1,100),key,new TypeReference>(){}).OnSource(s->{ materialModels=s.Content; UpdateLocalMaterial(); From fe5f8af58c2c1902f933293194ef7d1cd0555535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Tue, 21 May 2024 11:20:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E6=96=B9=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonait/bnframework/HttpModel/APIService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java index 3a83ece7..3a7469c5 100644 --- a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java +++ b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java @@ -33,7 +33,7 @@ public class APIService { } private static void GetGoodsInfo(){ - String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=03192d70-bd37-40b2-8c03-2721c236e8f2"; + String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=73a4aa15-72d8-4ed1-b220-6878cd7297d4"; APIHelper.PostT(url,null,null,new TypeReference>>(){}).OnSource(s->{ deviceGoodInfo=s.Content; UpdateLocalGoodsInfo(); @@ -41,7 +41,7 @@ public class APIService { } private static void GetMaterialInfo(){ - String url = "https://cfv.black-pa.com/kitchbase/api/ExternalPlatform/Material/GetMaterialPageList"; + String url = "https://cfv.black-pa.com/saasbase/api/ExternalPlatform/Material/GetMaterialPageList"; String key ="2c39bc05-25c2-46c4-b5c6-dba349058492"; APIHelper.PostT(url,new MaterialRequestPar(1,100),key,new TypeReference>(){}).OnSource(s->{ materialModels=s.Content; From f0b53833ad2dab57ed50de5be311b029bb193dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Tue, 21 May 2024 11:47:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/AlertDialogUtils.java | 31 ++++++++++++------- .../home/adapter/loadinggood_adapter.java | 2 +- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/common/utils/AlertDialogUtils.java b/app/src/main/java/com/bonait/bnframework/common/utils/AlertDialogUtils.java index 02a9a594..3d3c6a05 100644 --- a/app/src/main/java/com/bonait/bnframework/common/utils/AlertDialogUtils.java +++ b/app/src/main/java/com/bonait/bnframework/common/utils/AlertDialogUtils.java @@ -2,6 +2,7 @@ package com.bonait.bnframework.common.utils; import android.content.Context; +import com.bonait.bnframework.HBL.Logs.MessageLog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; @@ -51,18 +52,24 @@ public class AlertDialogUtils { * 对话框，有取消确定按钮 * */ public static void showDialog(Context context, String title, String message, QMUIDialogAction.ActionListener onClickListener) { - new QMUIDialog.MessageDialogBuilder(context) - .setCancelable(false) - .setTitle(title) - .setMessage(message) - .addAction("取消", new QMUIDialogAction.ActionListener() { - @Override - public void onClick(QMUIDialog dialog, int index) { - dialog.dismiss(); - } - }) - .addAction("确定", onClickListener) - .create(mCurrentDialogStyle).show(); + try{ + new QMUIDialog.MessageDialogBuilder(context) + .setCancelable(false) + .setTitle(title) + .setMessage(message) + .addAction("取消", new QMUIDialogAction.ActionListener() { + @Override + public void onClick(QMUIDialog dialog, int index) { + dialog.dismiss(); + } + }) + .addAction("确定", onClickListener) + .create(mCurrentDialogStyle).show(); + }catch(Exception e){ + MessageLog.ShowError(e); + + } + } public static QMUIDialog showDialog111(Context context, String title, String message, QMUIDialogAction.ActionListener onClickListener) { diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java index 5eacdb8b..643d1c7b 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java @@ -119,7 +119,7 @@ public class loadinggood_adapter extends RecyclerView.Adapter