Skip to content

Commit

Permalink
ANDROID IS_STORE_PACKAGE
Browse files Browse the repository at this point in the history
  • Loading branch information
AigioL committed Sep 4, 2021
1 parent 3761a98 commit f01c5c0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ OS | Version | Architectures |
Read what we [milestones](https://github.com/SteamTools-Team/SteamTools/milestones), and feel free to ask questions.

## ⌨️ Development Environment
[Visual Studio 2019 Version 16.10 Or Higher](https://visualstudio.microsoft.com/vs/) Or [JetBrains Rider](https://www.jetbrains.com/rider/) Or ~~[Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/)~~ Or ~~[Visual Studio Code](https://code.visualstudio.com/)~~
[Visual Studio 2019 Version 16.11 Or Higher](https://visualstudio.microsoft.com/vs/) Or [JetBrains Rider](https://www.jetbrains.com/rider/) Or ~~[Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/)~~ Or ~~[Visual Studio Code](https://code.visualstudio.com/)~~
- Supported Operating Systems
- [Windows 10 version 2004 or higher: Home, Professional, Education, and Enterprise (LTSC and S are not supported)](https://docs.microsoft.com/en-us/visualstudio/releases/2019/system-requirements)
- [Windows 10 Version 2004 Or Higher: Home, Professional, Education, and Enterprise (LTSC and S are not supported)](https://docs.microsoft.com/en-us/visualstudio/releases/2019/system-requirements)
- [macOS 10.14 Mojave Or Higher](https://docs.microsoft.com/en-us/visualstudio/productinfo/vs2019-system-requirements-mac)
- Workload
- Web and Cloud
Expand All @@ -164,8 +164,8 @@ Read what we [milestones](https://github.com/SteamTools-Team/SteamTools/mileston
- [Avalonia for Visual Studio](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio)
- [NUnit VS Templates](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTemplatesforVisualStudio)

[Android Studio 4.2+](https://developer.android.com/studio/)
[Xcode 13](https://developer.apple.com/xcode/)
[Android Studio 2020.3.1 Or Higher](https://developer.android.com/studio/)
[Xcode 13 Or Higher](https://developer.apple.com/xcode/)

## 📄 Thanks to the following Open Source Projects
* [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ OS | Version | Architectures |
查看这个 [milestones](https://github.com/SteamTools-Team/SteamTools/milestones) 来了解我们下一步的开发计划,并随时提出问题。

## ⌨️ 开发环境
[Visual Studio 2019 版本 16.10 或更高版本](https://visualstudio.microsoft.com/zh-hans/vs/)[JetBrains Rider](https://www.jetbrains.com/rider/)~~[Visual Studio for Mac](https://visualstudio.microsoft.com/zh-hans/vs/mac/)~~~~[Visual Studio Code](https://code.visualstudio.com/)~~
[Visual Studio 2019 版本 16.11 或更高版本](https://visualstudio.microsoft.com/zh-hans/vs/)[JetBrains Rider](https://www.jetbrains.com/rider/)~~[Visual Studio for Mac](https://visualstudio.microsoft.com/zh-hans/vs/mac/)~~~~[Visual Studio Code](https://code.visualstudio.com/)~~
- 系统要求
- [Windows 10 版本 2004 或更高版本:家庭版、专业版、教育版和企业版(不支持 LTSC 和 Windows 10 S,在较早的操作系统上可能不受支持)](https://docs.microsoft.com/zh-cn/visualstudio/releases/2019/system-requirements)
- [macOS 10.14 Mojave 或更高版本](https://docs.microsoft.com/zh-cn/visualstudio/productinfo/vs2019-system-requirements-mac)
Expand All @@ -173,8 +173,8 @@ OS | Version | Architectures |
- [Avalonia for Visual Studio](https://marketplace.visualstudio.com/items?itemName=AvaloniaTeam.AvaloniaforVisualStudio)
- [NUnit VS Templates](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnitTemplatesforVisualStudio)

[Android Studio 4.2+](https://developer.android.google.cn/studio/)
[Xcode 13](https://developer.apple.com/xcode/)
[Android Studio 2020.3.1 或更高版本](https://developer.android.google.cn/studio/)
[Xcode 13 或更高版本](https://developer.apple.com/xcode/)

## 🏗️ [项目结构](./src/README.md)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ public MobileAppUpdateServiceImpl(INotificationService notification, IToast toas
this.notification = notification;
}

#if __ANDROID__ && IS_STORE_PACKAGE // 渠道包不支持从服务器分发,仅通过应用商店分发
public override bool IsSupportedServerDistribution => false;
#endif

protected override Version OSVersion =>
#if __ANDROID__
new((int)Build.VERSION.SdkInt, 0, 0);
Expand Down
4 changes: 4 additions & 0 deletions src/ST.Client.Mobile.Droid/UI/Activities/SettingsActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ protected override void OnCreate(Bundle? savedInstanceState)

this.SetSupportActionBarWithNavigationClick(binding!.toolbar, true);

#if IS_STORE_PACKAGE // 渠道包隐藏下载更新渠道,更新通过应用商店分发
binding.layoutRootGeneralSettingsUpdateChannel.Visibility = ViewStates.Gone;
#endif

R.Current.WhenAnyValue(x => x.Res).SubscribeInMainThread(_ =>
{
Title = ViewModel!.Name;
Expand Down

0 comments on commit f01c5c0

Please sign in to comment.