JLChen
2020-12-11 d616b67bd6ea95562af73a00bf0aab38eec935df
2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
5个文件已修改
68 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Application.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/AppDelegate.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,19 +1,34 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs" Line="41" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs" Line="208" Column="40" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="297" Column="14" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="220" Column="54" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs" Line="1" Column="1" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="246" Column="38" />
      <File FileName="HDL_ON/Entity/UserInfo.cs" Line="150" Column="21" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="325" Column="43" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Entity" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="ResetAccountPassword" expanded="True" />
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Music" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Info.plist" selected="True" />
              <Node name="AppDelegate.cs" selected="True" />
            </Node>
          </Node>
        </State>
@@ -29,7 +44,9 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="250" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>
HDL-ON_Android/Application.cs
@@ -49,7 +49,9 @@
            string[] permissions = new string[] { Manifest.Permission.WriteExternalStorage, Manifest.Permission.RecordAudio,
            Manifest.Permission.Camera, Manifest.Permission.ProcessOutgoingCalls, Manifest.Permission.GetAccounts};
            //禁止屏幕长亮
            BaseActivity.KeepScreenON = false;
            //隐藏迪拜虚拟按键
            BaseActivity.IsHideVirualButtons = true;
            init();
            BaseActivity.OnCreateActoin += (activity, application) =>
HDL-ON_iOS/AppDelegate.cs
@@ -218,6 +218,8 @@
            Shared.Application.IsUsePingFang = true;
            ////默认禁止音乐服务
            //Shared.Application.IsMusicEnable = false;
            //保持屏幕常亮或者自动锁屏
            application.IdleTimerDisabled = false;
            Window = new UIWindow(UIScreen.MainScreen.Bounds);
            rootViewController = new UINavigationController(new ViewController()) { NavigationBarHidden = true };
@@ -241,7 +243,7 @@
            //    OnAppConfig.Instance.SaveUserConfig();
            //}
            application.IdleTimerDisabled = true;
            application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
            //window.AccessibilityNavigationStyle = UIAccessibilityNavigationStyle.Automatic;
@@ -293,8 +295,28 @@
                    var expandData = "";
                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        expandData = expandDataNSD["messageType"] as NSString;
                        var expandDataStr = userInfo["expandData"] as NSString;
                        if(expandDataStr == null)
                        {
                            var expandDataNSD = userInfo["expandData"] as NSDictionary;
                            if (expandDataNSD != null)
                            {
                                expandData = expandDataNSD.ToString();
                            }
                        }
                        else
                        {
                            expandData = expandDataStr;
                        }
                        //var expandDataNSD = userInfo["expandData"] as NSDictionary;
                        //if (expandDataNSD != null && expandDataNSD is NSDictionary)
                        //{
                        //    if (expandDataNSD.ContainsKey(new NSString("messageType")))
                        //    {
                        //        expandData = expandDataNSD["messageType"] as NSString;
                        //    }
                        //}
                    }
                    var pushMes = new JPushMessageInfo()
                    {
HDL-ON_iOS/Info.plist
@@ -115,5 +115,9 @@
    </array>
    <key>CFBundleDevelopmentRegion</key>
    <string>zh_CN</string>
    <key>UIBackgroundModes</key>
    <array>
        <string>remote-notification</string>
    </array>
</dict>
</plist>
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -102,6 +102,7 @@
                    BorderColor = 0x00000000,
                    BorderWidth = 0,
                    ScrollEnabled = false,
                    VerticalScrollBarEnabled = false,//隐藏滚动条
                };
                contentView.AddChidren(sView);
                #region 头像信息