diff --git a/.vs/txkt_m3u8.sqlite_ts/v17/.suo b/.vs/txkt_m3u8.sqlite_ts/v17/.suo
index d5da479a82e96afa1e2ad3b37b6ca70261f8a2af..40ed1f04cfeb79f9c3e9677dcc0221aeb5eb6297 100644
Binary files a/.vs/txkt_m3u8.sqlite_ts/v17/.suo and b/.vs/txkt_m3u8.sqlite_ts/v17/.suo differ
diff --git a/README.md b/README.md
index 7965e967dd426c2914adb1c3aa6faab29117e9f0..045af4a087dcd65250c4d5bf046dafb7a5e5b99b 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 基于.net实现的m3u8.sqlite文件转视频工具。
 虽然已有另一个python开源版本，但是对python不熟悉的朋友操作不是很友好。
 所以开发这个客户端的版本，让其操作更为便捷。
+转换后的视频是.ts的文件，需要转mp4或其他格式的可以下载格式工厂，或者自行选择其他转换工具就ok了。
 
 #### 软件架构
 本地单机软件
diff --git a/images/finish.png b/images/finish.png
index ef0dd37326d7be9bf6aff71031cd3276546b6f00..c1a479e4e6c0ba35a999e15ab14a232e995ac209 100644
Binary files a/images/finish.png and b/images/finish.png differ
diff --git a/images/main.png b/images/main.png
index 4d6fddfbd5e67fd4c9d327e376cc28614f32640f..82c7a42b347acf4d0d6e79ab57e8faafa65bd7b3 100644
Binary files a/images/main.png and b/images/main.png differ
diff --git a/images/progress.png b/images/progress.png
index d48007b7295e15d344ac757a16225a568703a376..e6c7d1ad1cd398b628a0479239839156cd77316c 100644
Binary files a/images/progress.png and b/images/progress.png differ
diff --git a/txkt_m3u8.sqlite_ts/App.ico b/txkt_m3u8.sqlite_ts/App.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9c1a064ab476dbb6d4278d1757e25e4920ad39ee
Binary files /dev/null and b/txkt_m3u8.sqlite_ts/App.ico differ
diff --git a/txkt_m3u8.sqlite_ts/App.png b/txkt_m3u8.sqlite_ts/App.png
new file mode 100644
index 0000000000000000000000000000000000000000..7208ac6625bf2e6fa53f2d289a6c9bc62bc79099
Binary files /dev/null and b/txkt_m3u8.sqlite_ts/App.png differ
diff --git a/txkt_m3u8.sqlite_ts/App.xaml b/txkt_m3u8.sqlite_ts/App.xaml
index 5119a108c5c8371faa908e754ae2d33b4d764014..3eae9a1598f8a421f32261ff45af996dd711188b 100644
--- a/txkt_m3u8.sqlite_ts/App.xaml
+++ b/txkt_m3u8.sqlite_ts/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:txkt_m3u8.sqlite_ts"
-             StartupUri="MainWindow.xaml" ShutdownMode="OnExplicitShutdown">
+             StartupUri="MainWindow.xaml" ShutdownMode="OnLastWindowClose">
     <Application.Resources>
         <!-- Rubyer -->
         <ResourceDictionary Source="pack://application:,,,/Rubyer;component/Themes/Generic.xaml" />
diff --git a/txkt_m3u8.sqlite_ts/MainWindow.xaml b/txkt_m3u8.sqlite_ts/MainWindow.xaml
index 4099da062d50ef3687d5d3055fbae09c3ddc6bb6..1c4cd35a5792c509c890cb71e2f76127c69fc7aa 100644
--- a/txkt_m3u8.sqlite_ts/MainWindow.xaml
+++ b/txkt_m3u8.sqlite_ts/MainWindow.xaml
@@ -6,33 +6,33 @@
         xmlns:local="clr-namespace:txkt_m3u8.sqlite_ts"
         xmlns:rubyer="clr-namespace:Rubyer;assembly=Rubyer"
         mc:Ignorable="d"
-        Title="m3u8.sqlite转ts视频" Width="600" Height="337" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="Window_Loaded">
+        Title="m3u8.sqlite转ts视频（开源免费）" Width="600" Height="337" Icon="App.ico" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="Window_Loaded">
     <Grid>
         <!-- 操作区 -->
         <StackPanel Margin="10,10,10,0">
             <Grid Margin="0,15,0,0">
                 <Label Content="m3u8.sqlite文件夹："/>
-                <TextBox x:Name="SourceFolder" Text="G:\TXEDU" Margin="130,0,80,0" VerticalContentAlignment="Center"/>
+                <TextBox Text="{Binding SourceFolder}" Margin="130,0,80,0" VerticalContentAlignment="Center"/>
                 <Button x:Name="BtnSelectSourceFolder" Content="选择" Width="80" HorizontalAlignment="Right" Cursor="Hand" Click="BtnSelectSourceFolder_Click"/>
             </Grid>
             <Grid Margin="0,15,0,0">
-                <Label Content="ts输出文件夹："/>
-                <TextBox x:Name="TargetFolder" Text="." Margin="130,0,80,0" VerticalContentAlignment="Center"/>
+                <Label Content="ts视频输出文件夹："/>
+                <TextBox Text="{Binding TargetFolder}" Margin="130,0,80,0" VerticalContentAlignment="Center"/>
                 <Button x:Name="BtnSelectTargetFolder" Content="选择" Width="80" HorizontalAlignment="Right" Cursor="Hand" Click="BtnSelectTargetFolder_Click"/>
             </Grid>
             <Grid Margin="0,15,0,0">
                 <Label Content="当前进度："/>
-                <ProgressBar x:Name="CurrentProgress" Margin="130,0,0,0" Value="80" Maximum="100" Background="Gray"
+                <ProgressBar Margin="130,0,0,0" Value="{Binding CurrentProgress}" Maximum="{Binding CurrentMax}" Background="Gray"
                                                 rubyer:ProgressBarHelper.Thickness="30"
                                                 rubyer:ProgressBarHelper.IsShowPercent="false"/>
-                <TextBlock x:Name="CurrentPercent" Margin="135,0,0,0" Text="80 / 100" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                <TextBlock Margin="135,0,0,0" Text="{Binding CurrentPercent}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             </Grid>
             <Grid Margin="0,15,0,0">
                 <Label Content="总进度："/>
-                <ProgressBar x:Name="TotalProgress"  Margin="130,0,0,0" Value="30" Maximum="100"  Background="Gray"
+                <ProgressBar Margin="130,0,0,0" Value="{Binding TotalProgress}" Maximum="{Binding TotalMax}"  Background="Gray"
                                                 rubyer:ProgressBarHelper.Thickness="30"
                                                 rubyer:ProgressBarHelper.IsShowPercent="false"/>
-                <TextBlock x:Name="TotalPercent" Margin="135,0,0,0" Text="30 / 100" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                <TextBlock Margin="135,0,0,0" Text="{Binding TotalPercent}" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             </Grid>
             <Grid Margin="0,30,0,0">
                 <Button x:Name="BeginConvert" Content="开始转换" Width="120" Background="Red" Click="BeginConvert_Click"/>
@@ -40,7 +40,7 @@
         </StackPanel>
 
         <Grid Margin="0,10,0,0" VerticalAlignment="Bottom" Background="#2196f3">
-            <Label x:Name="WorkStatus" Content="就绪" Foreground="White"/>
+            <Label Content="{Binding WorkStatus}" Foreground="White"/>
         </Grid>
         
         <rubyer:MessageContainer Identifier="MessageContainers" Grid.ColumnSpan="2"/>
diff --git a/txkt_m3u8.sqlite_ts/MainWindow.xaml.cs b/txkt_m3u8.sqlite_ts/MainWindow.xaml.cs
index 53fcaa8b6a3c11cf2fad1f5f130af3720e0edb15..3a633077cd12f92cb27aecff3a4ee00c6758a427 100644
--- a/txkt_m3u8.sqlite_ts/MainWindow.xaml.cs
+++ b/txkt_m3u8.sqlite_ts/MainWindow.xaml.cs
@@ -5,13 +5,14 @@ using System.Data;
 using System.Data.SQLite;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using System.Windows;
-using System.Windows.Controls;
+using txkt_m3u8.sqlite_ts.ViewModel;
 
 namespace txkt_m3u8.sqlite_ts
 {
@@ -22,9 +23,15 @@ namespace txkt_m3u8.sqlite_ts
     {
         private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
+        /// <summary>
+        /// 数据模型
+        /// </summary>
+        private MainViewModel _viewModel = new MainViewModel();
+
         public MainWindow()
         {
             InitializeComponent();
+            this.DataContext = _viewModel;
         }
 
         /// <summary>
@@ -34,13 +41,6 @@ namespace txkt_m3u8.sqlite_ts
         /// <param name="e"></param>
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            // 清空当前进度
-            this.CurrentProgress.Value = 0;
-            this.CurrentPercent.Text = "";
-            // 清空总进度
-            this.TotalProgress.Value = 0;
-            this.TotalPercent.Text = "";
-
             log.Info("初始化完成");
             ShowStatus("初始化完成");
         }
@@ -55,8 +55,8 @@ namespace txkt_m3u8.sqlite_ts
             System.Windows.Forms.FolderBrowserDialog openFileDialog = new System.Windows.Forms.FolderBrowserDialog(); // 选择文件夹
             if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK) // 注意，此处一定要手动引入System.Window.Forms空间，否则你如果使用默认的DialogResult会发现没有OK属性
             {
-                TargetFolder.Text = openFileDialog.SelectedPath;
-                log.Info("选定目标文件夹" + TargetFolder.Text);
+                _viewModel.TargetFolder = openFileDialog.SelectedPath;
+                log.Info("选定目标文件夹" + _viewModel.TargetFolder);
             }
         }
 
@@ -70,8 +70,8 @@ namespace txkt_m3u8.sqlite_ts
             System.Windows.Forms.FolderBrowserDialog openFileDialog = new System.Windows.Forms.FolderBrowserDialog();
             if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                SourceFolder.Text = openFileDialog.SelectedPath;
-                log.Info("选定源文件夹" + SourceFolder.Text);
+                _viewModel.SourceFolder = openFileDialog.SelectedPath;
+                log.Info("选定源文件夹" + _viewModel.SourceFolder);
             }
         }
 
@@ -82,36 +82,28 @@ namespace txkt_m3u8.sqlite_ts
         /// <param name="e"></param>
         private void BeginConvert_Click(object sender, RoutedEventArgs e)
         {
-            string sourceFolder = SourceFolder.Text.Trim();
-            string targetFolder = TargetFolder.Text.Trim();
-            if (string.IsNullOrEmpty(sourceFolder))
+            if (string.IsNullOrEmpty(_viewModel.SourceFolder))
             {
                 log.Error("请输入或选择源文件夹");
                 MessageCore.ShowWarning("请输入或选择源文件夹");
                 return;
             }
-            if (!Directory.Exists(sourceFolder))
+            if (!Directory.Exists(_viewModel.SourceFolder))
             {
-                log.Error("源文件夹不存在 => " + sourceFolder);
+                log.Error("源文件夹不存在 => " + _viewModel.SourceFolder);
                 MessageCore.ShowWarning("源文件夹不存在");
                 return;
             }
 
-            if (string.IsNullOrEmpty(targetFolder))
+            if (string.IsNullOrEmpty(_viewModel.TargetFolder))
             {
                 log.Error("请输入或选择目标文件夹");
                 MessageCore.ShowWarning("请输入或选择目标文件夹");
                 return;
             }
-            if (!Directory.Exists(targetFolder))
-            {
-                log.Error("目标文件夹不存在 => " + targetFolder);
-                MessageCore.ShowWarning("目标文件夹不存在");
-                return;
-            }
 
             // 获取文件列表
-            string[] filePaths = Directory.GetFiles(sourceFolder, "*.m3u8.sqlite", SearchOption.AllDirectories);
+            string[] filePaths = Directory.GetFiles(_viewModel.SourceFolder, "*.m3u8.sqlite", SearchOption.AllDirectories);
             if (null == filePaths || filePaths.Length <= 0)
             {
                 log.Error("没有找到需要解码的文件（*.m3u8.sqlite）");
@@ -163,6 +155,8 @@ namespace txkt_m3u8.sqlite_ts
         /// <param name="termId"></param>
         private void FetchOneTs(string filePath, string uin, string termId)
         {
+            string fileName = Path.GetFileName(filePath);
+
             DateTime beginTime = DateTime.Now;
             using (SQLite sqlite = new SQLite(filePath))
             {
@@ -170,27 +164,174 @@ namespace txkt_m3u8.sqlite_ts
                 ShowStatus(msg);
                 log.Info(msg);
                 string cachesTableName = "caches";
-                int pageSize = 200;
                 int total = sqlite.GetRowsCount(cachesTableName);
-                int totalPage = (total + pageSize - 1) / pageSize;
                 int index = 1;
-                RefreshProgress(ProgressType.当前进度, 0, total);
+
+                RefreshProgress(ProgressType.当前进度, 0, total * 2);
+
+                List<long[]> tsIndex = new List<long[]>();
+                List<byte[]> aesKeys = new List<byte[]>();
+
+                int pageSize = 100;
+                int totalPage = (total + pageSize - 1) / pageSize;
+                
+
                 for (int i = 1; i <= totalPage; i++)
                 {
-                    string limit = string.Format("LIMIT {0}, {1}", (i - 1) * pageSize, pageSize);
-                    string[] caches = sqlite.GetRows(cachesTableName, "value", limit);
-                    foreach(string cache in caches)
+                    string pageLimit = string.Format("LIMIT {0}, {1}", (i - 1) * pageSize, pageSize);
+                    List<object[]> caches = sqlite.GetRows(cachesTableName, "*", pageLimit);
+                    foreach (object[] cache in caches)
                     {
-                        RefreshProgress(ProgressType.当前进度, index, total);
-                        msg = string.Format("解析ts进度 [{0} / {1}] => {2}", index, total, filePath);
+                        try
+                        {
+                            string key = cache[0].ToString();
+                            object value = cache[1];
+
+                            Extend keyExtend = ExtractFromMetadata(key);
+                            string[] keyQueriesExtendKeys = keyExtend.Queries.Keys.ToArray();
+
+                            if (Encoding.UTF8.GetString(value as byte[]).Contains("#EXTM3U"))
+                            { }
+                            else if (keyQueriesExtendKeys.Contains("edk"))
+                            {
+                                aesKeys.Add(value as byte[]);
+                                string hex = ToHexString(value as byte[]);
+                                log.Info(string.Format("[KEY]：{0}, length：{1}", hex, hex.Length));
+                            }
+                            else
+                            {
+                                long start = long.Parse(keyExtend.Queries["start"]);
+                                long end = long.Parse(keyExtend.Queries["end"]);
+                                tsIndex.Add(new long[] { index - 1, start, end });
+                            }
+
+                            RefreshProgress(ProgressType.当前进度, index, total * 2);
+                            msg = string.Format("解码进度 [{0} / {1}] => {2}", index, total, fileName);
+                            ShowStatus(msg);
+                            log.Info(msg);
+                        }
+                        finally
+                        {
+                            Interlocked.Increment(ref index);
+                        }
+                    }
+                    GC.Collect();
+                    GC.WaitForPendingFinalizers();
+                }          
+
+                // 重新排序
+                long matchTime = -1;
+                List<long[]> orderedTsIndex = new List<long[]>();
+                for (int x = 0; x < tsIndex.Count; x++)
+                {
+                    for (int y = 0; y < tsIndex.Count; y++)
+                    {
+                        if (tsIndex[y][1] == matchTime + 1)
+                        {
+                            orderedTsIndex.Add(tsIndex[y]);
+                            matchTime = tsIndex[y][2];
+                        }
+                    }
+                }
+                msg = string.Format("重新排序 => " + fileName);
+                ShowStatus(msg);
+
+                // 保存文件
+                string sourceFolder = _viewModel.SourceFolder.Trim();
+                string targetFolder = _viewModel.TargetFolder.Trim();
+                if (".".Equals(targetFolder))
+                {
+                    targetFolder = sourceFolder;
+                }
+                if (!Directory.Exists(targetFolder))
+                {
+                    Directory.CreateDirectory(targetFolder);
+                }
+                string targetFileName = fileName.Replace(".m3u8.sqlite", ".ts");
+                string targetFilePath = Path.Combine(targetFolder, targetFileName);
+                if (File.Exists(targetFilePath))
+                {
+                    try
+                    {
+                        File.Delete(targetFilePath);
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("删除失败：" + ex.Message, ex);
+                    }
+                }
+
+                using (FileStream fs = new FileStream(targetFilePath, FileMode.OpenOrCreate, FileAccess.Write))
+                {
+                    int orderIndex = 0;
+                    int orderTotal = orderedTsIndex.Count;
+
+                    List<object[]> cacheOne;
+                    string limit;
+                    object raw;
+                    byte[] chip;
+                    // 合并片段
+                    foreach (long[] tsOne in orderedTsIndex)
+                    {
+                        limit = string.Format("LIMIT {0}, {1}", tsOne[0], 1);
+                        cacheOne = sqlite.GetRows(cachesTableName, "*", limit);
+                        raw = cacheOne[0][1];
+                        chip = AESDecrypt(raw as byte[], aesKeys[0]);
+                        fs.Write(chip, 0, chip.Length);
+                        orderIndex += 1;
+
+                        RefreshProgress(ProgressType.当前进度, index, total + orderTotal);
+                        msg = string.Format("合并进度 [{0} / {1}] => {2}", orderIndex, orderTotal, fileName);
                         ShowStatus(msg);
                         log.Info(msg);
                         index++;
                     }
-                    GC.Collect();
-                    GC.WaitForPendingFinalizers();
                 }
+
+                /*List<object[]> cacheOne;
+                string limit;
+                object raw;
+                byte[] chip;
+                // 合并片段
+                foreach (long[] tsOne in orderedTsIndex)
+                {
+                    limit = string.Format("LIMIT {0}, {1}", tsOne[0], 1);
+                    cacheOne = sqlite.GetRows(cachesTableName, "*", limit);
+                    raw = cacheOne[0][1];
+                    chip= AESDecrypt(raw as byte[], aesKeys[0]);
+                    plain.AddRange(chip);
+                    orderIndex += 1;
+
+                    RefreshProgress(ProgressType.当前进度, index, total + orderTotal);
+                    msg = string.Format("合并进度 [{0} / {1}] => {2}", orderIndex, orderTotal, fileName);
+                    ShowStatus(msg);
+                    log.Info(msg);
+                    index++;
+                }
+
+                // 保存文件
+                string sourceFolder = SourceFolder.Text.Trim();
+                string targetFolder = TargetFolder.Text.Trim();
+                if (".".Equals(targetFolder))
+                {
+                    targetFolder = sourceFolder;
+                }
+                if (Directory.Exists(targetFolder))
+                {
+                    Directory.CreateDirectory(targetFolder);
+                }
+                string targetFileName = fileName.Replace(".m3u8.sqlite", ".ts");
+                string targetFilePath = Path.Combine(targetFolder, targetFileName);
+
+                using (FileStream fs = new FileStream(targetFilePath, FileMode.OpenOrCreate, FileAccess.Write))
+                {
+                    fs.Write(plain.ToArray(), 0, plain.Count);
+                }*/
+
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
             }
+            log.Info(fileName + "文件解码完成，耗时：" + (DateTime.Now - beginTime).TotalMilliseconds + "ms");
         }
 
         /// <summary>
@@ -204,13 +345,13 @@ namespace txkt_m3u8.sqlite_ts
             using (SQLite sqlite = new SQLite(filePath))
             {
                 ShowStatus("解析元数据 => " + filePath);
-                string[] metadatas = sqlite.GetRows("metadata", "value");
-                if (null == metadatas || metadatas.Length <= 0)
+                List<object[]> metadatas = sqlite.GetRows("metadata", "value");
+                if (null == metadatas || metadatas.Count <= 0)
                 {
                     log.Error("metadata 不存在 => " + filePath);
                     return null;
                 }
-                string metadata = metadatas[0];
+                string metadata = metadatas[0][0].ToString();
                 Extend extend = ExtractFromMetadata(metadata);
                 string uin = extend.Tokens["uin"];
                 string termId = extend.Tokens["term_id"];
@@ -238,30 +379,46 @@ namespace txkt_m3u8.sqlite_ts
             log.Info(path);
 
             // 获取token
+            string tokenRaw = "";
+            Dictionary<string, string> tokens = null;
             Match matchToken = new Regex(@"token\.([\S]+)\.v").Match(path);
-            if (!matchToken.Success)
+            if (matchToken.Success)
             {
-                log.Error("token解析失败");
-                return null;
-            }
-            string tokenRaw = matchToken.Value;
-            tokenRaw = tokenRaw.Substring(6);
-            tokenRaw = tokenRaw.Substring(0, tokenRaw.Length - 2);
-
-            string tokenDecode = Base64.Decode(tokenRaw);
+                tokenRaw = matchToken.Value;
+                tokenRaw = tokenRaw.Substring(6);
+                tokenRaw = tokenRaw.Substring(0, tokenRaw.Length - 2);
+                string tokenDecode = Base64Decode(tokenRaw);
+                tokens = ParseQueryString(tokenDecode, ";");
+            }           
 
             return new Extend()
             {
                 Netloc = uri.Host,
                 Path = uri.LocalPath,
                 TokenRaw = tokenRaw,
-                Tokens = ParseQueryString(tokenDecode, ";"),
+                Tokens = tokens,
                 Params = "",
                 Fragment = uri.Fragment,
                 Queries = ParseQueryString(uri.Query)
             };
         }
 
+        public string ToHexString(byte[] bytes)
+        {
+            string hexString = string.Empty;
+            if (bytes != null)
+            {
+                StringBuilder strB = new StringBuilder();
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    strB.Append(" " + bytes[i].ToString("X2"));
+                }
+                hexString = strB.ToString();
+
+            }
+            return hexString;
+        }
+
         /// <summary>
         /// 查询参数解析为词典
         /// </summary>
@@ -306,24 +463,18 @@ namespace txkt_m3u8.sqlite_ts
         /// <param name="total"></param>
         private void RefreshProgress(ProgressType pt, float value, float total)
         {
-            void Refresh()
+            switch (pt)
             {
-                ProgressBar progressBar = pt == ProgressType.当前进度 ? CurrentProgress : TotalProgress;
-                TextBlock percentBar = pt == ProgressType.当前进度 ? CurrentPercent : TotalPercent;
-                progressBar.Maximum = total;
-                progressBar.Value = value;
-                percentBar.Text = String.Format("{0}%  [{1}/{2}]", (value / total * 100).ToString("0.00"), value, total);
-            }
-            try
-            {
-                Refresh();
-            }
-            catch
-            {
-                Dispatcher.InvokeAsync(() =>
-                {
-                    Refresh();
-                });
+                case ProgressType.当前进度:
+                    _viewModel.CurrentMax = total;
+                    _viewModel.CurrentProgress = value;
+                    _viewModel.CurrentPercent = String.Format("{0}%", (value / total * 100).ToString("0.00"));
+                    break;
+                case ProgressType.总进度:
+                    _viewModel.TotalMax = total;
+                    _viewModel.TotalProgress = value;
+                    _viewModel.TotalPercent = String.Format("{0} / {1}", value, total);
+                    break;
             }
         }
 
@@ -333,21 +484,7 @@ namespace txkt_m3u8.sqlite_ts
         /// <param name="logtxt"></param>
         private void ShowStatus(string text)
         {
-            void Append()
-            {
-                this.WorkStatus.Content = text;
-            }
-            try
-            {
-                Append();
-            }
-            catch
-            {
-                Dispatcher.InvokeAsync(() =>
-                {
-                    Append();
-                });
-            }
+            _viewModel.WorkStatus = text;
         }
         #endregion
 
@@ -418,76 +555,65 @@ namespace txkt_m3u8.sqlite_ts
 
         #region Base64
         /// <summary>
-        /// Base64 相关操作
+        /// Base64解码
         /// </summary>
-        public class Base64
+        /// <param name="base64"></param>
+        /// <returns></returns>
+        private string Base64Decode(string base64)
         {
-            /// <summary>
-            /// 解码
-            /// </summary>
-            /// <param name="base64"></param>
-            /// <returns></returns>
-            public static string Decode(string base64)
+            return Base64Decode(base64, Encoding.UTF8);
+        }
+
+        /// <summary>
+        /// Base64解码
+        /// </summary>
+        /// <param name="base64"></param>
+        /// <param name="encoding"></param>
+        /// <returns></returns>
+        private string Base64Decode(string base64, Encoding encoding)
+        {
+            string dummyData = base64.Trim().Replace("%", "").Replace(",", "").Replace(" ", "+");
+            if (dummyData.Length % 4 > 0)
             {
-                return Decode(base64, Encoding.UTF8);
+                dummyData = dummyData.PadRight(dummyData.Length + 4 - dummyData.Length % 4, '=');
             }
-
-            /// <summary>
-            /// 解码
-            /// </summary>
-            /// <param name="base64"></param>
-            /// <param name="encoding"></param>
-            /// <returns></returns>
-            public static string Decode(string base64, Encoding encoding)
+            string text = string.Empty;
+            byte[] bytes = Convert.FromBase64String(dummyData);
+            try
             {
-                string dummyData = base64.Trim().Replace("%", "").Replace(",", "").Replace(" ", "+");
-                if (dummyData.Length % 4 > 0)
-                {
-                    dummyData = dummyData.PadRight(dummyData.Length + 4 - dummyData.Length % 4, '=');
-                }
-                string text = string.Empty;
-                byte[] bytes = Convert.FromBase64String(dummyData);
-                try
-                {
-                    text = encoding.GetString(bytes);
-                }
-                catch
-                {
-                    text = base64;
-                }
-                return text;
+                text = encoding.GetString(bytes);
             }
-
-            /// <summary>
-            /// 编码
-            /// </summary>
-            /// <param name="source"></param>
-            /// <returns></returns>
-            public static string Encode(string source)
+            catch
             {
-                return Encode(source, Encoding.UTF8);
+                text = base64;
             }
+            return text;
+        }
+        #endregion
 
-            /// <summary>
-            /// 编码
-            /// </summary>
-            /// <param name="source"></param>
-            /// <param name="encoding"></param>
-            /// <returns></returns>
-            public static string Encode(string source, Encoding encoding)
+        #region AES
+        /// <summary>
+        /// AES解密
+        /// </summary>
+        /// <param name="raw">被解密的密文</param>
+        /// <param name="key">密钥</param>
+        /// <param name="iv">向量</param>
+        /// <returns>明文</returns>
+        private byte[] AESDecrypt(byte[] raw, byte[] key, string iv = "0000000000000000")
+        {
+            byte[] biv = UTF8Encoding.UTF8.GetBytes(iv);
+
+            RijndaelManaged aes = new RijndaelManaged()
             {
-                string text = string.Empty;
-                byte[] bytes = encoding.GetBytes(source);
-                try
-                {
-                    text = Convert.ToBase64String(bytes);
-                }
-                catch
-                {
-                    text = source;
-                }
-                return text;
-            }
+                KeySize = 128,
+                Key = key,
+                IV = biv,
+                Mode = CipherMode.CBC
+            };
+
+            ICryptoTransform cTransform = aes.CreateDecryptor();
+            byte[] rs = cTransform.TransformFinalBlock(raw, 0, raw.Length);
+            return rs;
         }
         #endregion
 
@@ -683,7 +809,7 @@ namespace txkt_m3u8.sqlite_ts
             /// <param name="fieldName">字段名</param>
             /// <param name="limit">分页limit（例如：limit 0,500）</param>
             /// <returns>列数组</returns>        
-            public string[] GetRows(string tableName, string fieldName, string limit = "")
+            public List<object[]> GetRows(string tableName, string fieldName, string limit = "")
             {
                 if (!IsExistsTable(tableName))
                 {
@@ -698,10 +824,10 @@ namespace txkt_m3u8.sqlite_ts
                 SQLiteDataAdapter sda = new SQLiteDataAdapter(queryString, _connection);
                 DataTable dt = new DataTable();
                 sda.Fill(dt);
-                string[] rows = new string[dt.Rows.Count];
+                List<object[]> rows = new List<object[]>();
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
-                    rows[i] = dt.Rows[i][fieldName].ToString();
+                    rows.Add(dt.Rows[i].ItemArray);
                 }
                 sda.Dispose();
                 dt.Dispose();
@@ -730,17 +856,17 @@ namespace txkt_m3u8.sqlite_ts
                 }
                 return result;
             }
-            public List<string[]> GetAllLines(string tableName)
+            public List<object[]> GetAllLines(string tableName)
             {
                 queryString = string.Format("SELECT * FROM {0}", tableName);
                 ExecuteQuery();
-                string[] array = new string[_reader.FieldCount];
-                List<string[]> result = new List<string[]>();
+                object[] array = new object[_reader.FieldCount];
+                List<object[]> result = new List<object[]>();
                 while (_reader.Read())
                 {
                     for (int i = 0; i < _reader.FieldCount - 1; i++)
                     {
-                        array[i] = Convert.ToString(_reader[i]);
+                        array[i] = _reader[i];
                     }
                     result.Add(array);
                 }
diff --git a/txkt_m3u8.sqlite_ts/ViewModel/MainModel.cs b/txkt_m3u8.sqlite_ts/ViewModel/MainModel.cs
new file mode 100644
index 0000000000000000000000000000000000000000..57c82ee7d80c011e702be35b81c3b3bd99d6cda7
--- /dev/null
+++ b/txkt_m3u8.sqlite_ts/ViewModel/MainModel.cs
@@ -0,0 +1,51 @@
+using System.Windows;
+
+namespace txkt_m3u8.sqlite_ts.ViewModel
+{
+    /// <summary>
+    /// 主窗口数据Model
+    /// </summary>
+    public class MainModel
+    {
+        /// <summary>
+        /// 源文件夹
+        /// </summary>
+        public string SourceFolder { get; set; }
+
+        /// <summary>
+        /// 目标文件夹
+        /// </summary>
+        public string TargetFolder { get; set; }
+
+        /// <summary>
+        /// 当前进度
+        /// </summary>
+        public float CurrentProgress { get; set; }
+        /// <summary>
+        /// 当前进度最大值
+        /// </summary>
+        public float CurrentMax { get; set; }
+        /// <summary>
+        /// 当前进度百分比
+        /// </summary>
+        public string CurrentPercent { get; set; }
+
+        /// <summary>
+        /// 总进度
+        /// </summary>
+        public float TotalProgress { get; set; }
+        /// <summary>
+        /// 总进度
+        /// </summary>
+        public float TotalMax { get; set; }
+        /// <summary>
+        /// 当前进度百分比
+        /// </summary>
+        public string TotalPercent { get; set; }
+
+        /// <summary>
+        /// 工作状态
+        /// </summary>
+        public string WorkStatus { get; set; }  
+    }
+}
diff --git a/txkt_m3u8.sqlite_ts/ViewModel/MainViewModel.cs b/txkt_m3u8.sqlite_ts/ViewModel/MainViewModel.cs
new file mode 100644
index 0000000000000000000000000000000000000000..485fbd06ad4bf8145829e66e4f1616c19028faad
--- /dev/null
+++ b/txkt_m3u8.sqlite_ts/ViewModel/MainViewModel.cs
@@ -0,0 +1,140 @@
+using System.Windows;
+
+namespace txkt_m3u8.sqlite_ts.ViewModel
+{
+    /// <summary>
+    /// MainWindow模型
+    /// </summary>
+    public class MainViewModel: NotificationObject
+    {
+        private MainModel model;
+
+        public MainViewModel()
+        {
+            model = new MainModel()
+            {
+                //SourceFolder = "D:\\TTS",
+                TargetFolder = ".",
+
+                CurrentProgress = 0,
+                CurrentMax = 100,
+                CurrentPercent = "",
+
+                TotalProgress = 0,
+                TotalMax = 100,
+                TotalPercent = ""
+            };
+        }
+        /// <summary>
+        /// 源文件夹
+        /// </summary>
+        public string SourceFolder
+        {
+            get { return model.SourceFolder; }
+            set
+            {
+                model.SourceFolder = value;
+                RaisePropertyChanged("SourceFolder");
+            }
+        }
+
+        /// <summary>
+        /// 目标文件夹
+        /// </summary>
+        public string TargetFolder
+        {
+            get { return model.TargetFolder; }
+            set
+            {
+                model.TargetFolder = value;
+                RaisePropertyChanged("TargetFolder");
+            }
+        }
+
+        /// <summary>
+        /// 当前进度
+        /// </summary>
+        public float CurrentProgress
+        {
+            get { return model.CurrentProgress; }
+            set
+            {
+                model.CurrentProgress = value;
+                RaisePropertyChanged("CurrentProgress");
+            }
+        }
+        /// <summary>
+        /// 当前进度最大值
+        /// </summary>
+        public float CurrentMax
+        {
+            get { return model.CurrentMax; }
+            set
+            {
+                model.CurrentMax = value;
+                RaisePropertyChanged("CurrentMax");
+            }
+        }
+        /// <summary>
+        /// 当前进度百分比
+        /// </summary>
+        public string CurrentPercent
+        {
+            get { return model.CurrentPercent; }
+            set
+            {
+                model.CurrentPercent = value;
+                RaisePropertyChanged("CurrentPercent");
+            }
+        }
+
+        /// <summary>
+        /// 总进度
+        /// </summary>
+        public float TotalProgress
+        {
+            get { return model.TotalProgress; }
+            set
+            {
+                model.TotalProgress = value;
+                RaisePropertyChanged("TotalProgress");
+            }
+        }
+        /// <summary>
+        /// 总进度
+        /// </summary>
+        public float TotalMax
+        {
+            get { return model.TotalMax; }
+            set
+            {
+                model.TotalMax = value;
+                RaisePropertyChanged("TotalMax");
+            }
+        }
+        /// <summary>
+        /// 当前进度百分比
+        /// </summary>
+        public string TotalPercent
+        {
+            get { return model.TotalPercent; }
+            set
+            {
+                model.TotalPercent = value;
+                RaisePropertyChanged("TotalPercent");
+            }
+        }
+
+        /// <summary>
+        /// 工作状态
+        /// </summary>
+        public string WorkStatus {
+            get { return model.WorkStatus; }
+            set
+            {
+                model.WorkStatus = value;
+                RaisePropertyChanged("WorkStatus");
+            }
+        }
+    }
+}
diff --git a/txkt_m3u8.sqlite_ts/ViewModel/NotificationObject.cs b/txkt_m3u8.sqlite_ts/ViewModel/NotificationObject.cs
new file mode 100644
index 0000000000000000000000000000000000000000..39166ed8d324375d203aa0fbf306635c5da7669a
--- /dev/null
+++ b/txkt_m3u8.sqlite_ts/ViewModel/NotificationObject.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel;
+
+namespace txkt_m3u8.sqlite_ts.ViewModel
+{
+    public abstract class NotificationObject : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// 发起通知
+        /// </summary>
+        /// <param name="propertyName">属性名</param>
+        public void RaisePropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/txkt_m3u8.sqlite_ts/txkt_m3u8.sqlite_ts.csproj b/txkt_m3u8.sqlite_ts/txkt_m3u8.sqlite_ts.csproj
index 642f9feeaab5e078e16ef5039b1631c5f8e0e958..849f014dfa5cb39497f4846d2b876c662ebbdae7 100644
--- a/txkt_m3u8.sqlite_ts/txkt_m3u8.sqlite_ts.csproj
+++ b/txkt_m3u8.sqlite_ts/txkt_m3u8.sqlite_ts.csproj
@@ -37,6 +37,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
@@ -86,6 +89,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ViewModel\MainModel.cs" />
+    <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\NotificationObject.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -126,6 +132,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="App.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>