diff --git a/.gitignore b/.gitignore index b460439..b4a9214 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ /publish /BeWoPlanerChat/MyTestApplication /BeWoPlanerChat/bewoplaner-chat-android/app/*.apk +/PrototypChat/.vs/PrototypChat/v14 +/PrototypChat/.vs/PrototypChat/v15/sqlite3 +/PrototypChat/.vs/PrototypChat/v15 diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs index 81b738f..9ebb344 100644 --- a/ChatController/ChatMainControl.xaml.cs +++ b/ChatController/ChatMainControl.xaml.cs @@ -63,6 +63,8 @@ namespace ChatController public delegate void CloseDelegate(); public event CloseDelegate OnClose; + + private bool _isDesktopVersion = true; #endregion public ChatMainControl() @@ -133,6 +135,7 @@ namespace ChatController EmojiButton.Style = null; MediaButton.Style = null; ReloadGruppen.Visibility = Visibility.Visible; + _isDesktopVersion = false; } public void SynchronisationVeranlassen() @@ -951,10 +954,33 @@ namespace ChatController Cursor = Cursors.Wait; //StartWaiting(); + if (_isDesktopVersion) + { + var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer); - var doSync = _chat.DoSynchronisation(_chatDaten.ApiKey, _chatDaten.Kundennummer); + if (doSync) + { + var aktuelleGruppen = _chat.GruppenAktuallisieren(); - if (doSync) + var x = _chat.GroupklassenAktuallisieren(aktuelleGruppen); + + _kontaktlist = x; + + Clientlist.Items.Refresh(); + + Cursor = Cursors.Arrow; + } + else + { + Cursor = Cursors.Arrow; + // EndWaiting(); + if (OnClose != null) + { + OnClose(); + } + } + } + else { var aktuelleGruppen = _chat.GruppenAktuallisieren(); @@ -966,15 +992,6 @@ namespace ChatController Cursor = Cursors.Arrow; } - else - { - Cursor = Cursors.Arrow; - // EndWaiting(); - if (OnClose != null) - { - OnClose(); - } - } } catch (Exception e) { diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs index e1024ff..de049f4 100644 --- a/ChatController/HauptKlassen/Chat.cs +++ b/ChatController/HauptKlassen/Chat.cs @@ -1129,6 +1129,8 @@ namespace ChatController.HauptKlassen form.StartPosition = FormStartPosition.CenterScreen; form.Size = imgbit.Size; + form.MinimumSize = new Size(150,150); + form.MaximumSize = new Size(500,500); form.FormBorderStyle = FormBorderStyle.Sizable; PictureBox pb = new PictureBox(); @@ -1137,6 +1139,7 @@ namespace ChatController.HauptKlassen pb.SizeMode = PictureBoxSizeMode.StretchImage; + pb.MaximumSize = new Size(500,500); form.Controls.Add(pb); form.ShowDialog(); @@ -1191,6 +1194,8 @@ namespace ChatController.HauptKlassen form.StartPosition = FormStartPosition.CenterScreen; form.Size = imgbit.Size; + form.MinimumSize = new Size(150,150); + form.MaximumSize = new Size(500,500); form.FormBorderStyle = FormBorderStyle.Sizable; PictureBox pb = new PictureBox(); @@ -1198,7 +1203,7 @@ namespace ChatController.HauptKlassen pb.Image = imgbit; pb.SizeMode = PictureBoxSizeMode.StretchImage; - + //pb.MaximumSize = new Size(500,500); form.Controls.Add(pb); form.ShowDialog(); @@ -1213,7 +1218,7 @@ namespace ChatController.HauptKlassen #endregion //Neu - #region Synchronisation Veranlassen + #region Synchronisation Veranlassen für Bewoplaner OwnChat Version //sync für alles und jeden //public bool DoSync = true; @@ -1265,7 +1270,7 @@ namespace ChatController.HauptKlassen #endregion - #region Neue Gruppen Holen + #region Neue Gruppen Holen für OwnChatDesktop public ChatGruppenDaten GruppenAktuallisieren() { try diff --git a/ChatController/LoginControl.xaml.cs b/ChatController/LoginControl.xaml.cs index 4569b87..8e98d82 100644 --- a/ChatController/LoginControl.xaml.cs +++ b/ChatController/LoginControl.xaml.cs @@ -45,7 +45,7 @@ namespace ChatController private string _chatCode = ""; private string _kundennummer = ""; private string _authToken = ""; - + private string _version = "1.1"; public LoginControl() { @@ -54,8 +54,8 @@ namespace ChatController //encrypt verschlüsselte datei LeseDateiFallsVorhanden(); - var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; - lblVersion.Content = String.Format("Version: {0}", version); + //var version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + lblVersion.Content = String.Format("Version: {0}", _version); } private void AnmeldenButton_OnClick(object sender, RoutedEventArgs e) diff --git a/PrototypChat/.vs/PrototypChat/v15/.suo b/PrototypChat/.vs/PrototypChat/v15/.suo deleted file mode 100644 index 72086e0..0000000 Binary files a/PrototypChat/.vs/PrototypChat/v15/.suo and /dev/null differ diff --git a/PrototypChat/LoginMaske.xaml.cs b/PrototypChat/LoginMaske.xaml.cs index fd182c5..624b9c1 100644 --- a/PrototypChat/LoginMaske.xaml.cs +++ b/PrototypChat/LoginMaske.xaml.cs @@ -30,7 +30,7 @@ namespace ownChat { InitializeComponent(); - this.Title = "ownChat Desktop Version " + typeof(LoginMaske).Assembly.GetName().Version; + this.Title = "ownChat Desktop"; } diff --git a/PrototypChat/PrototypChat.csproj b/PrototypChat/PrototypChat.csproj index d361c74..8358930 100644 --- a/PrototypChat/PrototypChat.csproj +++ b/PrototypChat/PrototypChat.csproj @@ -28,8 +28,8 @@ https://app5.bewoplaner.de/chat/ ownChat Desktop beyondSoft GmbH - 1.0.0.2 - 3 + 1.0.0.3 + 4 1.0.0.%2a false true @@ -67,6 +67,9 @@ true + + ownchat_favicon.ico + ..\libs\Newtonsoft.Json.dll @@ -166,5 +169,8 @@ false + + + \ No newline at end of file diff --git a/PrototypChat/PrototypChat.csproj.user b/PrototypChat/PrototypChat.csproj.user index 2e3e041..5a15d15 100644 --- a/PrototypChat/PrototypChat.csproj.user +++ b/PrototypChat/PrototypChat.csproj.user @@ -2,5 +2,13 @@ false + D:\Projects\beyondSoft\Chat\publish\ + https://app5.bewoplaner.de/chat/ + + + + + de-DE + false \ No newline at end of file diff --git a/PrototypChat/ownchat_favicon.ico b/PrototypChat/ownchat_favicon.ico new file mode 100644 index 0000000..a0441f4 Binary files /dev/null and b/PrototypChat/ownchat_favicon.ico differ