Update 07.12.2022

HTML/gcphone/resources/esx_addons_gcphone/client.lua

@@ -32,4 +32,5 @@ AddEventHandler('esx_addons_gcphone:call_taxi', function(data)
   		y = coords.y,
   		z = coords.z
   })
+  TriggerServerEvent("taxijob:server:request")
 end)

HTML/gcphone/resources/gcphone/client/client.lua

@@ -29,12 +29,31 @@ local currentPlaySound = false
 local soundDistanceMax = 8.0
 
 
+ESX = nil
+
+Citizen.CreateThread(function()
+  while ESX == nil do
+    TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+    Citizen.Wait(0)
+  end
+end)
+
 --====================================================================================
 --  Check si le joueurs poséde un téléphone
 --  Callback true or false
 --====================================================================================
-function hasPhone (cb)
+--[[ function hasPhone (cb)
   cb(true)
+end ]]
+function hasPhone (cb)
+  if (ESX == nil) then return cb(0) end
+  ESX.TriggerServerCallback('gcphone:getItemAmount', function(qtty)
+    cb(qtty > 0)
+  end, 'phone')
+end
+function ShowNoPhoneWarning ()
+  if (ESX == nil) then return end
+  ESX.ShowNotification("~r~Du besitzt kein Smartphone!")
 end
 --====================================================================================
 --  Que faire si le joueurs veut ouvrir sont téléphone n'est qu'il en a pas ?
@@ -48,25 +67,6 @@ end
   https://forum.fivem.net/t/tutorial-for-gcphone-with-call-and-job-message-other/177904
 ]]--
 
-ESX = nil
-
-Citizen.CreateThread(function()
-  while ESX == nil do
-    TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
-    Citizen.Wait(0)
-  end
-end)
---[[
-function hasPhone (cb)
-  if (ESX == nil) then return cb(0) end
-  ESX.TriggerServerCallback('gcphone:getItemAmount', function(qtty)
-    cb(qtty > 0)
-  end, 'phone')
-end
-function ShowNoPhoneWarning ()
-  if (ESX == nil) then return end
-  ESX.ShowNotification("Vous n'avez pas de ~r~téléphone~s~")
-end --]]
 
 AddEventHandler('esx:onPlayerDeath', function()
   if menuIsOpen then
@@ -85,6 +85,19 @@ end)
 --====================================================================================
 --
 --====================================================================================
+
+RegisterKeyMapping('openPhone', 'Handy öffnen', 'keyboard', 'f1')
+
+RegisterCommand("openPhone", function (source, args, cmd)
+  hasPhone(function (hasPhone)
+    if hasPhone == true then
+      TooglePhone()
+    else
+      ShowNoPhoneWarning()
+    end
+  end)
+end)
+
 Citizen.CreateThread(function()
   while true do
     Citizen.Wait(0)
@@ -92,7 +105,7 @@ Citizen.CreateThread(function()
       DisableControlAction(0, 288, true)
     end
     if takePhoto ~= true then
-      if IsControlJustPressed(1, Config.KeyOpenClose) then
+      --[[ if IsControlJustPressed(1, Config.KeyOpenClose) then
         hasPhone(function (hasPhone)
           if hasPhone == true then
             TooglePhone()
@@ -100,7 +113,7 @@ Citizen.CreateThread(function()
             ShowNoPhoneWarning()
           end
         end)
-      end
+      end ]]
       if menuIsOpen == true then
         for _, value in ipairs(KeyToucheCloseEvent) do
           if IsControlJustPressed(1, value.code) then
@@ -351,6 +364,10 @@ end
 --====================================================================================
 function sendMessage(num, message)
   TriggerServerEvent('gcPhone:sendMessage', num, message)
+
+  if num == "555-5555" then
+      TriggerServerEvent("taxijob:server:request")
+  end
 end
 
 function deleteMessage(msgId)
@@ -491,25 +508,26 @@ end
 --====================================================================================
 
 RegisterNUICallback('startCall', function (data, cb)
-  startCall(data.numero, data.rtcOffer, data.extraData)
   cb()
+  startCall(data.numero, data.rtcOffer, data.extraData)
 end)
 
 RegisterNUICallback('acceptCall', function (data, cb)
-  acceptCall(data.infoCall, data.rtcAnswer)
   cb()
+  acceptCall(data.infoCall, data.rtcAnswer)
 end)
 RegisterNUICallback('rejectCall', function (data, cb)
-  rejectCall(data.infoCall)
   cb()
+  rejectCall(data.infoCall)
 end)
 
 RegisterNUICallback('ignoreCall', function (data, cb)
-  ignoreCall(data.infoCall)
   cb()
+  ignoreCall(data.infoCall)
 end)
 
 RegisterNUICallback('notififyUseRTC', function (use, cb)
+  cb()
   USE_RTC = use
   if USE_RTC == true and inCall == true then
     inCall = false
@@ -521,13 +539,12 @@ RegisterNUICallback('notififyUseRTC', function (use, cb)
       NetworkSetTalkerProximity(2.5)
     end
   end
-  cb()
 end)
 
 
 RegisterNUICallback('onCandidates', function (data, cb)
-  TriggerServerEvent('gcPhone:candidates', data.id, data.candidates)
   cb()
+  TriggerServerEvent('gcPhone:candidates', data.id, data.candidates)
 end)
 
 RegisterNetEvent("gcPhone:candidates")
@@ -588,52 +605,58 @@ RegisterNUICallback('getMessages', function(data, cb)
   cb(json.encode(messages))
 end)
 RegisterNUICallback('sendMessage', function(data, cb)
+  cb()
   if data.message == '%pos%' then
     local myPos = GetEntityCoords(PlayerPedId())
     data.message = 'GPS: ' .. myPos.x .. ', ' .. myPos.y
   end
-  TriggerServerEvent('gcPhone:sendMessage', data.phoneNumber, data.message)
+  --TriggerServerEvent('gcPhone:sendMessage', data.phoneNumber, data.message)
+  sendMessage(data.phoneNumber, data.message)
 end)
 RegisterNUICallback('deleteMessage', function(data, cb)
-  deleteMessage(data.id)
   cb()
+  deleteMessage(data.id)
 end)
 RegisterNUICallback('deleteMessageNumber', function (data, cb)
-  deleteMessageContact(data.number)
   cb()
+  deleteMessageContact(data.number)
 end)
 RegisterNUICallback('deleteAllMessage', function (data, cb)
-  deleteAllMessage()
   cb()
+  deleteAllMessage()
 end)
 RegisterNUICallback('setReadMessageNumber', function (data, cb)
-  setReadMessageNumber(data.number)
   cb()
+  setReadMessageNumber(data.number)
 end)
 --====================================================================================
 --  Event - Contacts
 --====================================================================================
 RegisterNUICallback('addContact', function(data, cb)
+  cb()
   TriggerServerEvent('gcPhone:addContact', data.display, data.phoneNumber)
 end)
 RegisterNUICallback('updateContact', function(data, cb)
+  cb()
   TriggerServerEvent('gcPhone:updateContact', data.id, data.display, data.phoneNumber)
 end)
 RegisterNUICallback('deleteContact', function(data, cb)
+  cb()
   TriggerServerEvent('gcPhone:deleteContact', data.id)
 end)
 RegisterNUICallback('getContacts', function(data, cb)
   cb(json.encode(contacts))
 end)
 RegisterNUICallback('setGPS', function(data, cb)
-  SetNewWaypoint(tonumber(data.x), tonumber(data.y))
   cb()
+  SetNewWaypoint(tonumber(data.x), tonumber(data.y))
 end)
 
 -- Add security for event (leuit#0100)
 RegisterNUICallback('callEvent', function(data, cb)
+  cb()
   local eventName = data.eventName or ''
-  if string.match(eventName, 'gcphone') then
+  if string.match(eventName, 'gcphone') or string.match(eventName, 'esx_addons_gcphone') then
     if data.data ~= nil then
       TriggerEvent(data.eventName, data.data)
     else
@@ -642,14 +665,13 @@ RegisterNUICallback('callEvent', function(data, cb)
   else
     print('Event not allowed')
   end
-  cb()
 end)
 RegisterNUICallback('useMouse', function(um, cb)
   useMouse = um
 end)
 RegisterNUICallback('deleteALL', function(data, cb)
-  TriggerServerEvent('gcPhone:deleteALL')
   cb()
+  TriggerServerEvent('gcPhone:deleteALL')
 end)
 
 
@@ -668,20 +690,20 @@ function TooglePhone()
   end
 end
 RegisterNUICallback('faketakePhoto', function(data, cb)
+  cb()
   menuIsOpen = false
   TriggerEvent('gcPhone:setMenuStatus', false)
   SendNUIMessage({show = false})
-  cb()
   TriggerEvent('camera:open')
 end)
 
 RegisterNUICallback('closePhone', function(data, cb)
+  cb()
   menuIsOpen = false
   TriggerEvent('gcPhone:setMenuStatus', false)
   SendNUIMessage({show = false})
   PhonePlayOut()
   SetBigmapActive(0,0)
-  cb()
 end)
 
 
@@ -691,12 +713,12 @@ end)
 ---------- GESTION APPEL ---------
 ----------------------------------
 RegisterNUICallback('appelsDeleteHistorique', function (data, cb)
-  appelsDeleteHistorique(data.numero)
   cb()
+  appelsDeleteHistorique(data.numero)
 end)
 RegisterNUICallback('appelsDeleteAllHistorique', function (data, cb)
-  appelsDeleteAllHistorique(data.infoCall)
   cb()
+  appelsDeleteAllHistorique(data.infoCall)
 end)
 
 
@@ -715,8 +737,8 @@ end)
 
 
 RegisterNUICallback('setIgnoreFocus', function (data, cb)
-  ignoreFocus = data.ignoreFocus
   cb()
+  ignoreFocus = data.ignoreFocus
 end)
 
 RegisterNUICallback('takePhoto', function(data, cb)

HTML/gcphone/resources/gcphone/html/static/config/config.json

@@ -165,17 +165,6 @@
     }
   ],
   "apps": [
-    {
-      "name": "Twitter",
-      "fr_FR__name": "Twitter",
-      "en_US__name": "Twitter",
-      "de_DE__name": "Twitter",
-      "pl_PL__name": "Twitter",
-      "es_ES__name": "Twitter",
-      "icons": "/html/static/img/icons_app/twitter.png",
-      "routeName": "twitter.splash",
-      "inHomePage": false
-    },
     {
       "name": "Telefon",
       "fr_FR__name": "Téléphone",
@@ -188,18 +177,6 @@
       "routeName": "appels",
       "inHomePage": true
     },
-    {
-      "name": "Kontakte",
-      "fr_FR__name": "Contacts",
-      "en_US__name": "Contacts",
-      "cs_CZ__name": "Kontakty",
-      "de_DE__name": "Kontakte",
-      "pl_PL__name": "Kontakty",
-      "es_ES__name": "Contactos",
-      "icons": "/html/static/img/icons_app/contacts.png",
-      "routeName": "contacts",
-      "inHomePage": false
-    },
     {
       "name": "Nachrichten",
       "fr_FR__name": "Messages",
@@ -213,6 +190,18 @@
       "inHomePage": true,
       "puceRef": "nbMessagesUnread"
     },
+    {
+      "name": "Kontakte",
+      "fr_FR__name": "Contacts",
+      "en_US__name": "Contacts",
+      "cs_CZ__name": "Kontakty",
+      "de_DE__name": "Kontakte",
+      "pl_PL__name": "Kontakty",
+      "es_ES__name": "Contactos",
+      "icons": "/html/static/img/icons_app/contacts.png",
+      "routeName": "contacts",
+      "inHomePage": false
+    },
     {
       "name": "Einstellungen",
       "fr_FR__name": "Paramètres",
@@ -225,6 +214,17 @@
       "routeName": "parametre",
       "inHomePage": false
     },
+    {
+      "name": "Twitter",
+      "fr_FR__name": "Twitter",
+      "en_US__name": "Twitter",
+      "de_DE__name": "Twitter",
+      "pl_PL__name": "Twitter",
+      "es_ES__name": "Twitter",
+      "icons": "/html/static/img/icons_app/twitter.png",
+      "routeName": "twitter.splash",
+      "inHomePage": false
+    },
     {
       "name": "Bank",
       "fr_FR__name": "Wallet",

HTML/gcphone/resources/gcphone/server/server.lua

@@ -32,19 +32,16 @@ end
   Un solution ESC basé sur la solution donnée par HalCroves
   https://forum.fivem.net/t/tutorial-for-gcphone-with-call-and-job-message-other/177904
 --]]
---[[
- ESX.RegisterServerCallback('gcphone:getItemAmount', function(source, cb, item)
-	print('gcphone:getItemAmount call item : ' .. item)
+ESX.RegisterServerCallback('gcphone:getItemAmount', function(source, cb, item)
 	local xPlayer = ESX.GetPlayerFromId(source)
-        local items = xPlayer.getInventoryItem(item)
+  local items = xPlayer.getInventoryItem(item)
 
-        if items == nil then
-            cb(0)
-        else
-            cb(items.count)
-        end
+  if items == nil then
+      cb(0)
+  else
+      cb(items.count)
+  end
 end)
---]]
 
 --====================================================================================
 --  SIM CARDS // Thanks to AshKetchumza for the idea an some code.
@@ -227,6 +224,7 @@ function getMessages(identifier)
     local result = MySQL.Sync.fetchAll("SELECT phone_messages.* FROM phone_messages LEFT JOIN users ON users.identifier = @identifier WHERE phone_messages.receiver = users.phone_number", {
          ['@identifier'] = identifier
     })
+
     return result
     --return MySQLQueryTimeStamp("SELECT phone_messages.* FROM phone_messages LEFT JOIN users ON users.identifier = @identifier WHERE phone_messages.receiver = users.phone_number", {['@identifier'] = identifier})
 end