sheptikhinv/MetaforceInstaller
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

update mainwindow so it shows real installations

Browse source
This commit is contained in:
Вячеслав 2026-01-01 20:32:38 +05:00
parent 297a784956
commit 89c3dcb424
3 changed files with 65 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

39
MetaforceInstaller.UI/MainWindow.axaml
View file

@ -2,7 +2,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:MetaforceInstaller.UI.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:CompileBindings="True"
x:DataType="vm:MainWindowViewModel"
x:Class="MetaforceInstaller.UI.MainWindow" x:Class="MetaforceInstaller.UI.MainWindow"
Title="MetaforceInstaller"> Title="MetaforceInstaller">
@ -19,6 +22,10 @@
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
<Design.DataContext>
<vm:MainWindowViewModel/>
</Design.DataContext>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -39,27 +46,17 @@
</Button> </Button>
<ScrollViewer Grid.Row="1"> <ScrollViewer Grid.Row="1">
<StackPanel Margin="10"> <ItemsControl ItemsSource="{Binding Installations}">
<Expander Header="Item 1" Margin="0,5" HorizontalAlignment="Stretch"> <ItemsControl.ItemTemplate>
<TextBlock Text="Content for item 1" Margin="10" /> <DataTemplate>
</Expander> <Expander Header="{Binding Title}" Margin="20, 0" HorizontalAlignment="Stretch">
<StackPanel Margin="10">
<Expander Header="Item 2" Margin="0,5" HorizontalAlignment="Stretch">
<TextBlock Text="Content for item 2" Margin="10" /> </StackPanel>
</Expander> </Expander>
</DataTemplate>
<Expander Header="Item 3" Margin="0,5" HorizontalAlignment="Stretch"> </ItemsControl.ItemTemplate>
<TextBlock Text="Content for item 3" Margin="10" /> </ItemsControl>
</Expander>
<Expander Header="Item 4" Margin="0,5" HorizontalAlignment="Stretch">
<TextBlock Text="Content for item 4" Margin="10" />
</Expander>
<Expander Header="Item 5" Margin="0,5" HorizontalAlignment="Stretch">
<TextBlock Text="Content for item 5" Margin="10" />
</Expander>
</StackPanel>
</ScrollViewer> </ScrollViewer>
</Grid> </Grid>
</Window> </Window>

234
MetaforceInstaller.UI/MainWindow.axaml.cs
View file

@ -1,236 +1,40 @@
using System;
using System.IO;
using System.Threading.Tasks;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Platform.Storage; using MetaforceInstaller.Core.Intefaces;
using Avalonia.Threading;
using Avalonia.VisualTree;
using MetaforceInstaller.Core.Models;
using MetaforceInstaller.Core.Services; using MetaforceInstaller.Core.Services;
using MetaforceInstaller.UI.ViewModels;
namespace MetaforceInstaller.UI; namespace MetaforceInstaller.UI;
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
private string? _apkPath; private MainWindowViewModel _viewModel;
private string? _zipPath; private IStorageService _storageService;
private AdbService _adbService;
private const int PROGRESS_LOG_STEP = 10;
private const int PROGRESS_UPDATE_STEP = 1;
private int _lastLoggedProgress = -1;
private int _lastUpdatedProgress = -1;
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
_viewModel = new MainWindowViewModel();
DataContext = _viewModel;
_storageService = new StorageService();
NewInstallationButton.Click += OnNewInstalltionClick; NewInstallationButton.Click += OnNewInstalltionClick;
// LogMessage("MetaforceInstaller by slavagm");
// LoadInstallations();
// _adbService = new AdbService(); }
// _adbService.ProgressChanged += OnAdbProgressChanged;
// _adbService.StatusChanged += OnAdbStatusChanged; private void LoadInstallations()
// {
// CheckAndEnableInstallButton(); var appData = _storageService.Load();
// _viewModel.LoadInstallations(appData.Installations);
// ChooseApkButton.Click += OnChooseApkClicked;
// ChooseContentButton.Click += OnChooseContentClicked;
// InstallButton.Click += OnInstallClicked;
} }
public async void OnNewInstalltionClick(object? sender, RoutedEventArgs e) public async void OnNewInstalltionClick(object? sender, RoutedEventArgs e)
{ {
var newInstallationDialog = new NewInstallationDialog(); var newInstallationDialog = new NewInstallationDialog();
await newInstallationDialog.ShowDialog<NewInstallationDialog>(this); await newInstallationDialog.ShowDialog<NewInstallationDialog>(this);
LoadInstallations();
} }
// private void OnAdbProgressChanged(object? sender, ProgressInfo e)
// {
// Dispatcher.UIThread.InvokeAsync(() =>
// {
// if (e.PercentageComplete != _lastUpdatedProgress &&
// e.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
// {
// InstallProgressBar.Value = e.PercentageComplete;
// _lastUpdatedProgress = e.PercentageComplete;
// }
//
// if (e.PercentageComplete != _lastLoggedProgress &&
// e.PercentageComplete % PROGRESS_LOG_STEP == 0 || e.PercentageComplete == 100)
// {
// LogMessage(
// e.TotalBytes > 0
// ? $"Прогресс: {e.PercentageComplete}% ({FormatBytes(e.BytesTransferred)} / {FormatBytes(e.TotalBytes)})"
// : $"Прогресс: {e.PercentageComplete}%");
//
// _lastLoggedProgress = e.PercentageComplete;
// }
// });
// }
//
// private void OnProgressReport(ProgressInfo progressInfo)
// {
// Dispatcher.UIThread.InvokeAsync(() =>
// {
// if (progressInfo.PercentageComplete != _lastUpdatedProgress &&
// progressInfo.PercentageComplete % PROGRESS_UPDATE_STEP == 0)
// {
// InstallProgressBar.Value = progressInfo.PercentageComplete;
// _lastUpdatedProgress = progressInfo.PercentageComplete;
// }
//
//
// if (progressInfo.PercentageComplete != _lastLoggedProgress &&
// (progressInfo.PercentageComplete % PROGRESS_LOG_STEP == 0 || progressInfo.PercentageComplete == 100))
// {
// LogMessage(
// progressInfo.TotalBytes > 0
// ? $"Прогресс: {progressInfo.PercentageComplete}% ({FormatBytes(progressInfo.BytesTransferred)} / {FormatBytes(progressInfo.TotalBytes)})"
// : $"Прогресс: {progressInfo.PercentageComplete}%");
//
// _lastLoggedProgress = progressInfo.PercentageComplete;
// }
// });
// }
//
// private void OnAdbStatusChanged(object? sender, string e)
// {
// Dispatcher.UIThread.InvokeAsync(() =>
// {
// InstallProgressBar.Value = 0;
// _lastLoggedProgress = -1;
// _lastUpdatedProgress = -1;
// LogMessage(e);
// });
// }
//
// private string FormatBytes(long bytes)
// {
// string[] suffixes = ["B", "KB", "MB", "GB", "TB"];
// var counter = 0;
// double number = bytes;
//
// while (Math.Round(number / 1024) >= 1)
// {
// number /= 1024;
// counter++;
// }
//
// return $"{number:N1} {suffixes[counter]}";
// }
//
//
// private async void CheckAndEnableInstallButton()
// {
// InstallButton.IsEnabled = !string.IsNullOrEmpty(_apkPath) && !string.IsNullOrEmpty(_zipPath);
// }
//
// private async void OnChooseApkClicked(object? sender, RoutedEventArgs e)
// {
// var topLevel = GetTopLevel(this);
// var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
// {
// Title = "Выберите APK файл",
// AllowMultiple = false,
// FileTypeFilter = new[]
// {
// new FilePickerFileType("APK Files")
// {
// Patterns = new[] { "*.apk" }
// }
// }
// });
//
// if (files.Count >= 1)
// {
// _apkPath = files[0].Path.LocalPath;
// LogMessage($"APK выбран: {Path.GetFileName(_apkPath)}");
// }
//
// CheckAndEnableInstallButton();
// }
//
// private async void OnChooseContentClicked(object? sender, RoutedEventArgs e)
// {
// var topLevel = GetTopLevel(this);
// var files = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
// {
// Title = "Выберите архив с контентом",
// AllowMultiple = false,
// FileTypeFilter = new[]
// {
// new FilePickerFileType("ZIP Files")
// {
// Patterns = new[] { "*.zip" }
// }
// }
// });
//
// if (files.Count >= 1)
// {
// _zipPath = files[0].Path.LocalPath;
// LogMessage($"Контент выбран: {Path.GetFileName(_zipPath)}");
// }
//
// CheckAndEnableInstallButton();
// }
//
// private async void OnInstallClicked(object? sender, RoutedEventArgs e)
// {
// if (string.IsNullOrEmpty(_apkPath) || string.IsNullOrEmpty(_zipPath))
// {
// LogMessage("Ошибка: Выберите APK файл и папку с контентом");
// return;
// }
//
// _adbService.RefreshDeviceData();
//
// InstallButton.IsEnabled = false;
// InstallProgressBar.Value = 0;
//
// try
// {
// LogMessage("Начинаем установку...");
//
// var deviceInfo = _adbService.GetDeviceInfo();
// LogMessage($"Найдено устройство: {deviceInfo.SerialNumber}");
// LogMessage($"Состояние: {deviceInfo.State}");
// LogMessage($"Модель: {deviceInfo.Model} - {deviceInfo.Name}");
//
// var progress = new Progress<ProgressInfo>(OnProgressReport);
//
// await _adbService.InstallApkAsync(_apkPath, progress);
//
// var apkInfo = ApkScrapper.GetApkInfo(_apkPath);
// LogMessage($"Ставим {apkInfo.PackageName} версии {apkInfo.VersionName}");
// var zipName = Path.GetFileName(_zipPath);
// var outputPath =
// @$"/storage/emulated/0/Android/data/{apkInfo.PackageName}/files/{zipName}";
// LogMessage($"Начинаем копирование контента в {outputPath}");
//
// await _adbService.CopyFileAsync(_zipPath, outputPath, progress);
//
// LogMessage("Установка завершена успешно!");
// }
// catch (Exception ex)
// {
// LogMessage($"Ошибка установки: {ex.Message}");
// }
// finally
// {
// InstallButton.IsEnabled = true;
// InstallProgressBar.Value = 0;
// }
// }
//
// private void LogMessage(string message)
// {
// var timestamp = DateTime.Now.ToString("HH:mm:ss");
// LogsTextBox.Text += $"[{timestamp}] {message}\n";
//
// var scrollViewer = LogsTextBox.FindAncestorOfType<ScrollViewer>();
// scrollViewer?.ScrollToEnd();
// }
} }

28
MetaforceInstaller.UI/ViewModels/MainWindowViewModel.cs Normal file
View file

@ -0,0 +1,28 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using MetaforceInstaller.Core.Models;
namespace MetaforceInstaller.UI.ViewModels;
public class MainWindowViewModel : INotifyPropertyChanged
{
public event PropertyChangedEventHandler? PropertyChanged;
public ObservableCollection<InstallationData> Installations { get; set; } = new();
public void LoadInstallations(IEnumerable<InstallationData> data)
{
Installations.Clear();
foreach (var installation in data)
{
Installations.Add(installation);
}
}
protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
}