Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_fiveworld
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
android
android_fiveworld
Commits
2430edcb
Commit
2430edcb
authored
Nov 23, 2021
by
mengcuiguang2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
ae070a72
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
3 additions
and
72 deletions
+3
-72
merge-state
...termediates/incremental/debug-mergeNativeLibs/merge-state
+0
-0
merger.xml
...ermediates/incremental/mergeDebugJniLibFolders/merger.xml
+0
-2
merger.xml
...ld/intermediates/incremental/mergeDebugShaders/merger.xml
+0
-2
merger.xml
...d/intermediates/incremental/packageDebugAssets/merger.xml
+0
-2
compile-file-map.properties
...emental/packageDebugResources/compile-file-map.properties
+0
-1
merger.xml
...ntermediates/incremental/packageDebugResources/merger.xml
+0
-26
manifest-merger-blame-debug-report.txt
...e_blame_file/debug/manifest-merger-blame-debug-report.txt
+0
-11
manifest-merger-debug-report.txt
...brary/build/outputs/logs/manifest-merger-debug-report.txt
+0
-25
Constant.kt
app/src/main/java/com/mints/fiveworld/common/Constant.kt
+1
-1
dialog_power.xml
app/src/main/res/layout/dialog_power.xml
+1
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
animlibrary/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
deleted
100644 → 0
View file @
ae070a72
File deleted
animlibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
deleted
100644 → 0
View file @
ae070a72
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\jniLibs"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\jniLibs"
/></dataSet></merger>
\ No newline at end of file
animlibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml
deleted
100644 → 0
View file @
ae070a72
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\shaders"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\shaders"
/></dataSet></merger>
\ No newline at end of file
animlibrary/build/intermediates/incremental/packageDebugAssets/merger.xml
deleted
100644 → 0
View file @
ae070a72
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
config=
"main"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\assets"
/><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\intermediates\shader_assets\debug\out"
/></dataSet><dataSet
config=
"debug"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\assets"
/></dataSet></merger>
\ No newline at end of file
animlibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
deleted
100644 → 0
View file @
ae070a72
#Mon Nov 22 18:00:03 CST 2021
animlibrary/build/intermediates/incremental/packageDebugResources/merger.xml
deleted
100644 → 0
View file @
ae070a72
<?xml version="1.0" encoding="utf-8"?>
<merger
version=
"3"
><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res"
/><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\rs\debug"
/><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\resValues\debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"main"
generated-set=
"main$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res"
><file
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\res\values\attrs.xml"
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTimePerGlyph"
/>
<attr
format=
"string"
name=
"animatedSvgFillStart"
/>
<attr
format=
"string"
name=
"animatedSvgFillTime"
/>
<attr
format=
"reference"
name=
"animatedSvgGlyphStrings"
/>
<attr
format=
"reference"
name=
"animatedSvgTraceColors"
/>
<attr
format=
"reference"
name=
"animatedSvgTraceResidueColors"
/>
<attr
format=
"integer"
name=
"animatedSvgTraceMarkerLength"
/>
<attr
format=
"reference"
name=
"animatedSvgFillColors"
/>
</declare-styleable></file></source><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\rs\debug"
/><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\build\generated\res\resValues\debug"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug$Generated"
generated=
"true"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\res"
/></dataSet><dataSet
aapt-namespace=
"http://schemas.android.com/apk/res-auto"
config=
"debug"
generated-set=
"debug$Generated"
ignore_pattern=
"!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"
><source
path=
"D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\debug\res"
/></dataSet><mergedItems><configuration
qualifiers=
""
><declare-styleable
name=
"AnimatedSvgView"
>
<attr
format=
"integer"
name=
"animatedSvgImageSizeX"
/>
<attr
format=
"integer"
name=
"animatedSvgImageSizeY"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTime"
/>
<attr
format=
"string"
name=
"animatedSvgTraceTimePerGlyph"
/>
<attr
format=
"string"
name=
"animatedSvgFillStart"
/>
<attr
format=
"string"
name=
"animatedSvgFillTime"
/>
<attr
format=
"reference"
name=
"animatedSvgGlyphStrings"
/>
<attr
format=
"reference"
name=
"animatedSvgTraceColors"
/>
<attr
format=
"reference"
name=
"animatedSvgTraceResidueColors"
/>
<attr
format=
"integer"
name=
"animatedSvgTraceMarkerLength"
/>
<attr
format=
"reference"
name=
"animatedSvgFillColors"
/>
</declare-styleable></configuration></mergedItems></merger>
\ No newline at end of file
animlibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
deleted
100644 → 0
View file @
ae070a72
1<?xml version="1.0" encoding="utf-8"?>
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.jaredrummler.android.animatedsvgview" >
4
5 <uses-sdk
6 android:minSdkVersion="14"
6-->D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
7 android:targetSdkVersion="28" />
7-->D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
8
9</manifest>
animlibrary/build/outputs/logs/manifest-merger-debug-report.txt
deleted
100644 → 0
View file @
ae070a72
-- Merging decision tree log ---
manifest
ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
package
ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:11-61
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml:1:1-63
uses-sdk
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
ADDED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
INJECTED from D:\android_space\My5GWorld\android_fiveworld\animlibrary\src\main\AndroidManifest.xml
app/src/main/java/com/mints/fiveworld/common/Constant.kt
View file @
2430edcb
...
...
@@ -17,7 +17,7 @@ object Constant {
/**
* app名称
*/
const
val
MINTS_APP_NAME
=
"5G世界"
const
val
MINTS_APP_NAME
=
"5G世界
清理
"
/**
* 应用包名
...
...
app/src/main/res/layout/dialog_power.xml
View file @
2430edcb
...
...
@@ -38,7 +38,7 @@
android:layout_marginLeft=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginRight=
"16dp"
android:text=
"我们依据最新的法律,向您说明5G世界软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
android:text=
"我们依据最新的法律,向您说明5G世界
清理
软件的隐私政策,特向您推送本提示。请您阅读并充分理解相关条款。"
android:textColor=
"@color/black"
android:textSize=
"14sp"
/>
...
...
app/src/main/res/values/strings.xml
View file @
2430edcb
<resources>
<string
name=
"appName"
>
5G世界
</string>
<string
name=
"appName"
>
5G世界
清理
</string>
<string
name=
"netfail"
>
网络异常,请检查网络
</string>
<string
name=
"notifyTitle"
>
提示
</string>
...
...
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