Merge branch 'wxr-2.2' into Dev-Branch

wxr

2023-10-20 4e4f9c3ee4ff6d05d5a431626901fbf43eb368a9

 HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs

@@ -301,6 +301,11 @@
                jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                jdhSingleFramLayout.btnLeftImage.Visible = false;
                jdhSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
                jdhSingleFramLayout.singleFramLayout,
                jdhSingleFramLayout.btnName,
                 jdhSingleFramLayout.btnRightImage,
                 48, 200);
            }
            else
            {