Skip to content

Commit

Permalink
Merge pull request #28 from NetEase/develop
Browse files Browse the repository at this point in the history
Emmagee 2.0
  • Loading branch information
andrewleo committed Sep 22, 2014
2 parents 244509a + 7f3cdf2 commit 39b8d2d
Show file tree
Hide file tree
Showing 44 changed files with 1,535 additions and 641 deletions.
59 changes: 30 additions & 29 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,45 +1,46 @@
<?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="1"
android:versionName="1.0" >
android:versionCode="30"
android:versionName="2.0" >

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

<application android:name=".utils.MyApplication"
android:icon="@drawable/icon"
android:label="@string/app_name" >
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
<activity
android:name=".activity.MainPageActivity"
android:label="@string/app_name"
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleInstance" > <!-- 防止程序横屏以后重新启动 -->
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.DEFAULT" /> -->
<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.SystemActivity"
android:label="@string/app_name2" >
</activity>

<activity
android:name=".activity.SettingsActivity"
android:label="@string/app_name4" >
</activity>

<service
android:name="com.netease.qa.emmagee.service.EmmageeService">
</service>
<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"/>
</application>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

<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.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.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
</manifest>
81 changes: 0 additions & 81 deletions gen/com/netease/qa/emmagee/R.java

This file was deleted.

2 changes: 1 addition & 1 deletion project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-10
target=android-8
Binary file added res/drawable-hdpi/actionbar_bg.9.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/bottom_bg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/btn_back.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/btn_save.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/btn_test.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/btn_test_press.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/checked_icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/goback.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/right_arrow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/seekbar_thumb_normal.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/seekbar_thumb_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/settings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/settings_pressed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/unchecked_icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions res/drawable/custom_checkbox.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/checked_icon" android:state_checked="true"></item>
<item android:drawable="@drawable/checked_icon" android:state_selected="true"></item>
<item android:drawable="@drawable/checked_icon" android:state_pressed="true"></item>
<item android:drawable="@drawable/unchecked_icon"></item>
</selector>
17 changes: 17 additions & 0 deletions res/drawable/custom_seekbar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<item>
<shape>
<solid android:color="@color/light_gray" />
</shape>
</item>
<item>
<clip>
<shape>
<solid android:color="@color/red" />
</shape>
</clip>
</item>

</layer-list>
23 changes: 23 additions & 0 deletions res/drawable/float_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<!-- border settings -->
<item>
<shape>
<solid android:color="@color/red" />
<corners android:radius="3dp" />
</shape>
</item>

<item
android:bottom="1dp"
android:right="1dp"
android:left="1dp"
android:top="1dp">
<shape>
<solid android:color="@color/mix_gray" />
<corners android:radius="3dp" />
</shape>
</item>

</layer-list>
8 changes: 8 additions & 0 deletions res/drawable/seekbar_thumb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/seekbar_thumb_normal" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/seekbar_thumb_pressed" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/seekbar_thumb_pressed" />
<item android:drawable="@drawable/seekbar_thumb_normal" />
</selector>
7 changes: 7 additions & 0 deletions res/drawable/settings_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/settings_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/settings_pressed" android:state_focused="true"/>
<item android:drawable="@drawable/settings"></item>
</selector>
8 changes: 8 additions & 0 deletions res/drawable/test_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="false" android:state_pressed="false" android:drawable="@drawable/btn_test" />
<item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_test_press" />
<item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_test_press" />
<item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_test_press" />
</selector>
125 changes: 125 additions & 0 deletions res/layout/about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?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>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/layout_vertical_margin_small" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal|center_vertical"
android:orientation="horizontal" >

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/layout_vertical_margin_small"
android:gravity="center_vertical"
android:text="@string/app_name"
android:textColor="@color/black"
android:textSize="@dimen/text_size_bigest" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:padding="@dimen/layout_vertical_margin_small" >

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/version_title"
android:textSize="@dimen/text_size" />

<TextView
android:id="@+id/app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_size" />
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:padding="@dimen/layout_horizontal_margin" >

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

<View
android:layout_width="match_parent"
android:layout_height="@dimen/line_height"
android:background="@color/light_gray"
android:layout_marginLeft="@dimen/layout_vertical_margin_small"
android:layout_marginRight="@dimen/layout_vertical_margin_small"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin"/>

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

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_project_address"
android:textColor="@color/mix_gray"
android:textSize="@dimen/text_size" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

</LinearLayout>
17 changes: 0 additions & 17 deletions res/layout/cpu.xml

This file was deleted.

0 comments on commit 39b8d2d

Please sign in to comment.