v1.0.0 alpha

Author: Purple-CSGO

backend/app.go

@@ -54,6 +54,11 @@ func (a *App) WailsShutdown() {
 //检查更新
 func (a *App) CheckUpdate() {
 	var err error
+	//我更新我自己
+	if err = a.updateApp(); err != nil {
+		a.noticeError(err.Error())
+	}
+
 	//检查是否初始化，否则通知前端选择安装方式和位置
 	if a.cfg.Init == false {
 		a.doSelectOption()
@@ -110,7 +115,13 @@ func (a *App) checkState() error {
 		} else if ok == true {
 			a.cfg.HlaeState = true
 			//解析修正本地hlae版本号
-			if tVersion, err := api.ParseChangelog(a.cfg.HlaePath + "/changelog.xml"); err != nil {
+			changelog, err := tool.ReadAll(a.cfg.HlaePath + "/changelog.xml")
+			if err != nil {
+				a.noticeError("读取本地版本号失败: " + err.Error())
+				return err
+			}
+			if tVersion, err := api.ParseChangelog(changelog); err != nil {
+				a.noticeError("解析本地版本号失败: " + err.Error())
 				return err
 			} else {
 				a.cfg.HlaeVersion = tVersion
@@ -141,6 +152,12 @@ func (a *App) checkState() error {
 	return nil
 }
 
+//TODO 我更新我自己
+func (a *App) updateApp() error {
+
+	return nil
+}
+
 //设定安装hlae的方式
 func (a *App) SetOption(ok bool) {
 	a.cfg.Standalone = ok
@@ -580,10 +597,6 @@ func (a *App) updateFFmpeg() error {
 		_, cdnFilename = filepath.Split(cdnURL)
 	}
 
-	//对比版本号，决定是否更新
-	if version == a.cfg.FFmpegVersion {
-		return nil
-	}
 	//决定下载的文件
 	if srcVersion == "" && cdnVersion == "" {
 		return errors.New("FFmpeg官方和CDN的API均获取或解析失败")
@@ -604,6 +617,12 @@ func (a *App) updateFFmpeg() error {
 		filename = srcFilename
 	}
 
+	//对比版本号，决定是否更新
+	//a.noticeWarning(version + " ? " + a.cfg.FFmpegVersion)
+	if version == a.cfg.FFmpegVersion {
+		return nil
+	}
+
 	i += 100
 	a.setProgress(i / count)
 	a.setLog("正在下载FFmpeg安装包...")
@@ -651,14 +670,10 @@ func (a *App) updateFFmpeg() error {
 //启动HLAE
 func (a *App) LaunchHLAE() bool {
 	if a.cfg.HlaeState == true {
-		out, err := tool.Cmd("start " + a.cfg.HlaePath + "/hlae.exe")
-		if err != nil {
-			a.setLog(out)
-			log.Println(out, err)
-			return false
-		}
+		_ = a.runtime.Browser.OpenFile(a.cfg.HlaePath + "/hlae.exe")
 	}
-	return false
+
+	return true
 }
 
 //打开HLAE文件夹

backend/config/default.go

@@ -2,7 +2,7 @@ package config
 
 var defaultCFG = CFG{
 	VersionCode:   "Testify",
-	AppVersion:    "v0.0.2",
+	AppVersion:    "v0.0.4",
 	HlaeVersion:   "",
 	FFmpegVersion: "",
 	HlaeAPI:       "https://api.github.com/repos/advancedfx/advancedfx/releases/latest",

backend/wails.go

@@ -43,14 +43,15 @@ func (a *App) doSelectOption() {
 func (a *App) noticeSuccess(msg string) {
 	a.runtime.Events.Emit("NoticeSuccess", msg)
 }
+
 func (a *App) noticeError(msg string) {
 	a.runtime.Events.Emit("NoticeError", msg)
 }
+
 func (a *App) noticeWarning(msg string) {
 	a.runtime.Events.Emit("NoticeWarning", msg)
 }
 
-//
 func (a *App) SelectDirectory() string {
 	directory := a.runtime.Dialog.SelectDirectory()
 	if ok, err := tool.IsFileExisted(directory); err != nil || !ok {

frontend/src/components/Main.vue

@@ -25,12 +25,12 @@
       {{ log }}
     </div>
     <div class="btn-control">
-      <a-button class="btn" size="large" @click="tabSetting">
+      <a-button class="btn" size="large" @click="tabSetting" :loading="btnSetting">
 <!--        <a-icon type="setting" />-->
         <a-icon type="reload" />
       </a-button>
-      <a-button class="btn" size="large" @click="openDirHLAE"><a-icon type="folder-open" /></a-button>
-      <a-button class="btn" @click="launchHLAE" style="margin-right: 0;width: 36vw;font-size: 4.5vw;" size="large">打开HLAE</a-button>
+      <a-button class="btn" size="large" @click="openDirHLAE"><a-icon type="folder-open" :loading="btnOpenDir" /></a-button>
+      <a-button class="btn" @click="launchHLAE" style="margin-right: 0;width: 36vw;font-size: 4.5vw;" size="large" :loading="btnLaunchHLAE" >打开HLAE</a-button>
     </div>
   </div>
 </template>
@@ -43,10 +43,13 @@ export default {
   data() {
     return {
       versionCode: "Testify",
-      appVersion: "v0.0.1",
+      appVersion: "v1.0.0",
       progress: 0,
-      log: " ",
+      log: "",
       standalone: true,
+      btnSetting: false,
+      btnOpenDir: false,
+      btnLaunchHLAE: false,
     };
   },
   mounted() {
@@ -83,11 +86,13 @@ export default {
   methods: {
     launchHLAE () {
       // console.log("启动HLAE");
+      this.btnLaunchHLAE = true;
       window.backend.App.LaunchHLAE().then(ok => {
         if (ok === false) {
           this.$message.warning('HLAE启动失败', 5);
         }
       });
+      this.btnLaunchHLAE = false;
     },
     tabSetting () {
       console.log("切换到设置Tab页"); //TODO
@@ -96,7 +101,9 @@ export default {
     },
     openDirHLAE () {
       // console.log("打开HLAE安装位置");
+      this.btnOpenDir = true;
       window.backend.App.OpenHlaeDirectory();
+      this.btnOpenDir = false;
       //发送wails信息->Go?
       // window.wails.Events.Emit("error", "这是一条错误信息！");
     },
@@ -105,25 +112,22 @@ export default {
       window.backend.App.CheckState();
     },
     selectOption() {
-      //选择HLAE安装方法和安装位置 TODO: debug 默认选择是ok
-      let standalone = false;
+      //选择HLAE安装方法和安装位置
       this.$confirm({
         title: '选择HLAE和FFmpeg的安装方式',
         content: '附属安装：关联CSGO Demos Manager\n单独安装：单独选择位置安装',
         okText: '附属安装',
         cancelText: '单独安装',
         // bodyStyle: 'font-size: 20vw',
         onOk() {
-          standalone = false;
           //选择完成，传给后端
-          window.backend.App.SetOption(standalone);
+          window.backend.App.SetOption(false);
           //安装/检查更新
           window.backend.App.CheckUpdate();
         },
         onCancel() {
-          standalone = true;
           //选择完成，传给后端
-          window.backend.App.SetOption(standalone);
+          window.backend.App.SetOption(true);
           //安装/检查更新
           window.backend.App.CheckUpdate();
         },
@@ -132,7 +136,9 @@ export default {
     },
     checkUpdate () {
       // console.log("检查HLAE更新");
+      this.btnOpenDir = true; //TODO 修改成update相关名称
       window.backend.App.CheckUpdate();
+      this.btnOpenDir = false;
     }
   }
 }