From 2d4889472e54830fc0cbcff482c955b73c5b806e Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Tue, 21 May 2024 14:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                       |  1 +
 .../com/bonait/bnframework/HttpModel/APIService.java   |  5 +++--
 .../modules/home/fragment/GongnengFragment.java        | 10 ++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 686eed94..00606696 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/boluo"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning"
         tools:node="merge"
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 0245edd2..31ae5fd1 100644
--- a/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java
+++ b/app/src/main/java/com/bonait/bnframework/HttpModel/APIService.java
@@ -91,7 +91,7 @@ public class APIService {
 
             GoodTypeSynchronous(item);//同步云端商品分类信息
 
-            GoodPropSynchronous(item.goodsAttributeList);//同步云端商品属性
+            GoodPropSynchronous(item.goodsTypeId,item.goodsAttributeList);//同步云端商品属性
 
             GoodInfoSynchronous(item,goods);//同步云端商品信息
 
@@ -115,7 +115,7 @@ public class APIService {
      * 同步云端商品属性到本地
      * @param goodsAttributeList
      */
-    private static void GoodPropSynchronous( List<GoodsAttributeList> goodsAttributeList){
+    private static void GoodPropSynchronous(String goodsTypeId, List<GoodsAttributeList> goodsAttributeList){
         goodsAttributeList.forEach(goodProperty->{
             //属性添加
             BPA_GOODPROPERTY bpa_goodproperty = new BPA_GOODPROPERTY();
@@ -123,6 +123,7 @@ public class APIService {
             bpa_goodproperty.parentid ="0";
             bpa_goodproperty.id = goodProperty.goodsAttributeId;
             bpa_goodproperty.userID="超级管理员";
+            bpa_goodproperty.GoodsTypeId=goodsTypeId;
             QueryDB.AddGoodsProperty(bpa_goodproperty);
 
             //子属性添加
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java
index e5792761..08d9eadb 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/GongnengFragment.java
@@ -14,6 +14,7 @@ import android.widget.Button;
 
 import com.bonait.bnframework.HBL.Dialog.AlertDialogButton;
 import com.bonait.bnframework.HBL.Dialog.DialogManager;
+import com.bonait.bnframework.HBL.Thread.ThreadManager;
 import com.bonait.bnframework.HttpModel.APIService;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseFragment;
@@ -69,8 +70,13 @@ public class GongnengFragment extends BaseFragment {
         btn_Sync.setOnClickListener(v->{
             DialogManager.showWarn(context,"同步云端商品会参数本地所有配方数据，\r\n请问是否继续？", AlertDialogButton.YesNo,(s)->{
                 if(s){
-                    APIService.MainInit();
-                    ToastUtils.info("同步成功");
+                    ThreadManager.get().execute(new Runnable() {
+                        @Override
+                        public void run() {
+                            APIService.MainInit();
+                            ToastUtils.info("同步成功");
+                        }
+                    });
                 }
             });
         });