Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fallenstardust
YGOMobile
Commits
225ea61b
Commit
225ea61b
authored
Aug 20, 2019
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人工转
file://为content://
parent
4505c049
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
132 additions
and
99 deletions
+132
-99
mobile/src/main/AndroidManifest.xml
mobile/src/main/AndroidManifest.xml
+80
-74
mobile/src/main/java/cn/garymb/ygomobile/ui/preference/PreferenceFragmentPlus.java
...arymb/ygomobile/ui/preference/PreferenceFragmentPlus.java
+34
-25
mobile/src/main/res/xml/file_paths.xml
mobile/src/main/res/xml/file_paths.xml
+18
-0
No files found.
mobile/src/main/AndroidManifest.xml
View file @
225ea61b
This diff is collapsed.
Click to expand it.
mobile/src/main/java/cn/garymb/ygomobile/ui/preference/PreferenceFragmentPlus.java
View file @
225ea61b
...
@@ -9,13 +9,17 @@ import android.net.Uri;
...
@@ -9,13 +9,17 @@ import android.net.Uri;
import
android.os.Build
;
import
android.os.Build
;
import
android.preference.Preference
;
import
android.preference.Preference
;
import
android.provider.MediaStore
;
import
android.provider.MediaStore
;
import
android.util.Log
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.core.content.FileProvider
;
import
java.io.File
;
import
java.io.File
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.Set
;
import
cn.garymb.ygomobile.Constants
;
import
cn.garymb.ygomobile.Constants
;
import
cn.garymb.ygomobile.lite.BuildConfig
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.ui.file.FileActivity
;
import
cn.garymb.ygomobile.ui.file.FileActivity
;
import
cn.garymb.ygomobile.ui.file.FileOpenType
;
import
cn.garymb.ygomobile.ui.file.FileOpenType
;
...
@@ -28,18 +32,6 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -28,18 +32,6 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
private
Preference
curPreference
;
private
Preference
curPreference
;
private
CurImageInfo
mCurImageInfo
;
private
CurImageInfo
mCurImageInfo
;
private
class
CurImageInfo
{
public
String
mOutFile
;
public
String
mCurTitle
;
public
boolean
mJpeg
;
public
int
width
;
public
int
height
;
public
CurImageInfo
()
{
}
}
protected
void
onChooseFileOk
(
Preference
preference
,
String
file
)
{
protected
void
onChooseFileOk
(
Preference
preference
,
String
file
)
{
onPreferenceChange
(
preference
,
file
);
onPreferenceChange
(
preference
,
file
);
}
}
...
@@ -47,6 +39,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -47,6 +39,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
protected
void
onChooseFileFail
(
Preference
preference
)
{
protected
void
onChooseFileFail
(
Preference
preference
)
{
}
}
protected
void
showFolderChooser
(
Preference
preference
,
String
defPath
,
String
title
)
{
protected
void
showFolderChooser
(
Preference
preference
,
String
defPath
,
String
title
)
{
curPreference
=
preference
;
curPreference
=
preference
;
Intent
intent
=
FileActivity
.
getIntent
(
getActivity
(),
title
,
null
,
defPath
,
false
,
FileOpenType
.
SelectFolder
);
Intent
intent
=
FileActivity
.
getIntent
(
getActivity
(),
title
,
null
,
defPath
,
false
,
FileOpenType
.
SelectFolder
);
...
@@ -76,9 +69,9 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -76,9 +69,9 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
}
}
public
Context
getContext
()
{
public
Context
getContext
()
{
if
(
Build
.
VERSION
.
SDK_INT
>=
23
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
23
)
{
return
super
.
getContext
();
return
super
.
getContext
();
}
else
{
}
else
{
return
super
.
getActivity
();
return
super
.
getActivity
();
}
}
}
}
...
@@ -126,8 +119,9 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -126,8 +119,9 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
onChooseFileFail
(
preference
);
onChooseFileFail
(
preference
);
return
;
return
;
}
}
Log
.
i
(
"我是srcfile"
,
srcfile
+
""
);
File
file
=
new
File
(
info
.
mOutFile
);
File
file
=
new
File
(
info
.
mOutFile
);
Uri
saveimgUri
=
Uri
.
fromFile
(
file
);
Uri
saveimgUri
=
FileProvider
.
getUriForFile
(
getContext
(),
BuildConfig
.
APPLICATION_ID
+
".fallenstardust"
,
file
);
Intent
intent
=
new
Intent
(
"com.android.camera.action.CROP"
);
Intent
intent
=
new
Intent
(
"com.android.camera.action.CROP"
);
intent
.
setDataAndType
(
srcfile
,
"image/*"
);
intent
.
setDataAndType
(
srcfile
,
"image/*"
);
// 下面这个crop=true是设置在开启的Intent中设置显示的VIEW可裁剪
// 下面这个crop=true是设置在开启的Intent中设置显示的VIEW可裁剪
...
@@ -143,9 +137,11 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -143,9 +137,11 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
intent
.
putExtra
(
"return-data"
,
false
);
intent
.
putExtra
(
"return-data"
,
false
);
intent
.
putExtra
(
MediaStore
.
EXTRA_OUTPUT
,
saveimgUri
);
intent
.
putExtra
(
MediaStore
.
EXTRA_OUTPUT
,
saveimgUri
);
intent
.
putExtra
(
"outputFormat"
,
info
.
mJpeg
?
Bitmap
.
CompressFormat
.
JPEG
.
toString
()
:
Bitmap
.
CompressFormat
.
PNG
.
toString
());
intent
.
putExtra
(
"outputFormat"
,
info
.
mJpeg
?
Bitmap
.
CompressFormat
.
JPEG
.
toString
()
:
Bitmap
.
CompressFormat
.
PNG
.
toString
());
intent
.
addFlags
(
Intent
.
FLAG_GRANT_READ_URI_PERMISSION
|
Intent
.
FLAG_GRANT_WRITE_URI_PERMISSION
);
try
{
try
{
startActivityForResult
(
Intent
.
createChooser
(
intent
,
info
.
mCurTitle
),
Constants
.
REQUEST_CUT_IMG
);
startActivityForResult
(
Intent
.
createChooser
(
intent
,
info
.
mCurTitle
),
Constants
.
REQUEST_CUT_IMG
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
Log
.
i
(
"我是e"
,
e
+
""
);
Toast
.
makeText
(
getActivity
(),
R
.
string
.
no_find_image_cutor
,
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
getActivity
(),
R
.
string
.
no_find_image_cutor
,
Toast
.
LENGTH_SHORT
).
show
();
}
}
}
}
...
@@ -155,6 +151,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -155,6 +151,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
// Log.i("kk", "result "+requestCode+",data="+data);
// Log.i("kk", "result "+requestCode+",data="+data);
if
(
requestCode
==
Constants
.
REQUEST_CHOOSE_IMG
)
{
if
(
requestCode
==
Constants
.
REQUEST_CHOOSE_IMG
)
{
Log
.
i
(
"我是“data.getData”"
,
"“"
+
data
.
getData
()
+
"”"
);
if
(
resultCode
==
Activity
.
RESULT_OK
)
{
if
(
resultCode
==
Activity
.
RESULT_OK
)
{
Uri
file
=
data
.
getData
();
Uri
file
=
data
.
getData
();
// onChooseFileOk(curPreference, mOutFile);
// onChooseFileOk(curPreference, mOutFile);
...
@@ -181,7 +178,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -181,7 +178,7 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
}
}
}
}
onChooseFileFail
(
curPreference
);
onChooseFileFail
(
curPreference
);
}
else
if
(
requestCode
==
Constants
.
REQUEST_CHOOSE_FOLDER
)
{
}
else
if
(
requestCode
==
Constants
.
REQUEST_CHOOSE_FOLDER
)
{
//选择文件
//选择文件
if
(
data
!=
null
)
{
if
(
data
!=
null
)
{
Uri
uri
=
data
.
getData
();
Uri
uri
=
data
.
getData
();
...
@@ -199,14 +196,6 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -199,14 +196,6 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
public
static
class
SharedPreferencesPlus
implements
SharedPreferences
{
public
static
class
SharedPreferencesPlus
implements
SharedPreferences
{
public
static
SharedPreferencesPlus
create
(
Context
context
,
String
name
)
{
return
create
(
context
,
name
,
Context
.
MODE_PRIVATE
|
Context
.
MODE_MULTI_PROCESS
);
}
public
static
SharedPreferencesPlus
create
(
Context
context
,
String
name
,
int
mode
)
{
return
new
SharedPreferencesPlus
(
context
,
name
,
mode
);
}
private
SharedPreferences
mSharedPreferences
;
private
SharedPreferences
mSharedPreferences
;
private
boolean
autoSave
=
false
;
private
boolean
autoSave
=
false
;
private
boolean
isMultiProess
=
false
;
private
boolean
isMultiProess
=
false
;
...
@@ -216,6 +205,14 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -216,6 +205,14 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
isMultiProess
=
(
mode
&
Context
.
MODE_MULTI_PROCESS
)
==
Context
.
MODE_MULTI_PROCESS
;
isMultiProess
=
(
mode
&
Context
.
MODE_MULTI_PROCESS
)
==
Context
.
MODE_MULTI_PROCESS
;
}
}
public
static
SharedPreferencesPlus
create
(
Context
context
,
String
name
)
{
return
create
(
context
,
name
,
Context
.
MODE_PRIVATE
|
Context
.
MODE_MULTI_PROCESS
);
}
public
static
SharedPreferencesPlus
create
(
Context
context
,
String
name
,
int
mode
)
{
return
new
SharedPreferencesPlus
(
context
,
name
,
mode
);
}
public
SharedPreferences
getSharedPreferences
()
{
public
SharedPreferences
getSharedPreferences
()
{
return
mSharedPreferences
;
return
mSharedPreferences
;
}
}
...
@@ -370,4 +367,16 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
...
@@ -370,4 +367,16 @@ public abstract class PreferenceFragmentPlus extends BasePreferenceFragment {
mSharedPreferences
.
unregisterOnSharedPreferenceChangeListener
(
listener
);
mSharedPreferences
.
unregisterOnSharedPreferenceChangeListener
(
listener
);
}
}
}
}
private
class
CurImageInfo
{
public
String
mOutFile
;
public
String
mCurTitle
;
public
boolean
mJpeg
;
public
int
width
;
public
int
height
;
public
CurImageInfo
()
{
}
}
}
}
mobile/src/main/res/xml/file_paths.xml
0 → 100644
View file @
225ea61b
<?xml version="1.0" encoding="utf-8"?>
<paths>
<files-path
name=
"fallenstardust"
path=
"."
/>
<cache-path
name=
"keyoyu"
path=
"."
/>
<external-cache-path
name=
"feihuaduo"
path=
"."
/>
<external-files-path
name=
"mercury"
path=
"."
/>
<external-path
name=
"garymb"
path=
"."
/>
</paths>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment