智能电子锁 V1.107 edit by lijun 2025-04-10 1.基本完成智能电子锁遥信，遥测，遥调，遥控基本功能

DELL

2025-04-10 7f983b53f3a8c40678f1a7cb1efaeeb3a32f5377

 Device_Simulator_DTS_Tester/src/main/main_window_computer.java

@@ -50,6 +50,7 @@
import com.dev.btsm.bts_page_base;
import com.dev.bybb.bybb_page_base;
import com.dev.dummyload.DummyLoad_page_base;
import com.dev.electlock.electlock_page_base;
import com.dev.fbo4830.fbo4830_page_base;
import com.dev.fbs9600_curr.module_curr_page;
import com.dev.fbs9600_groupvol.FCF651_groupvol_page;
@@ -136,7 +137,7 @@
   public static final boolean APP_ICA_200KW_EN = true;            //ICA-200KW
   public static final boolean APP_Elect_Lock_EN = true;            //电子锁调试工具
   
   public int CommDevType = 4;            //默认显示tab选项卡
   public int CommDevType = 9;            //默认显示tab选项卡
   
   public static final int DebugMode_TYPE_Debug    = 0;   //调试模拟
   public static final int DebugMode_TYPE_Package    = 1;   //电脑打包模式
@@ -182,6 +183,7 @@
   private JPanel main_TabbedTopPane14;
   private JPanel main_TabbedTopPane15;
   private JPanel main_TabbedTopPane16;
   private JPanel main_TabbedTopPane17;
   
   private JPanel main_TabbedRightPane0;
   private JPanel main_TabbedRightPane1;
@@ -200,6 +202,7 @@
   private JPanel main_TabbedRightPane14;
   private JPanel main_TabbedRightPane15;
   private JPanel main_TabbedRightPane16;
   private JPanel main_TabbedRightPane17;
   
   
   private JButton btn_renew_commport;
@@ -239,7 +242,8 @@

   private power_page_base panel_power_page_base;                  //极简化电源
   
   private iac_600kw_page panel_ica_600kw_page;                        //ICA-200KW
   private iac_600kw_page panel_ica_600kw_page;                  //ICA-200KW
   private electlock_page_base panel_elect_lock_page;               //蓝牙电子锁
   
   private List<JPanel> pre_panels = new ArrayList<>();            //前置面板空白面板
    
@@ -788,6 +792,8 @@
      main_TabbedTopPane15.setLayout(new BoxLayout(main_TabbedTopPane15, BoxLayout.X_AXIS));
      main_TabbedTopPane16 = new JPanel();
      main_TabbedTopPane16.setLayout(new BoxLayout(main_TabbedTopPane16, BoxLayout.X_AXIS));
      main_TabbedTopPane17 = new JPanel();
      main_TabbedTopPane17.setLayout(new BoxLayout(main_TabbedTopPane17, BoxLayout.X_AXIS));
      
      
      main_TabbedRightPane0 = new JPanel();
@@ -824,6 +830,8 @@
      main_TabbedRightPane15.setLayout(new BorderLayout());
      main_TabbedRightPane16 = new JPanel();
      main_TabbedRightPane16.setLayout(new BorderLayout());
      main_TabbedRightPane17 = new JPanel();
      main_TabbedRightPane17.setLayout(new BorderLayout());
      
      top_panel1 = new JPanel();
      top_panel1.setLayout(new BoxLayout(top_panel1, BoxLayout.X_AXIS));
@@ -1127,8 +1135,18 @@
                       //客户端通信
                       int tcp_type = cb_tcp_udp.getSelectedIndex();
                       System.out.println("tcp_type:" + tcp_type);
                    }
			        	
                    }			        	
                 } else if(main_window_computer.CommDevType_Elect_Lock == main_DevType) {
                    if(SPCommMon.COMM_PORT_TYPE_Serial == comm_type) {
                       //串口通信
                       int dev_addr = Integer.parseInt(tf_target_addr.getText().trim());
                       comm_open_res = panel_elect_lock_page.openCommPort(comm_type, spname_or_ipaddr, 
                             bitrate_or_ipport, dev_addr, m_Log);		        		
                    }else if(SPCommMon.COMM_PORT_TYPE_Socket == comm_type){
                       //客户端通信
                       int tcp_type = cb_tcp_udp.getSelectedIndex();
                       System.out.println("tcp_type:" + tcp_type);
                    }	
                 }
                
               if(true == comm_open_res) {
@@ -1219,6 +1237,9 @@
            }
            if(null != panel_ica_600kw_page) {
               panel_ica_600kw_page.closeCommPort();
            }
            if(null != panel_elect_lock_page) {
               panel_elect_lock_page.closeCommPort();
            }
            tf_target_addr.setEditable(true);
            btn_renew_commport.setEnabled(true);
@@ -1831,7 +1852,7 @@
            main_TabbedPane.setIconAt(CommDevType_ICA_200KW, new ImageIcon(main_window_computer.class.getResource("/png_16x16/layer_treansparent.png")));
            if(DebugMode == DebugMode_TYPE_Package) {
               //设置软件打开时默认软件全屏
               frmSerialport.setExtendedState(JFrame.MAXIMIZED_BOTH);
               //frmSerialport.setExtendedState(JFrame.MAXIMIZED_BOTH);
            }
         }
         
@@ -1851,6 +1872,40 @@
         pre_panels.add(new JPanel());
      } 
      
		
      if(APP_Elect_Lock_EN) {
         CommDevType_Elect_Lock = jtable_index++;
			
         String bybb_title = "智能电子锁";
			
         panel_elect_lock_page = new electlock_page_base();
			
         if(DebugMode == DebugMode_TYPE_Screen) {
            main_TabbedPane.add(bybb_title, new JPanel());
         }else {
            main_TabbedPane.add(bybb_title, main_TabbedRightPane17);
            main_TabbedPane.setIconAt(CommDevType_Elect_Lock, new ImageIcon(main_window_computer.class.getResource("/png_16x16/layer_treansparent.png")));
            if(DebugMode == DebugMode_TYPE_Package) {
               //设置软件打开时默认软件全屏
               //frmSerialport.setExtendedState(JFrame.MAXIMIZED_BOTH);
            }
         }
			
         main_TabbedRightPane17.add(main_TabbedTopPane17,BorderLayout.NORTH);
         main_TabbedRightPane17.add(panel_elect_lock_page,BorderLayout.CENTER);
			
         tabbedTopPanes.add(main_TabbedTopPane17);
         tabbedRightPanes.add(main_TabbedRightPane17);
			
         if(CommDevType == CommDevType_Elect_Lock) {
            //当默认是
            cb_comm_bitrate.setSelectedIndex(3);      //默认波特率9600
            tf_target_addr.setText("1");            //默认设备地址1
				
         }
      }else {
         pre_panels.add(new JPanel());
      } 
      
      if(pre_panels.size() > 0) {
         for (JPanel jPanel : pre_panels) {
@@ -1956,6 +2011,9 @@
            }else if(CommDevType_ICA_200KW == CommDevType) {
               frmSerialport.getContentPane().add(top_panel1, BorderLayout.NORTH);
               mTitle = "ICA-600KW调试工具";
            }else if(CommDevType_Elect_Lock == CommDevType) {
               frmSerialport.getContentPane().add(top_panel1, BorderLayout.NORTH);
               mTitle = "智能电子锁";
            }
         } else if(DebugMode == DebugMode_TYPE_Screen){
            //btn_back = null;   
@@ -2078,6 +2136,11 @@
            tf_rxcnt.setText(String.format("RX:%d", panel_ica_600kw_page.Comm_ICA.comm_rx_cnt));
            
            panel_ica_600kw_page.updateData();
         } else if(CommDevType_Elect_Lock == main_DevType) {
            tf_txcnt.setText(String.format("TX:%d", panel_elect_lock_page.Comm_Lock.comm_tx_cnt));
            tf_rxcnt.setText(String.format("RX:%d", panel_elect_lock_page.Comm_Lock.comm_rx_cnt));
				
            panel_elect_lock_page.updateData();
         }
      } catch (Exception e) {
         m_Log.error(e.toString(), e);