MeiRuiAn/HuaiAn.git

hutongqing

2025-01-04 e4be26c0c229a941cfa5182f0daf785a59067288

PDA自动更新

已删除5个文件

已修改2个文件

已添加2个文件

	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/543d3d70-8433-4b19-aabd-dfd52610493b.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b28e2128-7595-489a-b656-9987625a9f04.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b45813db-207a-41f6-8e14-ddcbb57bee26.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f4112718-bcb9-48e2-a673-ba30ecbb98de.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d4c63503-44a3-443c-a699-9cde9edbeae2.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e529db47-ecd0-417a-8581-4e85c8667e4e.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f68413a2-ad64-418c-b6b3-1cbbe0a09b03.vsidx	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	代码管理/淮安PDA/pages/index/index.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/543d3d70-8433-4b19-aabd-dfd52610493b.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b28e2128-7595-489a-b656-9987625a9f04.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b45813db-207a-41f6-8e14-ddcbb57bee26.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f4112718-bcb9-48e2-a673-ba30ecbb98de.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d4c63503-44a3-443c-a699-9cde9edbeae2.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e529db47-ecd0-417a-8581-4e85c8667e4e.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f68413a2-ad64-418c-b6b3-1cbbe0a09b03.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs

@@ -93,21 +93,21 @@
            }
        }

        //[HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
        //public WebResponseContent GetPDAVersion(string version)
        //{
        //    try
        //    {
        //        string versionP = ConfigUtil.GetConfiguration["PDAVersion"];
        //        if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
        //            return WebResponseContent.Instance.OK(data: true);
        //        else return WebResponseContent.Instance.OK(data: false);
        //    }
        //    catch (Exception ex)
        //    {
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
        public WebResponseContent GetPDAVersion(string version)
        {
            try
            {
                string versionP = AppSettings.Get("PDAVersion");
                if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
                    return WebResponseContent.Instance.OK(data: true);
                else return WebResponseContent.Instance.OK(data: false);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }

        //}
        }
    }
}

 ´úÂë¹ÜÀí/»´°²PDA/pages/index/index.vue

@@ -31,16 +31,18 @@
            }
        },
        onShow() {
            // uni.getSystemInfo({
            //     success: (res) => {
            //         this.version = res.appWgtVersion;
            //         // console.log(res);
            //         //æ£æµå½åå¹³å°ï¼å¦ææ¯å®ååå¯å¨å®åæ´æ° 
            //         if (res.platform == "android") {
            //             this.AndroidCheckUpdate();
            //         }
            //     }
            // });
            console.log();
			
            uni.getSystemInfo({
                success: (res) => {
                    this.version = res.appWgtVersion;
                    // console.log(res);
                    //æ£æµå½åå¹³å°ï¼å¦ææ¯å®ååå¯å¨å®åæ´æ° 
                    if (res.platform == "android") {
                        this.AndroidCheckUpdate();
                    }
                }
            });
        },
        onLoad() {
            this.getCurrentTree();
@@ -52,7 +54,7 @@
            AndroidCheckUpdate: function() {
                var _this = this;
                uni.request({
                    url: 'http://10.1.211.101:9004/api/PDA/GetPDAVersion?version=' + this.version,
                    url: this.$u.http.config.baseUrl+'/api/PDA/GetPDAVersion?version=' + this.version,
                    method: 'GET',
                    data: {},
                    success: res => {
@@ -65,7 +67,7 @@
                                icon: "none"
                            });
                            var dtask = plus.downloader.createDownload(
                                "http://10.1.211.101:9004/api/PDA/DownLoadApp", {},
                                this.$u.http.config.baseUrl+"/api/PDA/DownLoadApp", {},
                                function(d, status) {
                                    // ä¸è½½å®æ 
                                    if (status == 200) {

			@@ -93,21 +93,21 @@
			}
			}

			//[HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
			//public WebResponseContent GetPDAVersion(string version)
			//{
			// try
			// {
			// string versionP = ConfigUtil.GetConfiguration["PDAVersion"];
			// if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
			// return WebResponseContent.Instance.OK(data: true);
			// else return WebResponseContent.Instance.OK(data: false);
			// }
			// catch (Exception ex)
			// {
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			[HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
			public WebResponseContent GetPDAVersion(string version)
			{
			try
			{
			string versionP = AppSettings.Get("PDAVersion");
			if (Convert.ToInt32(versionP) > Convert.ToInt32(version))
			return WebResponseContent.Instance.OK(data: true);
			else return WebResponseContent.Instance.OK(data: false);
			}
			catch (Exception ex)
			{
			return WebResponseContent.Instance.Error(ex.Message);
			}

			//}
			}
			}
			}

			@@ -31,16 +31,18 @@
			}
			},
			onShow() {
			// uni.getSystemInfo({
			// success: (res) => {
			// this.version = res.appWgtVersion;
			// // console.log(res);
			// //æ£æµå½åå¹³å°ï¼å¦ææ¯å®ååå¯å¨å®åæ´æ°
			// if (res.platform == "android") {
			// this.AndroidCheckUpdate();
			// }
			// }
			// });
			console.log();

			uni.getSystemInfo({
			success: (res) => {
			this.version = res.appWgtVersion;
			// console.log(res);
			//æ£æµå½åå¹³å°ï¼å¦ææ¯å®ååå¯å¨å®åæ´æ°
			if (res.platform == "android") {
			this.AndroidCheckUpdate();
			}
			}
			});
			},
			onLoad() {
			this.getCurrentTree();
			@@ -52,7 +54,7 @@
			AndroidCheckUpdate: function() {
			var _this = this;
			uni.request({
			url: 'http://10.1.211.101:9004/api/PDA/GetPDAVersion?version=' + this.version,
			url: this.$u.http.config.baseUrl+'/api/PDA/GetPDAVersion?version=' + this.version,
			method: 'GET',
			data: {},
			success: res => {
			@@ -65,7 +67,7 @@
			icon: "none"
			});
			var dtask = plus.downloader.createDownload(
			"http://10.1.211.101:9004/api/PDA/DownLoadApp", {},
			this.$u.http.config.baseUrl+"/api/PDA/DownLoadApp", {},
			function(d, status) {
			// ä¸è½½å®æ
			if (status == 200) {