Fix bugs

oybab · Apr 19, 2022 · b6b8ab6 · b6b8ab6
1 parent bbec2c5
commit b6b8ab6
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 18 deletions.
diff --git a/TradingSystemX/TradingSystemX/TradingSystemX.Android/Properties/AndroidManifest.xml b/TradingSystemX/TradingSystemX/TradingSystemX.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="16" android:versionName="1.2.0" package="com.oybab.tradingSystem" android:installLocation="preferExternal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="17" android:versionName="1.2.3" package="com.oybab.tradingSystem" android:installLocation="preferExternal">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:label="Oybab Trading" android:icon="@mipmap/ic_launcher" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.CAMERA" />

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX.UWP/Package.appxmanifest b/TradingSystemX/TradingSystemX/TradingSystemX.UWP/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="19006-OYBAB.OybabTrading"
     Publisher="CN=&quot;Oybab Co., Ltd.&quot;, OU=IT, O=&quot;Oybab Co., Ltd.&quot;, POBox=848000, STREET=&quot;No 82, Hawa Alley No 1, West Taibei Road&quot;, L=Hetian, S=Xinjiang, PostalCode=848000, C=CN"
-    Version="1.2.0.0" />
+    Version="1.2.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="d71993d5-eb57-492d-8aa3-1535be5e30f4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX.iOS/Info.plist b/TradingSystemX/TradingSystemX/TradingSystemX.iOS/Info.plist
@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.oybab.tradingSystem</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX.iOS/TradingSystemX.iOS.csproj b/TradingSystemX/TradingSystemX/TradingSystemX.iOS/TradingSystemX.iOS.csproj
@@ -178,8 +178,10 @@
     <PackageReference Include="System.Globalization">
       <Version>4.3.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Forms">
+      <Version>5.0.0.2337</Version>
+    </PackageReference>
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>
     </PackageReference>

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX/Pages/LoginPage.xaml b/TradingSystemX/TradingSystemX/TradingSystemX/Pages/LoginPage.xaml
@@ -49,7 +49,22 @@
                         </Grid.ColumnDefinitions>
                         <Button Grid.Column="0" HorizontalOptions="End" Command="{Binding LoginCommand}" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Login}"  />
 
-                        <Button Grid.Column="1" HorizontalOptions="Center" Command="{Binding ResetCommand}" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Reset2}" />
+                        <Button Grid.Column="1" HorizontalOptions="Center" Command="{Binding ResetCommand}" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Reset2}" >
+                            <Button.Triggers>
+                                <DataTrigger TargetType="Button" Binding="{Binding HideSetting}" Value="True">
+                                    <Setter Property="IsVisible" Value="False"/>
+                                </DataTrigger >
+                            </Button.Triggers>
+                        </Button>
+
+                        <Button  HorizontalOptions="Center"  Grid.Column="1" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Close}" Command="{Binding CloseCommand}" IsVisible="False">
+                            <Button.Triggers>
+                                <DataTrigger TargetType="Button" Binding="{Binding HideSetting}" Value="True">
+                                    <Setter Property="IsVisible" Value="True"/>
+                                </DataTrigger >
+                            </Button.Triggers>
+                        </Button>
+
 
                         <Button Margin="10,0,0,0" HorizontalOptions="Start"  Grid.Column="2" Command="{Binding SettingCommand}" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Settings}"  >
                             <Button.Triggers >
@@ -59,17 +74,11 @@
                                 </DataTrigger >
                             </Button.Triggers>
                         </Button>
+
                     </Grid>
                 </StackLayout>
             </ScrollView>
-            <StackLayout Grid.Row="2"  HorizontalOptions="End" Orientation="Horizontal" IsVisible="False">
-                <Button Margin="0,0,5,0" Text="{Binding Path=T, Source={StaticResource LC}, Mode=OneWay, Converter={StaticResource LC},ConverterParameter=Close}" Command="{Binding CloseCommand}"></Button>
-                <StackLayout.Triggers>
-                    <DataTrigger TargetType="StackLayout" Binding="{Binding HideSetting}" Value="True">
-                        <Setter Property="IsVisible" Value="True"/>
-                    </DataTrigger > 
-                </StackLayout.Triggers>
-            </StackLayout>
+
 
             <Grid Grid.Row="2">
                 <Grid.RowDefinitions>

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX/TradingSystemX.csproj b/TradingSystemX/TradingSystemX/TradingSystemX/TradingSystemX.csproj
@@ -325,8 +325,8 @@
     <PackageReference Include="Microsoft.AspNet.SignalR.Client" Version="2.4.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Globalization" Version="4.3.0" />
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
   </ItemGroup>

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX/VM/ViewModels/Controls/MessageBoxViewModel.cs b/TradingSystemX/TradingSystemX/TradingSystemX/VM/ViewModels/Controls/MessageBoxViewModel.cs
@@ -161,7 +161,8 @@ internal void Show(string title, string content, MessageBoxMode mode, MessageBox
                         if (OperatesService.Instance.IsExpired || OperatesService.Instance.IsAdminUsing)
                         {
                             MainViewModel viewModel = NavigationPath.Instance.CurrentNavigate.BindingContext as MainViewModel;
-                            viewModel.ReLyout();
+                            if (null != viewModel)
+                                viewModel.ReLyout();
                         }
                     });
 

diff --git a/TradingSystemX/TradingSystemX/TradingSystemX/VM/ViewModels/Pages/LoginViewModel.cs b/TradingSystemX/TradingSystemX/TradingSystemX/VM/ViewModels/Pages/LoginViewModel.cs
@@ -38,7 +38,6 @@ public void Init()
             IsSavePassword = false;
 
 
-
             if (!string.IsNullOrWhiteSpace(Resources.Instance.LastLoginAdminNo))
                 AdminNo = Resources.Instance.LastLoginAdminNo;
             if (Resources.Instance.IsSavePassword && !string.IsNullOrWhiteSpace(Resources.Instance.LastLoginPassword))
@@ -49,11 +48,14 @@ public void Init()
                 IsAgreeRequirements = true;
             }
 
+            bool _isAdminUsing = false;
+
             if (InitCount > 0)
             {
                 HideSetting = true;
                 if (OperatesService.Instance.IsAdminUsing)
                 {
+                    _isAdminUsing = true;
                     OperatesService.Instance.IsAdminUsing = false;
 
                     QueueMessageBoxNotification.Instance.ActionMessageBox(null, null, CommandTitles.Instance.Information, string.Format(Resources.Instance.GetString("Exception_AdminExists"), Common.Instance.GetFormat()), MessageBoxMode.Dialog, MessageBoxImageMode.Error, MessageBoxButtonMode.OK, null, null);
@@ -65,7 +67,7 @@ public void Init()
 
 
             // 自动开始登录
-            if (Resources.Instance.IsSavePassword)
+            if (Resources.Instance.IsSavePassword && !_isAdminUsing)
                 LoginCommand.Execute(null);
 
         }
@@ -141,6 +143,9 @@ public bool IsLoading
 
 
 
+
+
+
         private bool _hideSetting = false;
         /// <summary>
         /// 隐藏设置
@@ -247,7 +252,7 @@ public Command LicenseCommand
 
 
         /// <summary>
-        /// 退出
+        /// 登录
         /// </summary>
         private RelayCommand _loginCommand;
         public Command LoginCommand
@@ -309,6 +314,7 @@ public Command LoginCommand
                                         {
                                                 // 登录
                                                 Login();
+                                                IsLoading = false;
                                         }, null);
                                     }
                                     // 如果快过期了则提示