Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 QiaoJiaSystem/VideoAnalysFromHC/RtspAnalysElement.cpp

@@ -257,7 +257,7 @@
//        if (rule.second.nSdkType == PerStaticSdk || rule.second.nSdkType == PerimeterSdk
//            || rule.second.nSdkType == KeepRightSdk || rule.second.nSdkType == KeepRightSdk) {
            float temp = (float)1 - (float) (rule.second.nThreshold) / 100;
            rule.second.fSensitivity = (temp * 75 + 25) / 100;
            rule.second.fSensitivity = (temp * 50 + 50) / 100;
//            rule.second.fSensitivity = (temp * 25 + 75) / 100;

//        } else if (rule.second.nSdkType != FaceSdk) {