From 5f2abf9bdd8c0eb9b584c78b87b89be66a1b177e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 27 七月 2020 14:39:42 +0800
Subject: [PATCH] use libcffmpeg-capture.so,stable version

---
 service/SdkDownLoad.go |   76 +++++++++++++++++++++++---------------
 1 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index acff4db..1363024 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -135,43 +135,66 @@
 
 func GetSdkList(sdkName string) []SdkInsOrUpgrade {
 	var api dbapi.SdkApi
-	localSdks := api.FindAll(sdkName) //鏈湴宸插畨瑁呮墍鏈夌畻娉�
+	localSdks := api.FindAll(sdkName) //鏈湴宸插畨瑁呮墍鏈夌畻娉�,甯﹂『搴�
+	if localSdks == nil {
+		return []SdkInsOrUpgrade{}
+	}
+	installedSdks := make([]SdkInsOrUpgrade, len(localSdks))
+
 	localSdkM := make(map[string]SdkInsOrUpgrade)
-	for _,ls :=range localSdks {
+	for idx,ls :=range localSdks {
 		siou := SdkInsOrUpgrade{
 			Installed: true,
 		}
-		siou.Sdk = Sdk{
-			Id: ls.Id,
-			IpcId: ls.IpcId,
-			SdkType: ls.SdkType,
-			SdkName: ls.SdkName,
-			Icon: ls.Icon,
-			Url: ls.Url,
+		sdk := Sdk{
 			CreateTime: ls.CreateTime,
 			CreateBy: ls.CreateBy,
 			UpdateTime: ls.UpdateTime,
 			Enable: ls.Enable,
 			DelFlag: int(ls.DelFlag),
-			IconBlob: ls.IconBlob,
-			Version: ls.Version,
 		}
+		var sc SdkCommon
+		sc.copyFromProto(ls)
+		sdk.SdkCommon = sc
+
+		for _,arg := range ls.Args {
+			sdk.Args = append(sdk.Args, SdkArg{
+				Alias: arg.Alias,
+				Name: arg.Name,
+				Type: arg.Type,
+				Must: arg.Must,
+				Unit: arg.Unit,
+				Range: arg.Range,
+				DefaultValue: arg.DefaultValue,
+				DefaultOperator: arg.DefaultOperator,
+				Sort: int(arg.Sort),
+			})
+		}
+		siou.Sdk = sdk
 		localSdkM[siou.Id] = siou
+		installedSdks[idx] = siou
 	}
 
 	//杩滅鍙敤鐨勭畻娉�
 	remoteSdks := findAllMySdk()
 	logger.Debug("remoteSdks:", remoteSdks)
 
-	for sdkId,sdk := range remoteSdks {
-		if v,ok := localSdkM[sdkId];ok { //鏈湴宸插畨瑁�
+	nInsSdks := make([]SdkInsOrUpgrade,0)
+	for _,sdk := range remoteSdks {
+		if v,ok := localSdkM[sdk.Id];ok { //鏈湴宸插畨瑁�
 			ls := v
 			if shouldVersionBeUpgrade(ls.Version, sdk.Version) { //鍒ゆ柇鐗堟湰鍙锋槸鍚﹂渶瑕佸崌绾�
 				ls.Installed = true
 				ls.IsUpgrade = true //闇�瑕佸崌绾�
 				ls.RemoteVersion = sdk.Version //杩滅鐨勭増鏈彿
 			}
-			localSdkM[sdkId] = ls
+			localSdkM[sdk.Id] = ls
+			for index,es := range installedSdks {
+				if es.Id == sdk.Id {
+					installedSdks[index] = ls
+					break
+				}
+			}
 		} else { //鏈湴鏈畨瑁咃紝闇�瑕佸畨瑁�
 			bIns := SdkInsOrUpgrade{
 				RemoteVersion: sdk.Version,
@@ -179,15 +202,11 @@
 				Installed: false,
 			}
 			bIns.Sdk = sdk
-			localSdkM[sdkId] = bIns
+			nInsSdks = append(nInsSdks, bIns)
 		}
 	}
 
-	sdks := make([]SdkInsOrUpgrade, 0)
-	for _,v := range localSdkM {
-		sdks = append(sdks, v)
-	}
-	return sdks
+	return append(installedSdks, nInsSdks...)
 }
 
 func queryDatabase(sdkName string) ([]map[string]interface{}, map[string]bool) {
@@ -222,7 +241,7 @@
 	token = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ3NDUwMjU5MjMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJjb2RlTWFuZ2U6dmlld1wiLFwiZGV2aWNlTWFuYWdlOmFkZFwiLFwiYWRtaW5NYW5hZ2VcIixcIm9yZGVyTWFuZ2VcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcInByb2R1Y3RDZW50ZXI6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwiYXBpXCIsXCJob21lXCIsXCJvcmRlck1hbmdlOnBheVwiLFwiYWRtaW5NYW5hZ2U6YWRkXCIsXCJvcmRlck1hbmdlOmRvd25sb2FkXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlOnZpZXdcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImRldmljZU1hbmFnZVwiLFwidmlwTWFuYWdlOmFkZFwiLFwidmlwTWFuYWdlOnZpZXdcIixcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcInZpcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImNvZGVNYW5nZVwiLFwicHJvZHVjdE1hbmdlXCJdLFwidXNlcm5hbWVcIjpcImJhc2ljXCJ9In0.vwjAFkWuEyadRLvIOGK8LFE3MjpY3SQ7j6AlTXnQDG8"
 )
 
-func findAllMySdk() map[string]Sdk {
+func findAllMySdk() []Sdk {
 	url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/findAllMySdk"
 	machineCode := licence.GetMachineCode()
 	fmt.Println("url:", url, "machineCode:", machineCode)
@@ -249,11 +268,8 @@
 		logger.Debug("unmarshal err:", err)
 		return nil
 	}
-	m := make(map[string]Sdk)
-	for _,s := range ss.Sdks {
-		m[s.Id] = s
-	}
-	return m
+
+	return ss.Sdks
 }
 
 func GetLocalSdks() []map[string]interface{} {
@@ -304,7 +320,7 @@
 
 type downOrUpResp struct {
 	Url string `json:"url"`
-	md5 string `json:"md5"`
+	Md5 string `json:"md5"`
 }
 
 //涓嬭浇鎴栬�呭崌绾х畻娉�
@@ -343,7 +359,7 @@
 		return false, err
 	}
 	logger.Debug("res.Data:", res.Data, "resp:", resp)
-	if resp.Url == "" || resp.md5 == "" {
+	if resp.Url == "" || resp.Md5 == "" {
 		return false, errors.New("鑾峰彇涓嬭浇瀹夎鍖呭け璐�")
 	}
 
@@ -361,13 +377,13 @@
 	ext := path.Ext(filenameWithSuffix)
 	downUrl := "http://"+config.ShopConf.Url+"/files/"+resp.Url
 
-	gzFilePath := configPatchPath + "/" + resp.md5+ext
+	gzFilePath := configPatchPath + "/" + resp.Md5+ext
 	err = reqUtil.DownloadFile(gzFilePath, downUrl)
 	if err != nil {
 		logger.Debug("DownloadFile err:", err)
 		return false, err
 	}
-	b, err := installSdk(resp.md5, ext)
+	b, err := installSdk(resp.Md5, ext)
 	if b {
 		return true, nil
 	}

--
Gitblit v1.8.0