4.0.0-bate.1

hbl917070 · Nov 17, 2021 · 502f8d2 · 502f8d2
1 parent 48786b7
commit 502f8d2
Show file tree

Hide file tree

Showing 68 changed files with 1,632 additions and 6,577 deletions.
diff --git a/other/logo.ai b/other/logo.ai
diff --git a/tiefsee/tiefsee/Properties/AssemblyInfo.cs b/tiefsee/tiefsee/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("tiefsee")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2021 hbl917070")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/tiefsee/tiefsee/VW/WV_File.cs b/tiefsee/tiefsee/VW/WV_File.cs
@@ -94,18 +94,33 @@ public String GetFIleType(string fileName) {
             if (Directory.Exists(fileName)) { return ""; }
             if (File.Exists(fileName) == false) { return ""; }
 
+            string fileType = string.Empty;
+
             try {
 
                 using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read)) {
                     using (System.IO.BinaryReader br = new System.IO.BinaryReader(fs)) {
 
-                        string fileType = string.Empty;
+                        /*var ar = br.ReadSingle(300);
+                        for (int i = 0; i < ar.Length; i++) {
+                            fileType += ar[i];
+                        }*/
+
+
+                        for (int i = 0; i < 2; i++) {
+                            fileType += br.ReadByte();
+                        }
 
-                        byte data = br.ReadByte();
+                        /*byte data = br.ReadByte();
                         fileType += data.ToString();
                         data = br.ReadByte();
                         fileType += data.ToString();
 
+                        for (int i = 0; i < 30; i++) {
+                            data = br.ReadByte();
+                            fileType += data.ToString();
+                        }*/
+
                         if (fs != null) {
                             fs.Close();
                             br.Close();

diff --git a/tiefsee/tiefsee/VW/WV_Image.cs b/tiefsee/tiefsee/VW/WV_Image.cs
@@ -86,5 +86,23 @@ public string BitmapToBase64(Bitmap bmp) {
             return base64String;
         }
 
+
+
+        public bool IsAn(string path) {
+            /*
+82737070 19016340087696680868056881000020
+82737070 96112120876966808680568810000180
+82737070 601811030876966808680568810000180
+82737070 64531087696680868056325253101612
+
+
+0 8769668086805688 10 = WEBPVP8X
+WEBPVP8
+
+            apng acTL 97998476
+        */
+            return true;
+
+        }
     }
 }
diff --git a/tiefsee/tiefsee/VW/WV_Window.cs b/tiefsee/tiefsee/VW/WV_Window.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -25,7 +26,6 @@ public class WV_Window {
 
         public WV_Window(WebWindow m) {
             this.M = m;
-
         }
 
 
@@ -39,6 +39,16 @@ public WV_Window(WebWindow m) {
             return w;
         }*/
 
+        /// <summary>
+        /// 設定視窗的 icon
+        /// </summary>
+        /// <param name="path"></param>
+        public void SetIcon(string path) {
+            if (File.Exists(path)) {
+                M.Icon = new System.Drawing.Icon(path);
+            }
+        }
+
         /// <summary>
         /// 取得執行檔目錄
         /// </summary>

diff --git a/tiefsee/tiefsee/WebWindow.cs b/tiefsee/tiefsee/WebWindow.cs
@@ -92,7 +92,6 @@ public WebWindow(String _url,string[] _args) {
                 wv2.CoreWebView2.AddHostObjectToScript("WV_System", new WV_System(this));
                 wv2.CoreWebView2.AddHostObjectToScript("WV_RunApp", new WV_RunApp(this));
                 wv2.CoreWebView2.AddHostObjectToScript("WV_Image", new WV_Image(this));
-
 
                 // webView21.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync("var webBrowserObj= window.chrome.webview.hostObjects.webBrowserObj;");
 
@@ -110,7 +109,9 @@ public WebWindow(String _url,string[] _args) {
 
             this.Opacity = 0;
             this.Show();
-
+            this.Width = 550;
+            this.Height = 400;
+
             //
 
             parentForm = new FormNone();

diff --git a/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.Core.xml b/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.Core.xml
diff --git a/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.WinForms.xml b/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.WinForms.xml
diff --git a/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.Wpf.xml b/tiefsee/tiefsee/bin/output/Microsoft.Web.WebView2.Wpf.xml
diff --git a/tiefsee/tiefsee/bin/output/tiefsee.exe b/tiefsee/tiefsee/bin/output/tiefsee.exe
diff --git a/tiefsee/tiefsee/bin/output/tiefsee.exe.config b/tiefsee/tiefsee/bin/output/tiefsee.exe.config
diff --git a/tiefsee/tiefsee/bin/output/www/MainWindow.html b/tiefsee/tiefsee/bin/output/www/MainWindow.html
@@ -9,10 +9,10 @@
     <title>Tiefsee 4</title>
 
     <!--google字體-->
-    <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@400;700&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+TC" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC" rel="stylesheet">
 
-    <link rel="stylesheet" href="css/BaseWindow.css">
+    <link rel="stylesheet" href="/css/BaseWindow.css">
     <script src="/js/BaseWindow.js"></script>
     <script src="/js/Lib.js"></script>
 
@@ -21,17 +21,18 @@
     <script src="/js/library/jquery-3.6.0.min.js"></script>
     <script src="/js/library/jquery.easing.js"></script>
 
-    <script src="/js/tiefseeview.js"></script>
-    <link rel="stylesheet" href="css/tiefseeview.css">
-    <link rel="stylesheet" href="css/MainWindow.css">
-    <link rel="stylesheet" href="css/menu.css">
+    <script src="/js/Tiefseeview.js"></script>
+    <link rel="stylesheet" href="/css/tiefseeview.css">
+    <link rel="stylesheet" href="/css/MainWindow.css">
+    <link rel="stylesheet" href="/css/menu.css">
 
     <script src="/js/MainWindow/Config.js"></script>
     <script src="/js/MainWindow/MainTools.js"></script>
     <script src="/js/MainWindow/FileLoad.js"></script>
     <script src="/js/MainWindow/FileShow.js"></script>
     <script src="/js/MainWindow/Menu.js"></script>
     <script src="/js/MainWindow/InitMenu.js"></script>
+    <script src="/js/MainWindow/Script.js"></script>
     <script src="/js/MainWindow/MainWindow.js"></script>
 
     <script>
@@ -201,11 +202,13 @@
         <!-- 標題列 -->
         <div class="window-titlebar">
 
-            <div class="titlebar-txt"> <span>tiefsee 4</span></div>
+            <div class="titlebar-txt">
+                <span>tiefsee 4</span>
+            </div>
 
             <div class="titlebar-tools">
 
-                <div class="titlebar-tools-btn titlebar-tools-menu">
+                <div class="titlebar-tools-btn titlebar-tools-menu" style="display:none;">
                     <import type="svg" src="/img/default/window-menu.svg"> </import>
                 </div>
                 <div class="titlebar-tools-btn titlebar-tools-topmost">
@@ -251,9 +254,7 @@
                             <div>
                                 <img class="welcomeview-logo" src="/img/logo.svg">
                                 <div class="welcomeview-txt">Tiefsee beta 001</div>
-
                             </div>
-
                         </div>
                         <textarea id="main-txtview" class="main-txtview"></textarea>
                         <div id="main-tiefseeview" class="main-tiefseeview"></div>

diff --git a/tiefsee/tiefsee/bin/output/www/css/MainWindow.css b/tiefsee/tiefsee/bin/output/www/css/MainWindow.css
@@ -113,11 +113,13 @@
 }
 
 .main-tools-group {
-  display: flex;
+  display: none;
   margin-left: 3px;
   margin-bottom: 3px;
 }
-
+.main-tools-group[active="true"] {
+  display: flex ;
+}
 /*垂直線*/
 .main-tools-hr {
   width: 1px;

diff --git a/tiefsee/tiefsee/bin/output/www/demo.html b/tiefsee/tiefsee/bin/output/www/demo.html
@@ -11,7 +11,7 @@
     <script src="js/library/jquery-3.6.0.min.js"></script>
     <script src="js/library/jquery.easing.js"></script>
 
-    <script src="js/tiefseeview.js"></script>
+    <script src="js/Tiefseeview.js"></script>
     <link rel="stylesheet" href="css/tiefseeview.css">
 
 </head>

diff --git a/tiefsee/tiefsee/bin/output/www/demo2.html b/tiefsee/tiefsee/bin/output/www/demo2.html
@@ -11,7 +11,7 @@
     <script src="js/library/jquery-3.6.0.min.js"></script>
     <script src="js/library/jquery.easing.js"></script>
 
-    <script src="js/tiefseeview.js"></script>
+    <script src="js/Tiefseeview.js"></script>
     <link rel="stylesheet" href="css/tiefseeview.css">
 
 </head>

diff --git a/tiefsee/tiefsee/bin/output/www/demoWindow.html b/tiefsee/tiefsee/bin/output/www/demoWindow.html
@@ -20,7 +20,7 @@
     <script src="js/library/jquery-3.6.0.min.js"></script>
     <script src="js/library/jquery.easing.js"></script>
 
-    <script src="js/tiefseeview.js"></script>
+    <script src="js/Tiefseeview.js"></script>
     <link rel="stylesheet" href="css/tiefseeview.css">
     <link rel="stylesheet" href="css/MainWindow.css">
     <link rel="stylesheet" href="css/menu.css">

diff --git a/tiefsee/tiefsee/bin/output/www/img/++loading.svg b/tiefsee/tiefsee/bin/output/www/img/++loading.svg
diff --git a/tiefsee/tiefsee/bin/output/www/img/+loading.svg b/tiefsee/tiefsee/bin/output/www/img/+loading.svg
diff --git a/tiefsee/tiefsee/bin/output/www/img/logo.ico b/tiefsee/tiefsee/bin/output/www/img/logo.ico
diff --git a/tiefsee/tiefsee/bin/output/www/img/logo.svg b/tiefsee/tiefsee/bin/output/www/img/logo.svg
diff --git a/tiefsee/tiefsee/bin/output/www/js/BaseWindow.js b/tiefsee/tiefsee/bin/output/www/js/BaseWindow.js
@@ -89,7 +89,6 @@ class BaseWindow {
         }
     }
     SizeChanged(left, top, width, height, windowState) {
-        console.log("SizeChanged  " + windowState);
         this.left = left;
         this.top = top;
         this.width = width;
@@ -98,13 +97,12 @@ class BaseWindow {
         this.initWindowState();
     }
     Move(left, top, width, height, windowState) {
-        console.log("move  " + windowState);
         this.left = left;
         this.top = top;
         this.width = width;
         this.height = height;
         this.windowState = windowState;
-        this.initWindowState();
+        //this.initWindowState();
     }
     VisibleChanged() {
         console.log("VisibleChanged");

diff --git a/tiefsee/tiefsee/bin/output/www/js/BaseWindow.ts b/tiefsee/tiefsee/bin/output/www/js/BaseWindow.ts
@@ -35,7 +35,6 @@ class BaseWindow {
 
 
     SizeChanged(left: number, top: number, width: number, height: number, windowState: ("Maximized" | "Minimized" | "Normal")) {
-        console.log("SizeChanged  " + windowState)
         this.left = left;
         this.top = top;
         this.width = width;
@@ -46,14 +45,13 @@ class BaseWindow {
     }
 
     public Move(left: number, top: number, width: number, height: number, windowState: ("Maximized" | "Minimized" | "Normal")) {
-console.log("move  " + windowState)
         this.left = left;
         this.top = top;
         this.width = width;
         this.height = height;
         this.windowState = windowState;
 
-        this.initWindowState();
+        //this.initWindowState();
     }
 
     public VisibleChanged() {

diff --git a/tiefsee/tiefsee/bin/output/www/js/MainWindow/Config.js b/tiefsee/tiefsee/bin/output/www/js/MainWindow/Config.js
@@ -102,11 +102,12 @@ class Config {
     /**
      * 取得檔案類型
      * @param path
-     * @returns
+     * @returns 小寫附檔名，例如「jpg」
      */
     getFileType(path) {
         return __awaiter(this, void 0, void 0, function* () {
             let fileType = yield WV_File.GetFIleType(path); //取得檔案類型
+            //console.log("fileType  " + fileType)
             let fileExt = Lib.GetExtension(path); //取得附檔名
             fileExt = fileExt.replace(".", "").toLocaleLowerCase();
             if (fileType == "255216") {
@@ -152,6 +153,12 @@ class Config {
                 if (fileExt == "pptx") {
                     return "pptx";
                 }
+                if (fileExt == "xlsx") {
+                    return "xlsx";
+                }
+                if (fileExt == "xlsm") {
+                    return "xlsm";
+                }
                 if (fileExt == "apk") {
                     return "apk";
                 }

diff --git a/tiefsee/tiefsee/bin/output/www/js/MainWindow/Config.ts b/tiefsee/tiefsee/bin/output/www/js/MainWindow/Config.ts
@@ -106,12 +106,12 @@ class Config {
     /**
      * 取得檔案類型
      * @param path 
-     * @returns 
+     * @returns 小寫附檔名，例如「jpg」
      */
     public async getFileType(path: string) {
 
         let fileType = await WV_File.GetFIleType(path);//取得檔案類型
-
+//console.log("fileType  " + fileType)
         let fileExt = Lib.GetExtension(path);//取得附檔名
         fileExt = fileExt.replace(".", "").toLocaleLowerCase();
 
@@ -130,6 +130,8 @@ class Config {
         if (fileType == "8075") {
             if (fileExt == "docx") { return "docx"; }
             if (fileExt == "pptx") { return "pptx"; }
+            if (fileExt == "xlsx") { return "xlsx"; }
+            if (fileExt == "xlsm") { return "xlsm"; }
             if (fileExt == "apk") { return "apk"; }
             if (fileExt == "xd") { return "xd"; }
             return "zip";