1、修改干接点传感器报警信息，调整门禁传感器不产生声光报警；2、完善产品信息推送脚本；3、完善马来西亚打包配置

output/t113i/prod/push.bat

@@ -18,7 +18,7 @@ SET PLINK=%CURDIR%\tools\plink
 
 SET USR=root
 SET FBAT=%CURDIR%\tools\script.sh
-SET PWD=123456
+SET PWD=gowone123
 
 SET FILE=PDUInfo.txt
 

pro/src/app.c

@@ -2109,7 +2109,7 @@ static void* sensor_thread(void* arg)
                     int alarmType=-1;
                     if (_globalSensorMangerTemp->sensor_type==SENSOR_TYPE_ACCESS)
                     {
-                        if (nStatus==0 &&_globalSensorMangerTemp->Cur_sensor_info.val1==1 )
+                        if (nStatus==0 &&_globalSensorMangerTemp->Cur_sensor_info.val1!=0 )
                         {
                             alarmflag=true;
                         } 

pro/src/sqlite_handle.c

@@ -4340,17 +4340,17 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
     break;
     case SENSOR_TYPE_SMOKE:
     {
-        sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm[languagesID]);
+        sprintf(AlarmText, "%s %s |$%s$", __globalPowerTemp->sensor_name,"triggered", language_alarm[languagesID]);
     }
     break;
     case SENSOR_TYPE_WATER:
     {
-        sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm[languagesID]);
+        sprintf(AlarmText, "%s %s |$%s$", __globalPowerTemp->sensor_name,"immersed", language_alarm[languagesID]);
     }
     break;
     case SENSOR_TYPE_ACCESS:
     {
-        sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm[languagesID]);
+        sprintf(AlarmText, "%s %s |$%s$", __globalPowerTemp->sensor_name,"released", language_alarm[languagesID]);
     }
     break;
     default:
@@ -4387,11 +4387,16 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         send_pduSensorAlarm_trap(1, (void *)&pAlarmTrapinfo);
     // if(_globalSNMPManager.trapmode==1)snmp_alarm_register(1,SA_REPEAT,send_pduSensorAlarm_trap,(void *)&pAlarmTrapinfo);
 
-    if(limit_flag) {
-        set_led_beep(LED_MODE_WARN2, BEEP_MODE_WARN2);
-    }
-    else {
-        set_led_beep(LED_MODE_WARN1, BEEP_MODE_WARN1);
+    if (subtype != SENSOR_TYPE_ACCESS)//门禁释放不触发报警声音和LED闪烁警告
+    {
+        if (limit_flag)
+        {
+            set_led_beep(LED_MODE_WARN2, BEEP_MODE_WARN2);
+        }
+        else
+        {
+            set_led_beep(LED_MODE_WARN1, BEEP_MODE_WARN1);
+        }
     }
 
     return 0;

pub

@@ -196,7 +196,7 @@ function do_copy()
         name=ip_dc_aosens_in1_out1_release
     elif [ "$1" = "PRJ_Malaysia_AC_I3_O1" ];then
         name=ac_Malaysia_in3_out1_release
-	cp -f $custdir/db/pdu_dat_malaysia.db $appdir/pdu_dat.db
+	cp -f $custdir/db/pdu_dat_malaysia_back.db $appdir/pdu_dat.db
 	cp -f $custdir/logo/logo_litech.png $appdir/image/logo.png
        	cp -f $custdir/qt/rgb_lcd/Qt_Test        $appdir/
         cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/