Skip to content

Commit

Permalink
Merge pull request NetEase#86 from NetEase/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@andrewleo
andrewleo authored Jun 13, 2017
2 parents 868d52d + e164c4a commit 5d166f8
Show file tree
Hide file tree
Showing 20 changed files with 628 additions and 94 deletions.
1 change: 1 addition & 0 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="libs/commons-io-2.5.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
77 changes: 44 additions & 33 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,58 @@
<?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.netease.qa.emmagee"
android:versionCode="32"
android:versionName="2.4.1" >

<uses-sdk android:minSdkVersion="8" />

<application android:name=".utils.MyApplication"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">

<application
android:name=".utils.MyApplication"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar" >
<activity
android:name=".activity.MainPageActivity"
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleInstance"
android:screenOrientation="portrait">
android:name=".activity.MainPageActivity"
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleInstance"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".activity.SettingsActivity"
android:launchMode="singleInstance"
android:screenOrientation="portrait"
android:theme="@style/customTheme" />
<activity
android:name=".activity.AboutActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.MailSettingsActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.TestListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".activity.TestReportActivity"
android:screenOrientation="portrait" />

<activity android:name=".activity.SettingsActivity"
android:theme="@style/customTheme"
android:screenOrientation="portrait"/>

<activity android:name=".activity.AboutActivity"
android:screenOrientation="portrait"/>

<activity android:name=".activity.MailSettingsActivity"
android:screenOrientation="portrait"/>

<service android:name="com.netease.qa.emmagee.service.EmmageeService"/>
<service android:name="com.netease.qa.emmagee.service.EmmageeService" />
</application>

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_LOGS"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.GET_TASKS"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />

</manifest>
Binary file added libs/commons-io-2.5.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-8
target=android-19
15 changes: 15 additions & 0 deletions res/drawable/table_border.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<stroke
android:width="1dp"
android:color="@color/gray" />

<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />

</shape>
62 changes: 62 additions & 0 deletions res/layout/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:clickable="false"
android:background="@drawable/custom_checkbox"
android:button="@null"
android:checked="true"
Expand Down Expand Up @@ -131,12 +132,41 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:clickable="false"
android:background="@drawable/custom_checkbox"
android:button="@null"
android:checked="true"
android:paddingLeft="@dimen/image_padding"
android:paddingRight="@dimen/image_padding" />
</RelativeLayout>

<RelativeLayout
android:id="@+id/wake_lock_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/layout_vertical_margin_small" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wake_lock"
android:textColor="@color/black"
android:textSize="@dimen/text_size" />

<CheckBox
android:id="@+id/wake_lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:clickable="false"
android:background="@drawable/custom_checkbox"
android:button="@null"
android:checked="false"
android:paddingLeft="@dimen/image_padding"
android:paddingRight="@dimen/image_padding" />
</RelativeLayout>

<LinearLayout
android:id="@+id/heap_item"
Expand Down Expand Up @@ -169,6 +199,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:clickable="false"
android:background="@drawable/custom_checkbox"
android:button="@null"
android:checked="false"
Expand All @@ -185,7 +216,38 @@
android:layout_marginTop="@dimen/textview_horizontal_margin"
android:background="@color/white"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/test_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="@dimen/layout_vertical_margin_small" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/test_report"
android:textColor="@color/black"
android:textSize="@dimen/text_size" />

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="right" >

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/right_arrow"
android:textSize="@dimen/text_size" />
</LinearLayout>
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="@dimen/line_height"
android:background="@color/light_gray" />

<LinearLayout
android:id="@+id/mail_settings"
android:layout_width="match_parent"
Expand Down
14 changes: 14 additions & 0 deletions res/layout/table_row.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/attrib_name"
android:textStyle="bold"/>
<TextView
android:id="@+id/attrib_value"
android:gravity="right"
android:textStyle="normal"/>

</LinearLayout>
28 changes: 28 additions & 0 deletions res/layout/test_list.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/light_purple"
android:gravity="bottom|center_horizontal|center_vertical"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/navigation_bar" />
</LinearLayout>

<ListView
android:id="@+id/test_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:cacheColorHint="@color/light_purple"
android:listSelector="@color/light_purple" />

</LinearLayout>
19 changes: 19 additions & 0 deletions res/layout/test_list_item.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal" >

<TextView
android:id="@+id/package_name"
android:layout_width="fill_parent"
android:layout_height="50dp"
android:ellipsize="end"
android:textSize="18sp"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="#5B5B5B"
android:paddingLeft="10dp"
android:paddingRight="10dp" />

</LinearLayout>
40 changes: 40 additions & 0 deletions res/layout/test_report.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/light_purple"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >

<include
android:layout_width="match_parent"
android:layout_height="wrap_content"
layout="@layout/navigation_bar" />
</LinearLayout>

<ScrollView
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="horizontal|vertical" >

<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<TableLayout
android:id="@+id/table_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginLeft="3dp"
android:layout_marginRight="3dp"
android:layout_marginTop="3dp" >
</TableLayout>
</HorizontalScrollView>
</ScrollView>

</LinearLayout>
4 changes: 4 additions & 0 deletions res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,8 @@

<string name="update_list">列表更新成功</string>
<string name="nougat_warning">由于Google的限制，Emmagee无法支持7.0及以上版本</string>

<string name="wake_lock">屏幕保持常亮</string>
<string name="wake_lock_on_toast">WakeLock已开启，屏幕会保持常亮</string>
<string name="test_report">测试报告</string>
</resources>
3 changes: 3 additions & 0 deletions res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,7 @@

<string name="update_list">Update List Successfully</string>
<string name="nougat_warning">Don\'t support 7.0 and above while Google has restricted access to shell commands and file system</string>
<string name="wake_lock">WakeLock</string>
<string name="wake_lock_on_toast">WakeLock is on，screen will stay awake</string>
<string name="test_report">Test Reports</string>
</resources>
Loading

0 comments on commit 5d166f8

Please sign in to comment.