From 083b3ae6b03ab0d19f31ba4319857350a2390898 Mon Sep 17 00:00:00 2001 From: Nicolas Jager Date: Tue, 4 Oct 2016 08:46:19 -0400 Subject: [PATCH] patch pour amelioration des etats Change-Id: I5fd57088cc6a687edbaf80d556d275b7ea1040a7 Tuleap: #1205 --- CallsViewModel.cpp | 50 +------------- CallsViewModel.h | 15 ++--- Globals.h | 6 ++ MainPage.xaml.cpp | 15 ++--- MainPage.xaml.h | 2 +- RingConsolePanel.xaml.cpp | 2 +- RingD.cpp | 76 ++++++--------------- RingD.h | 33 +++++---- SmartPanel.xaml | 73 ++------------------ SmartPanel.xaml.cpp | 114 +++++++++++++------------------- SmartPanelItem.cpp | 12 +++- SmartPanelItem.h | 26 ++++++-- SmartPanelItemsViewModel.cpp | 8 +-- SmartPanelItemsViewModel.h | 5 +- VideoPage.xaml.cpp | 11 +-- pch.h | 4 +- ring-client-uwp.vcxproj | 5 +- ring-client-uwp.vcxproj.filters | 15 +---- 18 files changed, 157 insertions(+), 315 deletions(-) create mode 100644 Globals.h diff --git a/CallsViewModel.cpp b/CallsViewModel.cpp index 07e9019..1bdb5a8 100644 --- a/CallsViewModel.cpp +++ b/CallsViewModel.cpp @@ -27,58 +27,12 @@ using namespace Windows::ApplicationModel::Core; CallsViewModel::CallsViewModel() { - CallsList_ = ref new Vector(); + callIdsList_ = ref new Vector(); /* connect to delegates. */ RingD::instance->incomingCall += ref new RingClientUWP::IncomingCall([&]( String^ accountId, String^ callId, String^ from) { - auto call = addNewCall(accountId, callId, from); - if (call) - callRecieved(call); + callIdsList_->Append(callId); // TODO : check if the string is remove when the call ends. }); - RingD::instance->stateChange += ref new RingClientUWP::StateChange(this, &RingClientUWP::ViewModel::CallsViewModel::OnstateChange); -} - -Call^ -RingClientUWP::ViewModel::CallsViewModel::addNewCall(String^ accountId, String^ callId, String^ peer) -{ - if (accountId == "" | callId == "" | peer == "") { - WNG_("call can't be created"); - } - auto call = ref new Call(accountId, callId, peer); - CallsList_->Append(call); - return call; -} - -void RingClientUWP::ViewModel::CallsViewModel::clearCallsList() -{ - CallsList_->Clear(); -} - -Call^ -CallsViewModel::findCall(String^ callId) -{ - for each (Call^ call in CallsList_) - if (call->callId == callId) - return call; - - return nullptr; -} - - -void RingClientUWP::ViewModel::CallsViewModel::OnstateChange(Platform::String ^callId, RingClientUWP::CallStatus state, int code) -{ - auto call = findCall(callId); - - if (!call) - return; - - switch (state) - { - case CallStatus::ENDED: - RingD::instance->hangUpCall(call); - default: - break; - } } diff --git a/CallsViewModel.h b/CallsViewModel.h index 21c68ff..28e0864 100644 --- a/CallsViewModel.h +++ b/CallsViewModel.h @@ -41,18 +41,12 @@ internal: } } - /* functions */ - Call^ addNewCall(String^ accountId, String^ callId, String^ from); - void clearCallsList(); - //void setState(String^ callId, String^ state, int code); // used ? - Call^ findCall(String^ callId); - /* properties */ - property Vector^ CallsList + property Vector^ _callIdList { - Vector^ get() + Vector^ get() { - return CallsList_; + return callIdsList_; } } @@ -64,9 +58,8 @@ internal: private: CallsViewModel(); // singleton - Vector^ CallsList_; // refacto : change C to c + Vector^ callIdsList_; - void OnstateChange(Platform::String ^callId, RingClientUWP::CallStatus state, int code); }; } } diff --git a/Globals.h b/Globals.h new file mode 100644 index 0000000..1f4755b --- /dev/null +++ b/Globals.h @@ -0,0 +1,6 @@ +namespace RingClientUWP +{ +/* public enumerations. */ +public enum class CallStatus { NONE, INCOMING_RINGING, OUTGOING_RINGING, SEARCHING, IN_PROGRESS, ENDED, TERMINATING }; + +} \ No newline at end of file diff --git a/MainPage.xaml.cpp b/MainPage.xaml.cpp index bdcbb29..6a13b22 100644 --- a/MainPage.xaml.cpp +++ b/MainPage.xaml.cpp @@ -246,14 +246,6 @@ void RingClientUWP::MainPage::OnstateChange(Platform::String ^callId, RingClient OnsummonMessageTextPage(); break; } - /* if the state changes to IN_PROGRESS for any peer, show the video page. - nb : the peer is currently selected from the SmartPannel. */ - case CallStatus::IN_PROGRESS: - { - if (item) - OnsummonVideoPage(); - break; - } default: break; } @@ -265,14 +257,14 @@ MainPage::Application_Suspending(Object^, Windows::ApplicationModel::SuspendingE { WriteLine("Application_Suspending"); if (Frame->CurrentSourcePageType.Name == - Interop::TypeName(MainPage::typeid).Name) + Interop::TypeName(MainPage::typeid).Name) { if (Video::VideoManager::instance->captureManager()->captureTaskTokenSource) Video::VideoManager::instance->captureManager()->captureTaskTokenSource->cancel(); //displayInformation->OrientationChanged -= displayInformationEventToken; auto deferral = e->SuspendingOperation->GetDeferral(); Video::VideoManager::instance->captureManager()->CleanupCameraAsync() - .then([this, deferral]() { + .then([this, deferral]() { deferral->Complete(); }); } @@ -292,4 +284,5 @@ MainPage::Application_VisibilityChanged(Object^ sender, VisibilityChangedEventAr { WriteLine("->Invisible"); } -} +} + diff --git a/MainPage.xaml.h b/MainPage.xaml.h index 554ae31..428c539 100644 --- a/MainPage.xaml.h +++ b/MainPage.xaml.h @@ -60,6 +60,6 @@ private: void OnsummonWelcomePage(); void OnsummonVideoPage(); void OnpressHangUpCall(); - void OnstateChange(Platform::String ^callId, RingClientUWP::CallStatus state, int code); + void OnstateChange(Platform::String ^callId, CallStatus state, int code); }; } diff --git a/RingConsolePanel.xaml.cpp b/RingConsolePanel.xaml.cpp index 797e023..1976dc2 100644 --- a/RingConsolePanel.xaml.cpp +++ b/RingConsolePanel.xaml.cpp @@ -95,7 +95,7 @@ void RingConsolePanel::sendCommand() currentCmd = ""; historyLevel = historyCmds.Size; - if (cmdInput == "") { + if (cmdInput->IsEmpty()) { return; } else if (cmdInput == "help") { diff --git a/RingD.cpp b/RingD.cpp index fba4158..1308305 100644 --- a/RingD.cpp +++ b/RingD.cpp @@ -114,14 +114,14 @@ RingD::createSIPAccount(String^ alias) tasksList_.push(ref new RingD::Task(Request::AddSIPAccount)); } -void RingClientUWP::RingD::refuseIncommingCall(Call^ call) +void RingClientUWP::RingD::refuseIncommingCall(String^ callId) { - tasksList_.push(ref new RingD::Task(Request::RefuseIncommingCall, call)); + tasksList_.push(ref new RingD::Task(Request::RefuseIncommingCall, callId)); } -void RingClientUWP::RingD::acceptIncommingCall(Call^ call) +void RingClientUWP::RingD::acceptIncommingCall(String^ callId) { - tasksList_.push(ref new RingD::Task(Request::AcceptIncommingCall, call)); + tasksList_.push(ref new RingD::Task(Request::AcceptIncommingCall, callId)); } void RingClientUWP::RingD::placeCall(Contact^ contact) @@ -137,65 +137,40 @@ void RingClientUWP::RingD::placeCall(Contact^ contact) - if (callId2 == "") { + if (callId2.empty()) { WNG_("call not created, the daemon didn't return a call Id"); return; } auto callId = Utils::toPlatformString(callId2); + _callIdsList->Append(callId); //auto con = ContactsViewModel::instance->findContactByName(to); auto item = SmartPanelItemsViewModel::instance->findItem(contact); item->_callId = callId; MSG_("$1 place call with id : " + Utils::toString(item->_callId)); + callPlaced(callId); - auto call = CallsViewModel::instance->addNewCall(accountId, callId, to); - call->isOutGoing = true; - - if (call == nullptr) { - WNG_("call not created, nullptr reason"); - return; - } - - calling(call); - -} - -void -RingClientUWP::RingD::cancelOutGoingCall(Call^ call) -{ - MSG_("1!--->> cancelOutGoingCall"); - if (call) - tasksList_.push(ref new RingD::Task(Request::CancelOutGoingCall, call)); } void RingClientUWP::RingD::cancelOutGoingCall2(String ^ callId) { MSG_("$1 cancelOutGoingCall2 : " + Utils::toString(callId)); - tasksList_.push(ref new RingD::Task(Request::HangUpCall, callId, 0)); + tasksList_.push(ref new RingD::Task(Request::HangUpCall, callId)); } -void -RingClientUWP::RingD::hangUpCall(Call^ call) -{ - tasksList_.push(ref new RingD::Task(Request::HangUpCall, call)); -} void RingClientUWP::RingD::hangUpCall2(String ^ callId) { MSG_("$1 hangUpCall2 : "+Utils::toString(callId)); - tasksList_.push(ref new RingD::Task(Request::HangUpCall, callId, 0)); + tasksList_.push(ref new RingD::Task(Request::HangUpCall, callId)); } void RingClientUWP::RingD::startDaemon() { - // TODO (during refactoring) : use namespace - /* clear the calls list and instantiate the singleton (required) */ - RingClientUWP::ViewModel::CallsViewModel::instance->clearCallsList(); - create_task([&]() { using SharedCallback = std::shared_ptr; @@ -228,7 +203,6 @@ RingClientUWP::RingD::startDaemon() incomingCall(accountId2, callId2, from2); stateChange(callId2, CallStatus::INCOMING_RINGING, 0); - auto contact = ContactsViewModel::instance->findContactByName(from2); auto item = SmartPanelItemsViewModel::instance->findItem(contact); item->_callId = callId2; @@ -250,6 +224,9 @@ RingClientUWP::RingD::startDaemon() auto state3 = getCallStatus(state2); + if (state3 == CallStatus::ENDED) + DRing::hangUp(callId); // solve a bug in the daemon API. + CoreApplication::MainView->CoreWindow->Dispatcher->RunAsync( CoreDispatcherPriority::High, ref new DispatchedHandler([=]() @@ -293,12 +270,7 @@ RingClientUWP::RingD::startDaemon() from2 = Utils::TrimRingId2(from2); - Call^ call = CallsViewModel::instance->findCall(callId2); - if (!call) - return; - - String^ accountId2 = call->accountId; const std::string PROFILE_VCF = "x-ring/ring.profile.vcard"; static const unsigned int profileSize = PROFILE_VCF.size(); @@ -314,7 +286,9 @@ RingClientUWP::RingD::startDaemon() CoreApplication::MainView->CoreWindow->Dispatcher->RunAsync( CoreDispatcherPriority::High, ref new DispatchedHandler([=]() { - incomingAccountMessage(accountId2, from2, payload); + // DOIT ETRE DIFFEREND.... NE PAS UTILISE accoutId2 + //incomingAccountMessage(accountId2, from2, payload); + MSG_("message recu :" + i.second); })); } }), @@ -462,8 +436,8 @@ RingClientUWP::RingD::startDaemon() } while (true) { DRing::pollEvents(); - Sleep(1000); dequeueTasks(); + Sleep(1000); } DRing::fini(); } @@ -473,6 +447,7 @@ RingClientUWP::RingD::startDaemon() RingD::RingD() { localFolder_ = Utils::toString(ApplicationData::Current->LocalFolder->Path); + callIdsList_ = ref new Vector(); } void @@ -502,14 +477,14 @@ RingD::dequeueTasks() break; case Request::RefuseIncommingCall: { - auto callId = task->_call->callId; + auto callId = task->_callId; auto callId2 = Utils::toString(callId); DRing::refuse(callId2); } break; case Request::AcceptIncommingCall: { - auto callId = task->_call->callId; + auto callId = task->_callId; auto callId2 = Utils::toString(callId); DRing::accept(callId2); } @@ -517,15 +492,8 @@ RingD::dequeueTasks() case Request::CancelOutGoingCall: case Request::HangUpCall: { - - MSG_("1!--->> Request::CancelOutGoingCall"); - auto id = task->_callId; - DRing::hangUp(Utils::toString(id)); - return; - - auto callId = task->_call->callId; - auto callId2 = Utils::toString(callId); - DRing::hangUp(callId2); + auto callId = task->_callId; + DRing::hangUp(Utils::toString(callId)); } break; default: @@ -535,7 +503,7 @@ RingD::dequeueTasks() } } -CallStatus RingClientUWP::RingD::getCallStatus(String^ state) +RingClientUWP::CallStatus RingClientUWP::RingD::getCallStatus(String^ state) { if (state == "INCOMING") return CallStatus::INCOMING_RINGING; diff --git a/RingD.h b/RingD.h index 7a22790..c1eed29 100644 --- a/RingD.h +++ b/RingD.h @@ -26,7 +26,7 @@ namespace RingClientUWP delegate void IncomingCall(String^ accountId, String^ callId, String^ from); delegate void StateChange(String^ callId, CallStatus state, int code); delegate void IncomingAccountMessage(String^ accountId, String^ from, String^ payload); -delegate void Calling(Call^ call); +delegate void CallPlaced(String^ callId); public ref class RingD sealed @@ -54,6 +54,15 @@ public: void cancelOutGoingCall2(String^ callId); // marche +internal: // why this property has to be internal and not public ? + property Vector^ _callIdsList + { + Vector^ get() + { + return callIdsList_; + } + } + internal: /* functions */ @@ -62,13 +71,12 @@ internal: void sendAccountTextMessage(String^ message); void createRINGAccount(String^ alias); void createSIPAccount(String^ alias); - void refuseIncommingCall(Call^ call); - void acceptIncommingCall(Call^ call); + void refuseIncommingCall(String^ call); + void acceptIncommingCall(String^ call); void placeCall(Contact^ contact); - void cancelOutGoingCall(Call^ call); /*void cancelOutGoingCall2(String^ callId);*/ // marche pas + CallStatus getCallStatus(String^ state); - void hangUpCall(Call^ call); void hangUpCall2(String^ callId); /* TODO : move members */ @@ -79,7 +87,7 @@ internal: event IncomingCall^ incomingCall; event StateChange^ stateChange; event IncomingAccountMessage^ incomingAccountMessage; - event Calling^ calling; + event CallPlaced^ callPlaced; private: /* sub classes */ @@ -92,30 +100,29 @@ private: CancelOutGoingCall, HangUpCall }; + + + Vector^ callIdsList_; + ref class Task { internal: Task(Request r) { request = r; } - Task(Request r, Call^ c) { - request = r; - _call = c; - } - Task(Request r, String^ c, int i) { + Task(Request r, String^ c) { request = r; _callId = c; } public: property Request request; - property Call^ _call; property String^ _callId; }; /* functions */ RingD(); // singleton void dequeueTasks(); - CallStatus getCallStatus(String^ state); +// CallStatus getCallStatus(String^ state); /* members */ std::string localFolder_; diff --git a/SmartPanel.xaml b/SmartPanel.xaml index 3876183..4bda00e 100644 --- a/SmartPanel.xaml +++ b/SmartPanel.xaml @@ -203,65 +203,6 @@ Text="{x:Bind ringID_}"/> - - - - - - - - - - -