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
2edadf4b
Commit
2edadf4b
authored
Dec 13, 2018
by
feihuaduo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
本地日志输出,优化调试
parent
f0738a91
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
163 additions
and
12 deletions
+163
-12
libcore/src/main/java/cn/garymb/ygomobile/utils/FullScreenUtils.java
.../main/java/cn/garymb/ygomobile/utils/FullScreenUtils.java
+1
-1
mobile/src/main/AndroidManifest.xml
mobile/src/main/AndroidManifest.xml
+1
-0
mobile/src/main/java/cn/garymb/ygomobile/AppsSettings.java
mobile/src/main/java/cn/garymb/ygomobile/AppsSettings.java
+31
-8
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/FileLogActivity.java
...va/cn/garymb/ygomobile/ui/activities/FileLogActivity.java
+49
-0
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
...c/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
+12
-1
mobile/src/main/java/cn/garymb/ygomobile/utils/FileLogUtil.java
.../src/main/java/cn/garymb/ygomobile/utils/FileLogUtil.java
+51
-2
mobile/src/main/res/layout/file_log_activity.xml
mobile/src/main/res/layout/file_log_activity.xml
+18
-0
No files found.
libcore/src/main/java/cn/garymb/ygomobile/utils/FullScreenUtils.java
View file @
2edadf4b
...
@@ -8,7 +8,7 @@ public class FullScreenUtils {
...
@@ -8,7 +8,7 @@ public class FullScreenUtils {
private
boolean
isFullscreen
;
private
boolean
isFullscreen
;
private
Activity
activity
;
private
Activity
activity
;
private
static
final
int
windowsFlags
=
private
static
final
int
windowsFlags
=
Build
.
VERSION
.
SDK_INT
>=
19
?
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
?
(
View
.
SYSTEM_UI_FLAG_LAYOUT_STABLE
View
.
SYSTEM_UI_FLAG_LAYOUT_STABLE
|
View
.
SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
View
.
SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
View
.
SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
View
.
SYSTEM_UI_FLAG_HIDE_NAVIGATION
...
...
mobile/src/main/AndroidManifest.xml
View file @
2edadf4b
...
@@ -169,6 +169,7 @@
...
@@ -169,6 +169,7 @@
android:label=
"@string/app_name"
/>
android:label=
"@string/app_name"
/>
<activity
<activity
android:name=
"cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity"
/>
android:name=
"cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity"
/>
<activity
android:name=
"cn.garymb.ygomobile.ui.activities.FileLogActivity"
/>
<service
<service
android:name=
"cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"
android:name=
"cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant"
android:priority=
"1000"
/>
android:priority=
"1000"
/>
...
...
mobile/src/main/java/cn/garymb/ygomobile/AppsSettings.java
View file @
2edadf4b
...
@@ -12,6 +12,7 @@ import org.json.JSONArray;
...
@@ -12,6 +12,7 @@ import org.json.JSONArray;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileFilter
;
import
java.io.FileFilter
;
import
java.io.IOException
;
import
java.lang.reflect.Method
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
...
@@ -19,6 +20,7 @@ import java.util.List;
...
@@ -19,6 +20,7 @@ import java.util.List;
import
java.util.Locale
;
import
java.util.Locale
;
import
cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus
;
import
cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus
;
import
cn.garymb.ygomobile.utils.FileLogUtil
;
import
cn.garymb.ygomobile.utils.ScreenUtil
;
import
cn.garymb.ygomobile.utils.ScreenUtil
;
import
cn.garymb.ygomobile.utils.SystemUtils
;
import
cn.garymb.ygomobile.utils.SystemUtils
;
...
@@ -121,28 +123,49 @@ public class AppsSettings {
...
@@ -121,28 +123,49 @@ public class AppsSettings {
DisplayMetrics
dm
=
SystemUtils
.
getHasVirtualDisplayMetrics
((
Activity
)
context
);
DisplayMetrics
dm
=
SystemUtils
.
getHasVirtualDisplayMetrics
((
Activity
)
context
);
if
(
dm
!=
null
)
{
if
(
dm
!=
null
)
{
int
height
=
Math
.
max
(
dm
.
widthPixels
,
dm
.
heightPixels
);
int
height
=
Math
.
max
(
dm
.
widthPixels
,
dm
.
heightPixels
);
Log
.
e
(
"YGOMobile"
,
"原始高"
+
mScreenHeight
);
try
{
FileLogUtil
.
writeAndTime
(
"原始长"
+
mScreenHeight
);
FileLogUtil
.
writeAndTime
(
"原始宽"
+
mScreenWidth
);
FileLogUtil
.
writeAndTime
(
"界面长"
+
dm
.
heightPixels
);
FileLogUtil
.
writeAndTime
(
"界面宽"
+
dm
.
widthPixels
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
Log
.
e
(
"YGOMobile"
,
"原始长"
+
mScreenHeight
);
Log
.
e
(
"YGOMobile"
,
"原始宽"
+
mScreenWidth
);
Log
.
e
(
"YGOMobile"
,
"原始宽"
+
mScreenWidth
);
Log
.
e
(
"YGOMobile"
,
"界面
高
"
+
dm
.
heightPixels
);
Log
.
e
(
"YGOMobile"
,
"界面
长
"
+
dm
.
heightPixels
);
Log
.
e
(
"YGOMobile"
,
"界面宽"
+
dm
.
widthPixels
);
Log
.
e
(
"YGOMobile"
,
"界面宽"
+
dm
.
widthPixels
);
if
(
mScreenHeight
>
mScreenWidth
)
{
//
if (mScreenHeight> mScreenWidth) {
mScreenHeight
=
height
;
//
mScreenHeight = height;
}
else
{
//
} else {
mScreenWidth
=
height
;
//
mScreenWidth = height;
}
//
}
ScreenUtil
.
findNotchInformation
(((
Activity
)
context
),
new
ScreenUtil
.
FindNotchInformation
()
{
ScreenUtil
.
findNotchInformation
(((
Activity
)
context
),
new
ScreenUtil
.
FindNotchInformation
()
{
@Override
@Override
public
void
onNotchInformation
(
boolean
isNotch
,
int
notchHeight
,
int
phoneType
)
{
public
void
onNotchInformation
(
boolean
isNotch
,
int
notchHeight
,
int
phoneType
)
{
int
height
=
Math
.
max
(
dm
.
widthPixels
,
dm
.
heightPixels
);
int
height
=
Math
.
max
(
dm
.
widthPixels
,
dm
.
heightPixels
);
if
(
isNotch
)
if
(
isNotch
)
{
try
{
FileLogUtil
.
writeAndTime
(
"刘海高"
+
notchHeight
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
height
-=
notchHeight
;
height
-=
notchHeight
;
}
if
(
mScreenHeight
>
mScreenWidth
)
{
if
(
mScreenHeight
>
mScreenWidth
)
{
mScreenHeight
=
height
;
mScreenHeight
=
height
;
}
else
{
}
else
{
mScreenWidth
=
height
;
mScreenWidth
=
height
;
}
}
try
{
FileLogUtil
.
writeAndTime
(
"转换后长"
+
mScreenHeight
);
FileLogUtil
.
writeAndTime
(
"转换后宽"
+
mScreenWidth
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
}
});
});
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/FileLogActivity.java
0 → 100644
View file @
2edadf4b
package
cn.garymb.ygomobile.ui.activities
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.Toolbar
;
import
android.view.View
;
import
android.widget.TextView
;
import
java.io.IOException
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.utils.FileLogUtil
;
public
class
FileLogActivity
extends
BaseActivity
{
private
TextView
tv_log
;
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
file_log_activity
);
Toolbar
toolbar
=
findViewById
(
R
.
id
.
toolbar
);
tv_log
=
$
(
R
.
id
.
tv_log
);
setSupportActionBar
(
toolbar
);
enableBackHome
();
setTitle
(
"本地Log输出"
);
read
();
tv_log
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
read
();
}
});
}
private
void
read
()
{
try
{
tv_log
.
setText
(
FileLogUtil
.
read
());
}
catch
(
IOException
e
)
{
tv_log
.
setText
(
"读取日志失败,点击重新读取"
);
}
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @
2edadf4b
...
@@ -28,6 +28,7 @@ import android.view.animation.AnimationUtils;
...
@@ -28,6 +28,7 @@ import android.view.animation.AnimationUtils;
import
android.view.inputmethod.EditorInfo
;
import
android.view.inputmethod.EditorInfo
;
import
android.widget.Button
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
android.widget.ImageView
;
import
android.widget.ListView
;
import
android.widget.ListView
;
import
android.widget.Toast
;
import
android.widget.Toast
;
...
@@ -57,6 +58,7 @@ import cn.garymb.ygomobile.bean.ServerInfo;
...
@@ -57,6 +58,7 @@ import cn.garymb.ygomobile.bean.ServerInfo;
import
cn.garymb.ygomobile.bean.events.ServerInfoEvent
;
import
cn.garymb.ygomobile.bean.events.ServerInfoEvent
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.ui.activities.BaseActivity
;
import
cn.garymb.ygomobile.ui.activities.BaseActivity
;
import
cn.garymb.ygomobile.ui.activities.FileLogActivity
;
import
cn.garymb.ygomobile.ui.activities.WebActivity
;
import
cn.garymb.ygomobile.ui.activities.WebActivity
;
import
cn.garymb.ygomobile.ui.adapters.ServerListAdapter
;
import
cn.garymb.ygomobile.ui.adapters.ServerListAdapter
;
import
cn.garymb.ygomobile.ui.adapters.SimpleListAdapter
;
import
cn.garymb.ygomobile.ui.adapters.SimpleListAdapter
;
...
@@ -411,6 +413,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
...
@@ -411,6 +413,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
doMenu
(
mMenuIds
.
get
(
index
));
doMenu
(
mMenuIds
.
get
(
index
));
}
}
});
});
}
}
private
void
addMenuButton
(
SparseArray
<
Integer
>
mMenuIds
,
BoomMenuButton
menuButton
,
int
menuId
,
int
stringId
,
int
image
)
{
private
void
addMenuButton
(
SparseArray
<
Integer
>
mMenuIds
,
BoomMenuButton
menuButton
,
int
menuId
,
int
stringId
,
int
image
)
{
...
@@ -526,7 +529,15 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
...
@@ -526,7 +529,15 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
public
void
AnimationShake
()
{
public
void
AnimationShake
()
{
Animation
shake
=
AnimationUtils
.
loadAnimation
(
this
,
R
.
anim
.
shake
);
//加载动画资源文件
Animation
shake
=
AnimationUtils
.
loadAnimation
(
this
,
R
.
anim
.
shake
);
//加载动画资源文件
findViewById
(
R
.
id
.
cube
).
startAnimation
(
shake
);
//给组件播放动画效果
ImageView
iv
=
findViewById
(
R
.
id
.
cube
);
iv
.
startAnimation
(
shake
);
//给组件播放动画效果
iv
.
setOnLongClickListener
(
new
View
.
OnLongClickListener
()
{
@Override
public
boolean
onLongClick
(
View
v
)
{
startActivity
(
new
Intent
(
HomeActivity
.
this
,
FileLogActivity
.
class
));
return
true
;
}
});
}
}
public
void
StartMycard
()
{
public
void
StartMycard
()
{
...
...
mobile/src/main/java/cn/garymb/ygomobile/utils/FileLogUtil.java
View file @
2edadf4b
package
cn.garymb.ygomobile.utils
;
package
cn.garymb.ygomobile.utils
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.FileWriter
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.UnsupportedEncodingException
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
cn.garymb.ygomobile.AppsSettings
;
public
class
FileLogUtil
{
public
class
FileLogUtil
{
public
static
void
write
(
String
messag
){
private
static
int
writeNum
=
0
;
//获取配置文件路径
public
static
File
getConfigFile
()
{
return
new
File
(
AppsSettings
.
get
().
getResourcePath
(),
"YGOMobile.log"
);
}
public
static
void
writeAndTime
(
String
message
)
throws
IOException
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"MM-dd HH:mm"
);
// HH:mm:ss
// 获取当前时间
Date
date
=
new
Date
(
System
.
currentTimeMillis
());
write
(
simpleDateFormat
.
format
(
date
)
+
": "
+
message
);
}
public
static
void
write
(
String
message
)
throws
IOException
{
FileWriter
fw
=
null
;
//如果文件存在,则追加内容;如果文件不存在,则创建文件
File
f
=
getConfigFile
();
fw
=
new
FileWriter
(
f
,
true
);
PrintWriter
pw
=
new
PrintWriter
(
fw
);
if
(
writeNum
==
0
)
pw
.
println
();
pw
.
println
(
message
);
writeNum
++;
pw
.
flush
();
fw
.
flush
();
pw
.
close
();
fw
.
close
();
}
}
public
static
void
read
(){
public
static
String
read
()
throws
IOException
{
String
encoding
=
"UTF-8"
;
File
file
=
getConfigFile
();
Long
filelength
=
file
.
length
();
byte
[]
filecontent
=
new
byte
[
filelength
.
intValue
()];
FileInputStream
in
=
new
FileInputStream
(
file
);
in
.
read
(
filecontent
);
in
.
close
();
return
new
String
(
filecontent
,
encoding
);
}
}
}
}
mobile/src/main/res/layout/file_log_activity.xml
0 → 100644
View file @
2edadf4b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/content_toolbar"
/>
<TextView
android:textStyle=
"bold"
android:id=
"@+id/tv_log"
android:textColor=
"@color/white"
android:textSize=
"18sp"
android:padding=
"15dp"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</LinearLayout>
\ 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