|
@@ -898,13 +898,42 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
|
|
mActivityPtr->registerUserTimer(SOS_LAMP_TIME_HANDLE, 120000); // 2分钟后才能触发
|
|
mActivityPtr->registerUserTimer(SOS_LAMP_TIME_HANDLE, 120000); // 2分钟后才能触发
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
else if (data.cmd == "KEY<") { //下左3,红
|
|
else if (data.cmd == "KEY<") { //下左3,红
|
|
if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP") {
|
|
if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP") {
|
|
setCheckbox("KEY<");
|
|
setCheckbox("KEY<");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (isSleep) {
|
|
|
|
|
|
+
|
|
|
|
+ if (!StoragePreferences::getInt(STORE_SCREEN_LIGHT, 0)) {
|
|
|
|
+ if (isSleep) {
|
|
|
|
+ scrrenOn();
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ voip::CallInfo info = GetTelephone()->GetCallInfo();
|
|
|
|
+ //拨打 或 挂断
|
|
|
|
+ if (CallingStatus::instance()->busy()){
|
|
|
|
+ callActivityFinish(CallFinishType::A1CLICK);
|
|
|
|
+ } else {
|
|
|
|
+ Intent* intent = new Intent();
|
|
|
|
+ intent->putExtra(isOutgoing, "true");
|
|
|
|
+ intent->putExtra(audioOnly, "true");
|
|
|
|
+ EASYUICONTEXT->openActivity("callActivity", intent);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
scrrenOn();
|
|
scrrenOn();
|
|
|
|
+ voip::CallInfo info = GetTelephone()->GetCallInfo();
|
|
|
|
+ //拨打 或 挂断
|
|
|
|
+ if (CallingStatus::instance()->busy()){
|
|
|
|
+ callActivityFinish(CallFinishType::A1CLICK);
|
|
|
|
+ } else {
|
|
|
|
+ Intent* intent = new Intent();
|
|
|
|
+ intent->putExtra(isOutgoing, "true");
|
|
|
|
+ intent->putExtra(audioOnly, "true");
|
|
|
|
+ EASYUICONTEXT->openActivity("callActivity", intent);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if (data.cmd == "KEY>") { // key>是面板挂断按钮
|
|
else if (data.cmd == "KEY>") { // key>是面板挂断按钮
|