Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haihang
Overview
Overview
Details
Activity
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
徐丛奇
haihang
Commits
688ab0f0
Commit
688ab0f0
authored
Sep 11, 2018
by
徐丛奇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sssss
parent
00affc7a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
55 additions
and
31 deletions
+55
-31
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+14
-1
CrashHandler.java
app/src/main/java/com/oo/eye/CrashHandler.java
+11
-22
EyeApplication.java
app/src/main/java/com/oo/eye/EyeApplication.java
+0
-1
UsbReceiver.java
app/src/main/java/com/oo/eye/UsbReceiver.java
+25
-0
EyeTestActivity.java
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
+2
-1
AndroidManifest.xml
library/baselibrary/src/main/AndroidManifest.xml
+1
-3
BaseActivity.java
library/baselibrary/src/main/java/com/app/baselibrary/base/common/BaseActivity.java
+2
-3
No files found.
app/src/main/AndroidManifest.xml
View file @
688ab0f0
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.oo.eye"
>
package=
"com.oo.eye"
>
<!-- usb权限-->
<uses-permission
android:name=
"android.permission.BLUETOOTH"
/>
<uses-permission
android:name=
"android.permission.BLUETOOTH_ADMIN"
/>
<uses-permission
android:name=
"android.permission.READ_SETTINGS"
/>
<application
<application
android:name=
".EyeApplication"
android:name=
".EyeApplication"
android:allowBackup=
"true"
android:allowBackup=
"true"
...
@@ -12,6 +15,7 @@
...
@@ -12,6 +15,7 @@
<activity
<activity
android:name=
".activity.EyeTestMainActivity"
android:name=
".activity.EyeTestMainActivity"
android:launchMode=
"singleTask"
android:launchMode=
"singleTask"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
android:screenOrientation=
"landscape"
>
android:screenOrientation=
"landscape"
>
<intent-filter>
<intent-filter>
...
@@ -22,32 +26,40 @@
...
@@ -22,32 +26,40 @@
</activity>
</activity>
<activity
android:name=
".activity.SinglePeopleTestActivity"
<activity
android:name=
".activity.SinglePeopleTestActivity"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:launchMode=
"singleTop"
></activity>
android:launchMode=
"singleTop"
></activity>
<activity
android:name=
".activity.MorePeopleTestActivity"
<activity
android:name=
".activity.MorePeopleTestActivity"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
android:launchMode=
"singleTop"
></activity>
android:launchMode=
"singleTop"
></activity>
<activity
android:name=
".activity.TestListActivity"
<activity
android:name=
".activity.TestListActivity"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
android:launchMode=
"singleTop"
></activity>
android:launchMode=
"singleTop"
></activity>
<activity
android:name=
".activity.TestResurtListActivity"
<activity
android:name=
".activity.TestResurtListActivity"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:windowSoftInputMode=
"stateAlwaysHidden|adjustPan"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:screenOrientation=
"landscape"
android:screenOrientation=
"landscape"
android:launchMode=
"singleTop"
></activity>
android:launchMode=
"singleTop"
></activity>
<activity
<activity
android:name=
"com.oo.eye.activity.BeforeEyeTestActivity"
android:name=
"com.oo.eye.activity.BeforeEyeTestActivity"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
android:screenOrientation=
"landscape"
/>
android:screenOrientation=
"landscape"
/>
<activity
<activity
android:name=
"com.oo.eye.activity.EyeTestActivity"
android:name=
"com.oo.eye.activity.EyeTestActivity"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
android:screenOrientation=
"landscape"
/>
android:screenOrientation=
"landscape"
/>
<activity
<activity
android:name=
"com.oo.eye.activity.EyeSettingActivity"
android:name=
"com.oo.eye.activity.EyeSettingActivity"
android:configChanges=
"orientation|keyboardHidden|keyboard|navigation"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
android:screenOrientation=
"landscape"
/>
android:screenOrientation=
"landscape"
/>
</application>
</application>
</manifest>
</manifest>
\ No newline at end of file
app/src/main/java/com/oo/eye/CrashHandler.java
View file @
688ab0f0
...
@@ -6,9 +6,9 @@ import android.content.pm.PackageInfo;
...
@@ -6,9 +6,9 @@ import android.content.pm.PackageInfo;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager
;
import
android.content.pm.PackageManager.NameNotFoundException
;
import
android.content.pm.PackageManager.NameNotFoundException
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Looper
;
import
android.util.Log
;
import
android.util.Log
;
import
android.widget.Toast
;
import
com.app.baselibrary.commonUtil.ToastUtil
;
import
java.io.PrintWriter
;
import
java.io.PrintWriter
;
import
java.io.StringWriter
;
import
java.io.StringWriter
;
...
@@ -75,19 +75,19 @@ public class CrashHandler implements UncaughtExceptionHandler {
...
@@ -75,19 +75,19 @@ public class CrashHandler implements UncaughtExceptionHandler {
*/
*/
@Override
@Override
public
void
uncaughtException
(
Thread
thread
,
Throwable
ex
)
{
public
void
uncaughtException
(
Thread
thread
,
Throwable
ex
)
{
ex
.
printStackTrace
(
);
ToastUtil
.
showLongMessage
(
"uncaughtException"
);
if
(!
handleException
(
ex
)
&&
mDefaultHandler
!=
null
)
{
if
(!
handleException
(
ex
)
&&
mDefaultHandler
!=
null
)
{
//如果用户没有处理则让系统默认的异常处理器来处理
//如果用户没有处理则让系统默认的异常处理器来处理
mDefaultHandler
.
uncaughtException
(
thread
,
ex
);
mDefaultHandler
.
uncaughtException
(
thread
,
ex
);
}
else
{
}
else
{
try
{
//
try {
Thread
.
sleep
(
2000
);
//
Thread.sleep(2000);
}
catch
(
InterruptedException
e
)
{
//
} catch (InterruptedException e) {
Log
.
e
(
TAG
,
"error : "
,
e
);
//
Log.e(TAG, "error : ", e);
}
//
}
//退出程序
//
//退出程序
android
.
os
.
Process
.
killProcess
(
android
.
os
.
Process
.
myPid
());
//
android.os.Process.killProcess(android.os.Process.myPid());
System
.
exit
(
0
);
//
System.exit(0);
}
}
}
}
...
@@ -101,17 +101,6 @@ public class CrashHandler implements UncaughtExceptionHandler {
...
@@ -101,17 +101,6 @@ public class CrashHandler implements UncaughtExceptionHandler {
if
(
ex
==
null
)
{
if
(
ex
==
null
)
{
return
false
;
return
false
;
}
}
//使用Toast来显示异常信息
new
Thread
()
{
@Override
public
void
run
()
{
Looper
.
prepare
();
Toast
.
makeText
(
mContext
,
"很抱歉,程序出现异常,即将退出."
,
Toast
.
LENGTH_LONG
).
show
();
Looper
.
loop
();
}
}.
start
();
//收集设备参数信息
// collectDeviceInfo(mContext);
//保存日志文件
//保存日志文件
saveCrashInfo2File
(
ex
);
saveCrashInfo2File
(
ex
);
return
true
;
return
true
;
...
...
app/src/main/java/com/oo/eye/EyeApplication.java
View file @
688ab0f0
...
@@ -3,7 +3,6 @@ package com.oo.eye;
...
@@ -3,7 +3,6 @@ package com.oo.eye;
import
com.app.baselibrary.base.app.BaseApplication
;
import
com.app.baselibrary.base.app.BaseApplication
;
import
com.app.baselibrary.commonUtil.BDttsUtils
;
import
com.app.baselibrary.commonUtil.BDttsUtils
;
import
com.app.baselibrary.commonUtil.LogUtil
;
import
com.app.baselibrary.commonUtil.LogUtil
;
import
com.oo.eye.db.DbManager
;
import
com.oo.seex.netlibrary.net.BaseApiConfig
;
import
com.oo.seex.netlibrary.net.BaseApiConfig
;
/**
/**
...
...
app/src/main/java/com/oo/eye/UsbReceiver.java
0 → 100644
View file @
688ab0f0
package
com
.
oo
.
eye
;
import
android.content.BroadcastReceiver
;
import
android.content.Context
;
import
android.content.Intent
;
import
com.app.baselibrary.commonUtil.ToastUtil
;
/**
* Created by xucon on 2018/9/11.
*/
public
class
UsbReceiver
extends
BroadcastReceiver
{
@Override
public
void
onReceive
(
Context
context
,
Intent
intent
)
{
String
action
=
intent
.
getAction
();
if
(
action
.
equals
(
Intent
.
ACTION_MEDIA_EJECT
))
{
ToastUtil
.
showLongMessage
(
"移除"
);
//USB设备移除,更新UI
}
else
if
(
action
.
equals
(
Intent
.
ACTION_MEDIA_MOUNTED
))
{
ToastUtil
.
showLongMessage
(
"插入"
);
//USB设备挂载,更新UI
}
}
}
app/src/main/java/com/oo/eye/activity/EyeTestActivity.java
View file @
688ab0f0
...
@@ -169,6 +169,7 @@ public class EyeTestActivity extends BaseActivity {
...
@@ -169,6 +169,7 @@ public class EyeTestActivity extends BaseActivity {
private
void
prepareStudentTest
(
int
index
){
private
void
prepareStudentTest
(
int
index
){
currentIndex
=
index
;
currentIndex
=
index
;
isStartTest
=
false
;
isStartTest
=
false
;
mCollect
.
clear
();
measureStudent
=
mStudentList
.
get
(
index
).
transition
(
mDistance
);
measureStudent
=
mStudentList
.
get
(
index
).
transition
(
mDistance
);
if
(
measureStudent
.
getRealname
()
!=
null
||
!
TextUtils
.
isEmpty
(
measureStudent
.
getRealname
()))
{
if
(
measureStudent
.
getRealname
()
!=
null
||
!
TextUtils
.
isEmpty
(
measureStudent
.
getRealname
()))
{
nameText
.
setText
(
measureStudent
.
getRealname
());
nameText
.
setText
(
measureStudent
.
getRealname
());
...
@@ -499,7 +500,7 @@ public class EyeTestActivity extends BaseActivity {
...
@@ -499,7 +500,7 @@ public class EyeTestActivity extends BaseActivity {
}
}
//必须答对一半才往下走一行的
//必须答对一半才往下走一行的
//如果错误次数超过一半 (默认位置时上一行没有数据时候)回退一行
//如果错误次数超过一半 (默认位置时上一行没有数据时候)回退一行
if
(
errorCount
>
=
verifyErrorCount
)
{
if
(
errorCount
>
verifyErrorCount
)
{
//如果上一行数据不为空 结束测试
//如果上一行数据不为空 结束测试
if
(
mLevelIndex
==
0
||
if
(
mLevelIndex
==
0
||
(
mCollect
.
containsKey
(
mLevelIndex
-
1
)
&&
!
CheckUtil
.
isEmpty
(
mCollect
.
get
(
mLevelIndex
-
1
))))
{
(
mCollect
.
containsKey
(
mLevelIndex
-
1
)
&&
!
CheckUtil
.
isEmpty
(
mCollect
.
get
(
mLevelIndex
-
1
))))
{
...
...
library/baselibrary/src/main/AndroidManifest.xml
View file @
688ab0f0
...
@@ -22,9 +22,7 @@
...
@@ -22,9 +22,7 @@
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<application
android:allowBackup=
"true"
<application
>
android:label=
"@string/app_name"
android:supportsRtl=
"true"
>
<meta-data
<meta-data
android:name=
"com.app.baselibrary.image.OkHttpGlideModule"
android:name=
"com.app.baselibrary.image.OkHttpGlideModule"
android:value=
"GlideModule"
/>
android:value=
"GlideModule"
/>
...
...
library/baselibrary/src/main/java/com/app/baselibrary/base/common/BaseActivity.java
View file @
688ab0f0
...
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo;
...
@@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo;
import
android.content.res.Configuration
;
import
android.content.res.Configuration
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.v4.content.ContextCompat
;
import
android.support.v4.content.ContextCompat
;
import
android.view.Window
;
import
com.app.baselibrary.BuildConfig
;
import
com.app.baselibrary.BuildConfig
;
import
com.app.baselibrary.R
;
import
com.app.baselibrary.R
;
...
@@ -47,9 +46,9 @@ public abstract class BaseActivity extends RxAppCompatActivity {
...
@@ -47,9 +46,9 @@ public abstract class BaseActivity extends RxAppCompatActivity {
// 把actvity放到application栈中管理
// 把actvity放到application栈中管理
AppManager
.
getInstance
().
addActivity
(
this
);
AppManager
.
getInstance
().
addActivity
(
this
);
// 无标题
// 无标题
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
//
requestWindowFeature(Window.FEATURE_NO_TITLE);
//设置状态栏的主颜色:
//设置状态栏的主颜色:
SetTranslanteBar
();
//
SetTranslanteBar();
}
}
...
...
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