Merge branch 'master' of http://10.2.1.24:10244/fyf/AndroidSmartClient

.idea/deploymentTargetDropDown.xml

@@ -15,7 +15,19 @@
               </deviceKey>
             </Target>
           </targetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-06-26T06:23:13.717269100Z" />
+          <timeTargetWasSelectedWithDropDown value="2024-07-22T05:54:58.562029400Z" />
+          <multipleDevicesSelectedInDropDown value="true" />
+          <runningDeviceTargetsSelectedWithDialog>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="192.168.100.198:5555" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetsSelectedWithDialog>
         </State>
       </entry>
     </value>

app/src/main/java/com/bonait/bnframework/business/ConfigData.java

@@ -423,7 +423,7 @@ public class ConfigData {
             EventBus.getDefault().post(new DownGoodsEvent());
             return  true;
         }catch  (Exception ex){
-            MessageLog.ShowError("解析数据失败!,"+ex.getMessage());
+//            MessageLog.ShowError("解析数据失败!,"+ex.getMessage());
             ToastUtils.info("解析数据失败!,"+ex.getMessage());
             return  false;
         }

app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java

@@ -136,8 +136,8 @@ public class BottomNavigationNewActivity extends BaseActivity {
             hs = new HttpServer();
             new Thread(()->{
                 try {
-                  ConfigData.getInstance().  GetMainConsoleData();
                     Thread.sleep(3000);
+                  ConfigData.getInstance().  GetMainConsoleData();
                 }catch (Exception e){}
             }).start();
         }