From 99270e730e0f0c5171a19e021f736fa452e82fdb Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Fri, 11 Jun 2021 16:07:17 +0800 Subject: [PATCH] fix --- .../ApplicationInstance.cs | 6 +++ .../design/ui/activities/MainActivity.java | 2 +- .../design/ui/fragments/GameListFragment.java | 46 ++++++++++++++++++- .../ui/viewmodels/GameListViewModel.java | 24 +++++++++- .../main/res/layout/fragment_game_list.xml | 22 +++++++++ .../app/src/main/res/menu/bottom_nav_menu.xml | 5 ++ .../main/res/navigation/mobile_navigation.xml | 6 +++ .../app/src/main/res/values/strings.xml | 1 + 8 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 src/ST.Client.Mobile.Droid.Design/app/src/main/res/layout/fragment_game_list.xml diff --git a/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs b/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs index 4bae81b58..95d84bd76 100644 --- a/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs +++ b/src/ST.Client.Desktop.Avalonia.App/ApplicationInstance.cs @@ -39,6 +39,12 @@ namespace System.Application.UI static IEnumerable GetCurrentAllProcess() { var current = Process.GetCurrentProcess(); +#if DEBUG + if (string.Equals("dotnet", Path.GetFileNameWithoutExtension(current.MainModule?.FileName), StringComparison.OrdinalIgnoreCase)) + { + return Array.Empty(); + } +#endif var currentMainModule = current.TryGetMainModule(); var query = from p in Process.GetProcessesByName(current.ProcessName) let pMainModule = p.TryGetMainModule() diff --git a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/activities/MainActivity.java b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/activities/MainActivity.java index 5914a9b28..62e5c50c4 100644 --- a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/activities/MainActivity.java +++ b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/activities/MainActivity.java @@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity { // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( - R.id.navigation_local_auth, R.id.navigation_community_fix, R.id.navigation_my) + R.id.navigation_local_auth, R.id.navigation_community_fix, R.id.navigation_game_list, R.id.navigation_my) .build(); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); diff --git a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/fragments/GameListFragment.java b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/fragments/GameListFragment.java index dc9896712..ec45c7782 100644 --- a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/fragments/GameListFragment.java +++ b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/fragments/GameListFragment.java @@ -1,2 +1,46 @@ -package net.steampp.app.design.ui.fragments;public class GameListFragment { +package net.steampp.app.design.ui.fragments; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +import net.steampp.app.design.databinding.FragmentGameListBinding; +import net.steampp.app.design.ui.viewmodels.GameListViewModel; + +public class GameListFragment extends Fragment { + + private GameListViewModel viewModel; + private FragmentGameListBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + viewModel = + new ViewModelProvider(this).get(GameListViewModel.class); + + binding = FragmentGameListBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + final TextView textView = binding.textView; + viewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } } diff --git a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/viewmodels/GameListViewModel.java b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/viewmodels/GameListViewModel.java index 6e6444031..45e26bc5d 100644 --- a/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/viewmodels/GameListViewModel.java +++ b/src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/design/ui/viewmodels/GameListViewModel.java @@ -1,2 +1,24 @@ -package net.steampp.app.design.ui.viewmodels;public class GameListViewModel { +package net.steampp.app.design.ui.viewmodels; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +import net.steampp.app.design.R; +import net.steampp.app.design.ui.MainApplication; + +import java.util.Arrays; + +public class GameListViewModel extends ViewModel { + + private MutableLiveData mText; + + public GameListViewModel() { + mText = new MutableLiveData<>(); + mText.setValue(Arrays.stream(this.getClass().getName().split("\\.")).reduce((first, second) -> second).orElse("").replace("ViewModel","") + "\n" + MainApplication.getContext().getString(R.string.under_construction)); + } + + public LiveData getText() { + return mText; + } } diff --git a/src/ST.Client.Mobile.Droid.Design/app/src/main/res/layout/fragment_game_list.xml b/src/ST.Client.Mobile.Droid.Design/app/src/main/res/layout/fragment_game_list.xml new file mode 100644 index 000000000..f5864af97 --- /dev/null +++ b/src/ST.Client.Mobile.Droid.Design/app/src/main/res/layout/fragment_game_list.xml @@ -0,0 +1,22 @@ + + + + + diff --git a/src/ST.Client.Mobile.Droid.Design/app/src/main/res/menu/bottom_nav_menu.xml b/src/ST.Client.Mobile.Droid.Design/app/src/main/res/menu/bottom_nav_menu.xml index f7eed89ad..7c67af47a 100644 --- a/src/ST.Client.Mobile.Droid.Design/app/src/main/res/menu/bottom_nav_menu.xml +++ b/src/ST.Client.Mobile.Droid.Design/app/src/main/res/menu/bottom_nav_menu.xml @@ -11,6 +11,11 @@ android:icon="@drawable/baseline_person_black_24" android:title="@string/community_fix" /> + + + + 本地令牌 我的 社区加速 + 库存游戏 该功能正在开发中，敬请期待