diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua index 7ee0792..54c680d 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua @@ -245,8 +245,8 @@ CLUIElementPopList = CS.CLUIElementPopList ---@type System.Uri Uri = CS.System.Uri ------------------------------------------------------- ----@type NativeGalleryUtl -NativeGalleryUtl = CS.NativeGalleryUtl +---@type NativeGallery +NativeGallery = CS.NativeGallery ---@type MyLocation MyLocation = CS.MyLocation ---@type Dist.SpringWebsocket.Client4Stomp diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua index f1643f9..4c77daf 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua @@ -589,28 +589,30 @@ function TRPNewOrder:setEventDelegate() -- 相机 local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage)) if permission ~= NativeCamera.Permission.Granted then - CLUIUtl.showConfirm( - "没有使用相机的权限,打开设置允许使用相机", - function() - if not MyCamera.openSetting() then - MyUtl.toastW("打开权限设置失败") - end - end, - nil - ) + NativeCamera.RequestPermission() + -- CLUIUtl.showConfirm( + -- "没有使用相机的权限,打开设置允许使用相机", + -- function() + -- if not MyCamera.openSetting() then + -- MyUtl.toastW("打开权限设置失败") + -- end + -- end, + -- nil + -- ) end elseif popList.value == "2" then local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage)) if permission ~= NativeGallery.Permission.Granted then - CLUIUtl.showConfirm( - "没有使用相册的权限,打开设置允许使用相册", - function() - if not MyGallery.openSetting() then - MyUtl.toastW("打开权限设置失败") - end - end, - nil - ) + NativeCamera.RequestPermission() + -- CLUIUtl.showConfirm( + -- "没有使用相册的权限,打开设置允许使用相册", + -- function() + -- if not MyGallery.openSetting() then + -- MyUtl.toastW("打开权限设置失败") + -- end + -- end, + -- nil + -- ) end end end