修改登录界面

duheng

2025-03-05 0f831db8df9c2e4adc7feca636967a0fb1cd5e29

 HStation.RevitDev/RevitDataExport/Utility/CacheUtil.cs

@@ -11,6 +11,7 @@
using Autodesk.Revit.UI;

using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;

using System.Net.Http;

using System.Net.Http.Headers;



namespace HStation.RevitDev.RevitDataExport.Utility

{

@@ -36,21 +37,6 @@
        {

            GlobalResource.LastFilePath = doc.PathName;



            ExportModelHelper exportModelHelper = new ExportModelHelper(doc);

            var revitJson = exportModelHelper.Export();



            var dir = Path.GetDirectoryName(GlobalResource.ExportFilePath);

            if (!Directory.Exists(dir))

            {

                Directory.CreateDirectory(dir);

            }



            if (File.Exists(GlobalResource.ExportFilePath))

            {

                File.Delete(GlobalResource.ExportFilePath);

            }



            File.WriteAllText(GlobalResource.ExportFilePath, revitJson);

            var record = new ConfigRecord

            {

                FilePath = GlobalResource.LastFilePath,

@@ -79,9 +65,25 @@


            var config = Newtonsoft.Json.JsonConvert.SerializeObject(records);

            File.WriteAllText(GlobalResource.RecordFilePath, config);



            ExportModelHelper exportModelHelper = new ExportModelHelper(doc);

            var revitJson = exportModelHelper.Export();



            var dir = Path.GetDirectoryName(GlobalResource.ExportFilePath);

            if (!Directory.Exists(dir))

            {

                Directory.CreateDirectory(dir);

            }



            if (File.Exists(GlobalResource.ExportFilePath))

            {

                File.Delete(GlobalResource.ExportFilePath);

            }



            File.WriteAllText(GlobalResource.ExportFilePath, revitJson);

        }



        public static bool UploadFile(Document _doc, out string err)

        public static bool UploadFile(Document _doc, string desc, out string err)

        {

            err = "";

            var tempDir = Path.Combine(Path.GetDirectoryName(GlobalResource.BinDirectory), "temp"); //"d:\\temp";

@@ -91,18 +93,20 @@
            var modelFile = tempDir + "\\model.rvt";

            var settingFile = tempDir + "\\setting.json";

            var otherFile = tempDir + "\\struct_others.json";



            var title = _doc.Title + "_" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + ".ywrvt";

            var zipFilePath = tempDir + "\\" + title;

            try

            {

                var title = _doc.Title + "_" + DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss") + ".ywrvt";

                var zipFilePath = tempDir + "\\" + title;

                
                if (File.Exists(structFile)) File.Delete(structFile);



                if (File.Exists(modelFile)) File.Delete(modelFile);

                if (!File.Exists(settingFile)) File.Create(settingFile).Close();

                if (!File.Exists(otherFile)) File.Create(otherFile).Close();

                File.Copy(_doc.PathName, modelFile);

                File.SetAttributes(modelFile, FileAttributes.Normal);

                File.Copy(GlobalResource.ExportFilePath, structFile);

                File.SetAttributes(structFile, FileAttributes.Normal);

                var strConfig = File.ReadAllText(GlobalResource.SettingFilePath);

                var ret = Newtonsoft.Json.JsonConvert.DeserializeObject<ConfigSettingModel>(strConfig);

                var notContains = new List<string>() { "管道附件", "管道", "管件 ", "管道附件", "管道系统" };

@@ -128,20 +132,36 @@
                using (var client = new HttpClient())

                {

                    var content = new MultipartFormDataContent();

                    //content.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");

                    content.Add(new StringContent("循环水Revit"), "UploadUserName");

                    content.Add(new StringContent(""), "FileCode");

                    content.Add(new StringContent(""), "Description");

                    content.Add(new StringContent(desc), "Description");

                    content.Add(new ByteArrayContent(File.ReadAllBytes(zipFilePath)), "File", title);

                    var res = client.PostAsync(ret.UploadUrl, content).Result.Content.ReadAsStringAsync().Result;

                    var result = JsonHelper.ToObject<HttpResultViewModel>(res);

                    File.Delete(zipFilePath);

                    if (result.Code == 0)

                        return true;

                    else

                    try

                    {

                        err = result.Message;

                        var res = client.PostAsync(ret.UploadUrl, content).Result.Content.ReadAsStringAsync().Result;

                        var result = JsonHelper.ToObject<HttpResultViewModel>(res);

                        File.Delete(zipFilePath);

                        if (result.Code == 0)

                            return true;

                        else

                        {

                            err = "上传失败，请检查网络设置";// result.Message;

                            return false;

                        }

                    }

                    catch (Exception ex)

                    {

                        err = "上传错误，请检查网络设置!";

                        File.Delete(zipFilePath);

                        File.Delete(structFile);

                        File.Delete(otherFile);

                        File.Delete(modelFile);

                        File.Delete(settingFile);

                        File.Delete(otherFile);

                        return false;

                    }



                }

            }

            catch (Exception ex)

@@ -151,7 +171,8 @@
                File.Delete(modelFile);

                File.Delete(settingFile);

                File.Delete(otherFile);

                err = JsonHelper.ToJson(ex);

                File.Delete(zipFilePath);

                err = "上传失败，请检查网络设置";// JsonHelper.ToJson(ex);

                return false;

            }

        }

@@ -169,6 +190,7 @@
                var modelFile = tempDir + "\\model.rvt";

                var settingFile = tempDir + "\\setting.json";

                var otherFile = tempDir + "\\struct_others.json";

                var userFile = GlobalResource.LoginUserFilePath;



                try

                {

@@ -179,7 +201,9 @@
                    if (!File.Exists(settingFile)) File.Create(settingFile).Close();

                    if (!File.Exists(otherFile)) File.Create(otherFile).Close();

                    File.Copy(_doc.PathName, modelFile);

                    File.SetAttributes(modelFile, FileAttributes.Normal);

                    File.Copy(GlobalResource.ExportFilePath, structFile);

                    File.SetAttributes(structFile, FileAttributes.Normal);



                    var notContains = new List<string>() { "管道附件", "管道", "管件 ", "管道附件", "管道系统" };

                    var c3 = new Autodesk.Revit.DB.FilteredElementCollector(_doc).WhereElementIsNotElementType();//.WhereElementIsElementType();

@@ -194,7 +218,7 @@
                    var setting = new SettingsViewModel() { Version = "1" };

                    File.WriteAllText(settingFile, JsonHelper.ToJson(setting));



                    var files = new string[] { structFile, modelFile, settingFile, otherFile };

                    var files = new string[] { structFile, modelFile, settingFile, otherFile, userFile };

                    ZipFiles(files, zipFilePath);



                    File.Delete(structFile);

@@ -289,13 +313,14 @@
            if (document == null) { return; }



            //var ids = GlobalResource.RevitModels.GetOtherIds()?.Select(x => new ElementId(int.Parse(x))).ToList();

            var notContains = new List<string>() { "图例构件", "楼板", "墙","栏杆扶手","楼梯" };

            var notContains = new List<string>() { "图例构件", "楼板", "墙", "栏杆扶手", "楼梯" };

            var nameContains = new List<string>() { "混凝土底座" };

            var c3 = new Autodesk.Revit.DB.FilteredElementCollector(document).WhereElementIsNotElementType();//.WhereElementIsElementType();

            var c4 = new Autodesk.Revit.DB.FilteredElementCollector(document).WhereElementIsElementType();



            c3.Concat(c4);

            //var ids = c3.Where(c => c.Category != null && !notContains.Any(c.Category.Name.Contains)).Select(c => new ElementId(int.Parse(c.Id.ToString()))).Distinct().ToList();

            var ids = c3.Where(c => c.Category != null && notContains.Any(c.Category.Name.Contains)).Select(c => new ElementId(int.Parse(c.Id.ToString()))).Distinct().ToList();

            var ids = c3.Where(c => (c.Category != null && notContains.Any(c.Category.Name.Contains)) || nameContains.Any(c.Name.Contains)).Select(c => new ElementId(int.Parse(c.Id.ToString()))).Distinct().ToList();

            if (ids.Count == 0)

            {

                return;