调整文件

Author: kitUIN

App.cpp

@@ -1,7 +1,7 @@
 #include "pch.h"
 
 #include "App.h"
-#include "MainPage.h"
+#include "Pages/MainPage.h"
 
 
 using namespace winrt;

Assets/LargeTile.scale-100.png

@@ -2,12 +2,12 @@
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
   <Identity
     Name="216498b6-651f-448d-99f4-4633881a4315"
-    Publisher="CN=kulujun"
-    Version="1.0.0.0" />
+    Publisher="CN=KitUIN"
+    Version="0.1.0.0" />
   <mp:PhoneIdentity PhoneProductId="216498b6-651f-448d-99f4-4633881a4315" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
   <Properties>
     <DisplayName>bikabika</DisplayName>
-    <PublisherDisplayName>kulujun</PublisherDisplayName>
+    <PublisherDisplayName>KitUIN</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>

Assets/LargeTile.scale-125.png

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ClassificationPage.g.h"
-#include "ClassBlockViewModel.h"
+#include "Utils/Blocks/ClassBlockViewModel.h"
 
 namespace winrt::bikabika::implementation
 {

Assets/LargeTile.scale-150.png

@@ -1,5 +1,5 @@
-import "ClassBlockViewModel.idl";
-import "BikaHttp.idl";
+import "Utils/Blocks/ClassBlockViewModel.idl";
+import "Utils/API/BikaHttp.idl";
 namespace bikabika
 {
     [default_interface]

Assets/LargeTile.scale-200.png

@@ -12,7 +12,7 @@
         <Grid>
             <StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                        <Image Source="Assets//Picacgs//register_name.png" Width="36" Height="36" Margin="0,0,0,0"/>
+                        <Image Source="ms-appx:///Assets//Picacgs//register_name.png" Width="36" Height="36" Margin="0,0,0,0"/>
                     <TextBlock Text="热门分类" FontSize="25" FontWeight="Bold" Foreground="{StaticResource SystemAccentColorDark3}"/>
                 </StackPanel>
                 <GridView x:Name="GridV" SelectionMode="None" IsItemClickEnabled="True" ItemClick="GridV_ItemClick"

Assets/LargeTile.scale-400.png

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "ComicsPage.g.h"
-#include "ComicBlock.h"
-#include "PageNumBox.h"
+#include "Utils/Blocks/ComicBlock.h"
+#include "Utils/Blocks/PageNumBox.h"
 namespace winrt::bikabika::implementation
 {
     struct ComicsPage : ComicsPageT<ComicsPage>

Package.appxmanifest

@@ -1,5 +1,5 @@
-import "ComicBlock.idl";
-import "PageNumBox.idl";
+import "Utils/Blocks/ComicBlock.idl";
+import "Utils/Blocks/PageNumBox.idl";
 namespace bikabika
 {
 

AccountPage.cpp Pages/AccountPage.cpp

@@ -1,11 +1,11 @@
 #pragma once
 
 #include "InfoPage.g.h"
-#include "BikaHttp.h"
+#include "Utils/API/BikaHttp.h"
 #include "FileCheckTool.h"
-#include "TagBlock.h"
-#include "CreaterBlock.h"
-#include "EpisodeBlock.h"
+#include "Utils/Blocks/TagBlock.h"
+#include "Utils/Blocks/CreaterBlock.h"
+#include "Utils/Blocks/EpisodeBlock.h"
 namespace winrt::bikabika::implementation
 {
     struct InfoPage : InfoPageT<InfoPage>

AccountPage.h Pages/AccountPage.h

@@ -1,6 +1,5 @@
-import "TagBlock.idl";
-import "CreaterBlock.idl";
-import "EpisodeBlock.idl";
+import "Utils/Blocks/CreaterBlock.idl";
+import "Utils/Blocks/EpisodeBlock.idl";
 namespace bikabika
 {
     [default_interface]

AccountPage.idl Pages/AccountPage.idl

@@ -208,13 +208,13 @@ namespace winrt::bikabika::implementation
 	{
 		Progressing().IsActive(true);
 		bool f{ co_await m_fileCheckTool.CheckFileAccount() };
+		Progressing().IsActive(false);
 		if (f) {
 			Windows::Data::Json::JsonObject account{ co_await m_fileCheckTool.GetAccount() };
 			if (account.GetNamedBoolean(L"isChecked")) {
 				hstring personInfo = co_await m_bikaHttp.PersonInfo();
-				Progressing().IsActive(false);
+				
 				if (personInfo[1] == 'T') {
-					Progressing().IsActive(false);
 					auto show{ PicErrorDialog().ShowAsync() };
 				}
 				else if (personInfo[1] == 'E') {

AccountPage.xaml Pages/AccountPage.xaml

@@ -1,4 +1,4 @@
-import "BikaHttp.idl";
+import "Utils/API/BikaHttp.idl";
 namespace bikabika
 {
     runtimeclass Login : Windows.UI.Xaml.Controls.Page

ClassificationPage.cpp Pages/ClassificationPage.cpp

@@ -27,7 +27,7 @@
             Background="{StaticResource SystemAccentColorLight2}">
             <ContentDialog.TitleTemplate>
                 <DataTemplate>
-                    <Image x:Name="ErrorPic" x:Uid="ErrorPic" Source="Assets//Picacgs//icon_unknown_error.png" Width="270" Height="270" HorizontalAlignment="Center"/>
+                            <Image x:Name="ErrorPic" x:Uid="ErrorPic" Source="ms-appx:///Assets//Picacgs//icon_unknown_error.png" Width="270" Height="270" HorizontalAlignment="Center"/>
                 </DataTemplate>
             </ContentDialog.TitleTemplate>
             <StackPanel HorizontalAlignment="Center">

ClassificationPage.h Pages/ClassificationPage.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "MainPage.g.h"
-#include "UserViewModel.h"
-#include "KeywordsBox.h"
+#include "Utils/Blocks/UserViewModel.h"
+#include "Utils/Blocks/KeywordsBox.h"
 namespace muxc
 {
 	using namespace winrt::Microsoft::UI::Xaml::Controls;

ClassificationPage.idl Pages/ClassificationPage.idl

@@ -1,4 +1,4 @@
-import "UserViewModel.idl";
+import "Utils/Blocks/UserViewModel.idl";
 namespace bikabika
 {
 

ClassificationPage.xaml Pages/ClassificationPage.xaml

@@ -78,7 +78,7 @@
                 <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="1">
-                <Image Source="Assets//Picacgs//picacomic_2.png" Width="36" Height="36" Margin="0,0,0,0"/>
+                <Image Source="ms-appx:///Assets//Picacgs//picacomic_2.png" Width="36" Height="36" Margin="0,0,0,0"/>
                 <TextBlock x:Uid="APPTitle" Text="嗶咔" FontSize="25" FontWeight="Bold" Margin="20,4,0,0"/>
 
             </StackPanel>

ComicsPage.cpp Pages/ComicsPage.cpp

@@ -1,8 +1,8 @@
 #pragma once
-#include "BikaHttp.h"
+#include "Utils/API/BikaHttp.h"
 #include "PicPage.g.h"
-#include "PicturesBlock.h"
-#include "EpisodeBlock.h"
+#include "Utils/Blocks/PicturesBlock.h"
+#include "Utils/Blocks/EpisodeBlock.h"
 namespace winrt::bikabika::implementation
 {
     struct PicPage : PicPageT<PicPage>

ComicsPage.h Pages/ComicsPage.h

@@ -1,4 +1,4 @@
-import "PicturesBlock.idl";
+import "Utils/Blocks/PicturesBlock.idl";
 namespace bikabika
 {
 	[default_interface]

ComicsPage.idl Pages/ComicsPage.idl

@@ -1,4 +1,4 @@
-import "ClassBlock.idl";
+import "Utils/Blocks/ClassBlock.idl";
 namespace bikabika
 {
     runtimeclass ClassBlockViewModel

ComicsPage.xaml Pages/ComicsPage.xaml

@@ -1,4 +1,4 @@
-import "TagBlock.idl";
+import "Utils/Blocks/TagBlock.idl";
 namespace bikabika
 {
     runtimeclass ComicBlock : Windows.UI.Xaml.Data.INotifyPropertyChanged

DownloadPage.cpp Pages/DownloadPage.cpp

@@ -1,4 +1,4 @@
-import "TagBlock.idl";
+import "Utils/Blocks/TagBlock.idl";
 namespace bikabika
 {
     runtimeclass CreaterBlock : Windows.UI.Xaml.Data.INotifyPropertyChanged

DownloadPage.h Pages/DownloadPage.h

@@ -1,5 +1,4 @@
-import "CreaterBlock.idl";
-import "TagBlock.idl";
+import "Utils/Blocks/CreaterBlock.idl";
 namespace bikabika
 {
     runtimeclass InfoBlock : Windows.UI.Xaml.Data.INotifyPropertyChanged

DownloadPage.idl Pages/DownloadPage.idl

@@ -1,4 +1,4 @@
-import "User.idl";
+import "Utils/Blocks/User.idl";
 
 namespace bikabika
 {