陈嘉乐
2020-06-09 b4e5c0d769137131b0215a27a173659538c6b0bf
2020-06-09-1
1个文件已添加
14个文件已修改
45 ■■■■■ 已修改文件
.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal 补丁 | 查看 | 原始文档 | blame | 历史
CommonLib/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Language.ini 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/Common/R.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31MusicSourcePage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/A31PlayMusicPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/View/DialogView.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/Music/View/MusicSourceView.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI0-Public/PublicAssmebly.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.DS_Store
Binary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,11 +1,14 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/MusicMain.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/Music/View/DialogView.cs">
    <Files>
      <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1305" Column="18" />
      <File FileName="HDL_ON/UI/Music/MusicMain.cs" Line="390" Column="10" />
      <File FileName="HDL_ON/UI/Music/SendMethod.cs" Line="291" Column="22" />
      <File FileName="HDL_ON/UI/Music/A31MusicModel.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="18" Column="37" />
      <File FileName="HDL_ON/UI/Music/View/DialogView.cs" Line="1106" Column="24" />
      <File FileName="HDL_ON/UI/Music/MusicMain.cs" />
      <File FileName="HDL_ON/UI/Music/SendMethod.cs" />
      <File FileName="HDL_ON/UI/Music/A31PlayMusicPage.cs" Line="10" Column="6" />
      <File FileName="HDL_ON/Common/R.cs" Line="249" Column="55" />
      <File FileName="HDL-ON_Android/Assets/Language.ini" Line="156" Column="10" />
      <File FileName="HDL_ON/UI/UI0-Public/PublicAssmebly.cs" Line="591" Column="10" />
      <File FileName="HDL_ON/UI/Music/A31MusicSourcePage.cs" Line="64" Column="50" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -15,8 +18,13 @@
              <Node name="Common" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="Music" expanded="True">
                  <Node name="View" expanded="True" />
                  <Node name="MusicMain.cs" selected="True" />
                  <Node name="View" expanded="True">
                    <Node name="DialogView.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                </Node>
              </Node>
            </Node>
.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shm
Binary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal
Binary files differ
CommonLib/.DS_Store
Binary files differ
HDL-ON_Android/Assets/Language.ini
@@ -193,4 +193,5 @@
5042=配置中...
5043=解除中...
5044=音量
5045=总音量
5045=总音量
5046=调节音量
HDL_ON/.DS_Store
Binary files differ
HDL_ON/Common/R.cs
@@ -248,6 +248,6 @@
        public readonly static int lifting = 5043;
        public readonly static int volumeMusic = 5044;
        public readonly static int totalVolume = 5045;
        public readonly static int volumeAdjustment = 5046;
    }
}
HDL_ON/UI/Music/A31MusicSourcePage.cs
@@ -63,6 +63,7 @@
            areaText.fLayout.Y = bluetoothNameView.fLayout.Bottom;
            areaText.FrameLayoutView(fL1, false);
            areaText.nextLevelBtn.X = Application.GetRealWidth(339);
            areaText.nextLevelBtn.Y = Application.GetRealHeight(17);
            areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
            areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
            areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
HDL_ON/UI/Music/A31PlayMusicPage.cs
@@ -142,7 +142,7 @@
                         msg += Language.StringByID(StringId.listMode);
                         break;
                 }
                 new PublicAssmebly().TipMsgAutoClose(msg, false);
                 new PublicAssmebly().TipMsgAutoClose(msg, false,1000);
                 string url = "http://" + A31MusicModel.Current.IPAddress + "/httpapi.asp?command=setPlayerCmd:" + "loopmode:" + A31MusicModel.Current.A31PlayStatus.loop;
                 SendMethod.SendCommand(url);
             };
HDL_ON/UI/Music/View/DialogView.cs
@@ -1224,8 +1224,7 @@
                TextColor = Color.TextColor,
                TextSize = TextSize.Text16,
                TextAlignment = TextAlignment.Center,
                //TextID = StringId.readyPlay,
                Text="调节音量",
                TextID = StringId.volumeAdjustment,
                IsBold = true,
            };
            topFra.AddChidren(txetBtn);
HDL_ON/UI/Music/View/MusicSourceView.cs
@@ -94,7 +94,7 @@
                fLayout.AddChidren(iconBtn);
                textBtn.X = Application.GetRealWidth(56);
                nextLevelBtn.X = Application.GetRealWidth(339);
                nextLevelBtn.Height = Application.GetRealHeight(17);
                nextLevelBtn.Y = Application.GetRealHeight(17);
                nextLevelBtn.Width = Application.GetMinRealAverage(16);
                nextLevelBtn.Height = Application.GetMinRealAverage(16);
            }
@@ -103,7 +103,7 @@
                textBtn.X = Application.GetRealWidth(16);
                fLayout.AddChidren(inputTextBtn);
                nextLevelBtn.X = Application.GetRealWidth(333);
                nextLevelBtn.Height = Application.GetRealHeight(11);
                nextLevelBtn.Y = Application.GetRealHeight(11);
                nextLevelBtn.Width = Application.GetMinRealAverage(28);
                nextLevelBtn.Height = Application.GetMinRealAverage(28);
                nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -587,7 +587,7 @@
        /// </summary>
        /// <param name="msg"></param>
        /// <param name="isWhite"></param>
        public void TipMsgAutoClose(string msg, bool isWhite)
        public void TipMsgAutoClose(string msg, bool isWhite,int time=1500)
        {
            Dialog dialog = new Dialog()
            {
@@ -629,7 +629,7 @@
            new Thread(() =>
            {
                Thread.Sleep(1500);
                Thread.Sleep(time);
                Application.RunOnMainThread(() =>
                {
                    dialog.Close();
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -34,7 +34,7 @@
                    LoadSceneFunctionControlZone();
                }
                DB_ResidenceData.residenceData.SaveResidenceData();
                new PublicAssmebly().TipMsgAutoClose(msg, true);
                new PublicAssmebly().TipMsgAutoClose(msg, true,1000);
            };
        }