BTS调试工具中新增剩余容量续航时长展示

DELL

2024-08-06 b9f963aba187310ac39ba84e8ef46e38aaaed80c

 Device_Simulator_DTS_Tester/src/com/dev/bts4810/bts4810_page_base.java

@@ -45,6 +45,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import com.Com;
import com.LimitedDocument;
import com.dev.bts.data.FBS9100S_SystemControl;
import com.dev.bts.data.FBS9100_ComBase;
@@ -85,6 +86,9 @@
   private JTextField tf_group_cap_1;               //组1电池容量
   private JTextField tf_group_cap_2;               //组2电池容量
   
   private JTextField tf_restcap_time_1;            //组1剩余容量续航时长
   private JTextField tf_restcap_time_2;            //组2剩余容量续航时长

   private JComboBox cb_batt_state_1;               //组1电池状态
   private JComboBox cb_batt_state_2;               //组2电池状态

@@ -490,6 +494,41 @@
      tf_group_cap_2.setFont(new Font("Courier New", Font.PLAIN, 14));
      panel_cap_2.add(tf_group_cap_2,BorderLayout.CENTER);
      tf_group_cap_2.setColumns(10);
		
		
      /***************************************************/
      //剩余容量续航时长
      /***************************************************/
      JPanel panel_52 = new JPanel();
      panel_52.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u5269\u4f59\u5bb9\u91cf\u7eed\u822a\u65f6\u957f(H:M:S)", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
      panel_38.add(panel_52);
      panel_52.setLayout(new GridLayout(2, 1, 8, 0));
		
      JPanel panel_restcap_time_1 = new JPanel();
      panel_restcap_time_1.setLayout(new BorderLayout());	
      panel_restcap_time_1.setLayout(new BorderLayout(10,5));
      panel_52.add(panel_restcap_time_1);
		
      JLabel jl_restcap_g1 = new JLabel("\u7ec41:");
      panel_restcap_time_1.add(jl_restcap_g1,BorderLayout.WEST);
		
      tf_restcap_time_1 = new JTextField();
      tf_restcap_time_1.setFont(new Font("Courier New", Font.PLAIN, 14));
      panel_restcap_time_1.add(tf_restcap_time_1,BorderLayout.CENTER);
      tf_restcap_time_1.setColumns(10);
		
      JPanel panel_restcap_time_2 = new JPanel();
      panel_restcap_time_2.setLayout(new BorderLayout());	
      panel_restcap_time_2.setLayout(new BorderLayout(10,5));
      panel_52.add(panel_restcap_time_2);
		
      JLabel jl_restcap_g2 = new JLabel("\u7ec42:");
      panel_restcap_time_2.add(jl_restcap_g2,BorderLayout.WEST);
		
      tf_restcap_time_2 = new JTextField();
      tf_restcap_time_2.setFont(new Font("Courier New", Font.PLAIN, 14));
      panel_restcap_time_2.add(tf_restcap_time_2,BorderLayout.CENTER);
      tf_restcap_time_2.setColumns(10);
      
      
      /***************************************************/
@@ -1979,6 +2018,9 @@
               
               tf_group_cap_1.setText(String.format("%1.1f ", Comm_BTS4810.m_FBS_VCData.battcap[0]));
               tf_group_cap_2.setText(String.format("%1.1f ", Comm_BTS4810.m_FBS_VCData.battcap[1]));

               tf_restcap_time_1.setText(String.format("%s ", Com.minConvertHourMinSecond(Comm_BTS4810.m_CapTestState.RestTest_Time[0])));
               tf_restcap_time_2.setText(String.format("%s ", Com.minConvertHourMinSecond(Comm_BTS4810.m_CapTestState.RestTest_Time[1])));
               
               cb_batt_state_2.setSelectedIndex(Comm_BTS4810.m_FBS_VCData.battstate[1]);