V1.108 edit by lijun 2025-04-28 1.添加锁具ID卡信息读取

DELL

2025-04-28 e6eb7fb0af366e370f125668d62e89eb0004f517

 Device_Simulator_DTS_Tester/src/com/dev/electlock/electlock_page_base.java

@@ -88,6 +88,12 @@
   private JTextField tf_bluetooth_st_state;   //蓝牙开关状态

   private JTextField tf_bluetooth_state;      //蓝牙状态

   

   private JTable table_idcard;

   private Vector<String> columnVector_idcard;

   private Vector<Vector<String>> dataRow_idcard;

	
	
	
   private JTextField tf_set_lock_addr;      //设置锁具地址

   private JButton btn_set_lock_addr;         //设置锁具地址

   

@@ -737,11 +743,15 @@
      tabbedPane.addTab("调试信息",null/*new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png"))*/, panel_debug, null);

      

      /************************ 电源遥测 ********************************************/

      panel_baseinfo.setLayout(new BorderLayout());		
      panel_baseinfo.setLayout(new BorderLayout());

		
      JPanel panel_lockread = new JPanel();

      panel_baseinfo.add(panel_lockread,BorderLayout.CENTER);

      panel_lockread.setLayout(new BorderLayout());

      

      //中间插件

      JPanel panel_100 = new JPanel();

      panel_baseinfo.add(panel_100, BorderLayout.CENTER);

      panel_lockread.add(panel_100, BorderLayout.CENTER);

      panel_100.setLayout(new BorderLayout(0, 0));

      

//      JScrollPane scrollPane_2 = new JScrollPane();

@@ -755,7 +765,7 @@
      

      JPanel panel_101 = new JPanel();

      panel_101.setLayout(new BorderLayout(0, 0));

      panel_baseinfo.add(panel_101,BorderLayout.NORTH);

      panel_lockread.add(panel_101,BorderLayout.NORTH);

      

      JPanel panel_102 = new JPanel();

      panel_102.setLayout(new GridLayout(3,3,10,10));

@@ -877,11 +887,38 @@
      panel_112.add(tf_bluetooth_state);

      tf_bluetooth_state.setColumns(10);

      

		
      columnVector_idcard = new Vector<String>();

		
      String idcard_title = "编号";

      columnVector_idcard.add(idcard_title);

		
      idcard_title = "ID卡号";

      columnVector_idcard.add(idcard_title);

		
		
      dataRow_idcard = new Vector<Vector<String>>();

		
      JScrollPane scrollPane_idcard = new JScrollPane();

      scrollPane_idcard.setBorder(new TitledBorder(null, "已授权ID卡号", TitledBorder.LEADING, TitledBorder.TOP, null, null));

		
//      panel_poweralm.add(scrollPane_7,BorderLayout.CENTER);

		
      table_idcard = new JTable();

      table_idcard.setModel(new DefaultTableModel(dataRow_idcard, columnVector_idcard));

		
      scrollPane_idcard.setViewportView(table_idcard);

		
		
      panel_baseinfo.add(scrollPane_idcard, BorderLayout.EAST);

		
		
		
      //

      JPanel panel_800 = new JPanel();

      panel_800.setBorder(new TitledBorder(null, "锁具遥调", TitledBorder.LEADING, TitledBorder.TOP, null, null));

      panel_100.add(panel_800,BorderLayout.NORTH);

      panel_800.setLayout(new GridLayout(1,3,2,2));

      panel_800.setLayout(new GridLayout(2,2,2,2));

      //

      JPanel panel_801 = new JPanel();

      panel_801.setBorder(new TitledBorder(null, "锁具遥控", TitledBorder.LEADING, TitledBorder.TOP, null, null));

@@ -5764,6 +5801,28 @@
            

         }

         

         //更新已授权电子卡表格

         int row_num_card = ElectLock_ComBase.Lock_MaxCardCount;

         if(dataRow_idcard.size() != row_num_card && null != Comm_Lock.m_ElectLock_State)

         {

            dataRow_idcard.clear();

            for(int n=0; n<row_num_card; n++) {

               Vector<String> row = new Vector<String>();

               row.addElement(String.format("%03d", n+1));					
					
               row.addElement(String.format("%s", Comm_Lock.m_ElectLock_State.getId_cards()[n]));

					
               dataRow_idcard.add(row);

            }

         } else {

				
            for(int n=0; n<row_num_card; n++) {

               dataRow_idcard.get(n).setElementAt(String.format("%010d", Comm_Lock.m_ElectLock_State.getId_cards()[n]), 1);

            }

         }

         table_idcard.updateUI();

			
			
         if(null != Comm_Lock.m_RoadStateFromDev) {

            

            this.jc_sysgate_st.setSelectedIndex(Comm_Lock.m_RoadStateFromDev.sysgate_st);         //门磁状态