~whychwj/haha.git

~whychwj / haha

keke

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

LiJun

2018-11-16 170870229385229aa95aa59fa0e4a811d747147f

 gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java

@@ -61,7 +61,7 @@
   public static final int Alarm_IGNAL_ID_CapChangeLow =21;    

   public static final int Alarm_IGNAL_ID_CapChangeHigh =22;  



   public static final int alarm_voice_timelong=3000;//语音播报的时间间隔

   public static final int alarm_voice_timelong=30;//语音播报的时间间隔



   public static String getAlarmName(int type)

   {

			@@ -61,7 +61,7 @@
			public static final int Alarm_IGNAL_ID_CapChangeLow =21;
			public static final int Alarm_IGNAL_ID_CapChangeHigh =22;

			public static final int alarm_voice_timelong=3000;//语音播报的时间间隔
			public static final int alarm_voice_timelong=30;//语音播报的时间间隔

			public static String getAlarmName(int type)
			{