|
@@ -53,7 +53,7 @@ namespace LnoidWv
|
|
|
public object GetPrefixes(string dataPath, Action<object> cbProcess = null)
|
|
|
{
|
|
|
var directories = Directory.GetDirectories(dataPath);
|
|
|
-
|
|
|
+
|
|
|
Array.Sort(directories);
|
|
|
|
|
|
var progress = cbProcess == null
|
|
@@ -80,7 +80,7 @@ namespace LnoidWv
|
|
|
public object GetSeries(string prefixPath, Action<object> cbProcess = null)
|
|
|
{
|
|
|
var directories = Directory.GetDirectories(prefixPath);
|
|
|
-
|
|
|
+
|
|
|
Array.Sort(directories);
|
|
|
|
|
|
var progress = cbProcess == null
|
|
@@ -212,6 +212,15 @@ namespace LnoidWv
|
|
|
// ReSharper disable once UnusedMember.Global
|
|
|
public string ReadSetting()
|
|
|
{
|
|
|
+#if !Android22
|
|
|
+ if (Android.OS.Environment.IsExternalStorageManager == false)
|
|
|
+ {
|
|
|
+ var uri = Android.Net.Uri.Parse("package:" + Application.Context.ApplicationInfo.PackageName);
|
|
|
+ var intent = new Intent(Android.Provider.Settings.ActionManageAppAllFilesAccessPermission, uri);
|
|
|
+ _mainActivity.StartActivityForResult(intent, 9527);
|
|
|
+ }
|
|
|
+#endif
|
|
|
+
|
|
|
var localStorage = _mainActivity.Application.FilesDir.Path;
|
|
|
var configFilePath = Path.Combine(localStorage, "config.json");
|
|
|
return File.Exists(configFilePath)
|
|
@@ -292,13 +301,13 @@ namespace LnoidWv
|
|
|
public partial class MainActivity
|
|
|
{
|
|
|
private const string MainUrl =
|
|
|
-#if DEBUG
|
|
|
- "http://192.168.23.97/main.html"
|
|
|
- // "http://192.168.1.233/main.html"
|
|
|
- // "http://lnoidebugserver/main.html"
|
|
|
-#else
|
|
|
+ //#if DEBUG
|
|
|
+ // "http://192.168.23.97/main.html"
|
|
|
+ // // "http://192.168.1.233/main.html"
|
|
|
+ // // "http://lnoidebugserver/main.html"
|
|
|
+ //#else
|
|
|
"file:///android_asset/main.html"
|
|
|
-#endif
|
|
|
+ //#endif
|
|
|
;
|
|
|
|
|
|
private const string JsBindName = "LnoidNativeFunctions";
|
|
@@ -312,12 +321,15 @@ namespace LnoidWv
|
|
|
#if !Android22
|
|
|
if (CheckSelfPermission(Manifest.Permission.ReadExternalStorage) != Permission.Granted)
|
|
|
RequestPermissions(new[] { Manifest.Permission.ReadExternalStorage }, 123321123); // is an app-defined int constant that should be quite unique
|
|
|
+
|
|
|
+ //var uri = Android.Net.Uri.Parse("package:" + Application.Context.ApplicationInfo.PackageName);
|
|
|
+ //var intent = new Intent(Android.Provider.Settings.ActionManageAppAllFilesAccessPermission, uri, ApplicationContext, GetType());
|
|
|
+ //StartActivity(intent);
|
|
|
#endif
|
|
|
|
|
|
RequestWindowFeature(WindowFeatures.NoTitle);
|
|
|
|
|
|
|
|
|
-
|
|
|
#if DEBUG || WV_DEBUG
|
|
|
#if !Android22
|
|
|
if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
|