publish

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua

@@ -170,8 +170,8 @@ end
 
 function TRPMyInfor:onFinishSetField(key, val)
     if tostring(val) ~= tostring(self.mdata[key]) then
-        -- self:sendModifymsg(key, val, true)
-        --//TODO:
+    -- self:sendModifymsg(key, val, true)
+    --//TODO:
     end
 end
 
@@ -213,28 +213,37 @@ function TRPMyInfor: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
-                    )
+                    if permission == NativeCamera.Permission.ShouldAsk then
+                        NativeCamera.RequestPermission()
+                    else
+                        CLUIUtl.showConfirm(
+                            "没有使用相机的权限，打开设置允许使用相机",
+                            function()
+                                if not MyCamera.openSetting() then
+                                    MyUtl.toastW("打开权限设置失败")
+                                end
+                            end,
+                            nil
+                        )
+                    end
                 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
-                    )
+                    if permission == NativeGallery.Permission.ShouldAsk then
+                        NativeGallery.RequestPermission()
+                    else
+                        CLUIUtl.showConfirm(
+                            "没有使用相册的权限，打开设置允许使用相册",
+                            function()
+                                if not MyGallery.openSetting() then
+                                    MyUtl.toastW("打开权限设置失败")
+                                end
+                            end,
+                            nil
+                        )
+                    end
+                    NativeCamera.RequestPermission()
                 end
             end
         end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua

@@ -309,7 +309,7 @@ function TRPNewOrder:showExtentFiles(templetId)
     local d = uiobjs.DetailFromRoot:getValue(true)
     d.content = cfgInfor.content
     uiobjs.DetailFromRoot:setValue(d)
-    
+
     -- 附件
     self:showImages()
     -----------------------------------
@@ -589,30 +589,37 @@ function TRPNewOrder:setEventDelegate()
                 -- 相机
                 local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
                 if permission ~= NativeCamera.Permission.Granted then
-                    NativeCamera.RequestPermission()
-                    -- CLUIUtl.showConfirm(
-                    --     "没有使用相机的权限，打开设置允许使用相机",
-                    --     function()
-                    --         if not MyCamera.openSetting() then
-                    --             MyUtl.toastW("打开权限设置失败")
-                    --         end
-                    --     end,
-                    --     nil
-                    -- )
+                    if permission == NativeCamera.Permission.ShouldAsk then
+                        NativeCamera.RequestPermission()
+                    else
+                        CLUIUtl.showConfirm(
+                            "没有使用相机的权限，打开设置允许使用相机",
+                            function()
+                                if not MyCamera.openSetting() then
+                                    MyUtl.toastW("打开权限设置失败")
+                                end
+                            end,
+                            nil
+                        )
+                    end
                 end
             elseif popList.value == "2" then
                 local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage))
                 if permission ~= NativeGallery.Permission.Granted then
+                    if permission == NativeGallery.Permission.ShouldAsk then
+                        NativeGallery.RequestPermission()
+                    else
+                        CLUIUtl.showConfirm(
+                            "没有使用相册的权限，打开设置允许使用相册",
+                            function()
+                                if not MyGallery.openSetting() then
+                                    MyUtl.toastW("打开权限设置失败")
+                                end
+                            end,
+                            nil
+                        )
+                    end
                     NativeCamera.RequestPermission()
-                    -- CLUIUtl.showConfirm(
-                    --     "没有使用相册的权限，打开设置允许使用相册",
-                    --     function()
-                    --         if not MyGallery.openSetting() then
-                    --             MyUtl.toastW("打开权限设置失败")
-                    --         end
-                    --     end,
-                    --     nil
-                    -- )
                 end
             end
         end

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,8a5a410e6d655a4da481068f2a8cce498	%trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,9fa2159c6c0cc795c6ff005efa12916c8	%trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33