diff options
43 files changed, 1890 insertions, 901 deletions
diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml index f336200..8e9973c 100644 --- a/client/Piztor/AndroidManifest.xml +++ b/client/Piztor/AndroidManifest.xml @@ -8,36 +8,38 @@ android:minSdkVersion="8" android:targetSdkVersion="17" /> - <!--使用网络功能所需权限 --> -<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"> -</uses-permission> -<uses-permission android:name="android.permission.INTERNET"> -</uses-permission> -<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"> -</uses-permission> -<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"> -</uses-permission> -<!-- SDK离线地图和cache功能需要读写外部存储器 --> -<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"> -</uses-permission> -<!-- 获取设置信息和详情页直接拨打电话需要以下权限 --> -<uses-permission android:name="android.permission.READ_PHONE_STATE"> -</uses-permission> -<!-- 使用定位功能所需权限,demo已集成百度定位SDK,不使用定位功能可去掉以下6项 --> -<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"> -</uses-permission> -<permission android:name="android.permission.BAIDU_LOCATION_SERVICE"> -</permission> -<uses-permission android:name="android.permission.BAIDU_LOCATION_SERVICE"> -</uses-permission> -<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"> -</uses-permission> -<uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"> -</uses-permission> -<uses-permission android:name="android.permission.ACCESS_GPS"/> - + <!-- 使用网络功能所需权限 --> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" > + </uses-permission> + <uses-permission android:name="android.permission.INTERNET" > + </uses-permission> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" > + </uses-permission> + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" > + </uses-permission> + <!-- SDK离线地图和cache功能需要读写外部存储器 --> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" > + </uses-permission> + <!-- 获取设置信息和详情页直接拨打电话需要以下权限 --> + <uses-permission android:name="android.permission.READ_PHONE_STATE" > + </uses-permission> + <!-- 使用定位功能所需权限,demo已集成百度定位SDK,不使用定位功能可去掉以下6项 --> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" > + </uses-permission> + + <permission android:name="android.permission.BAIDU_LOCATION_SERVICE" > + </permission> + + <uses-permission android:name="android.permission.BAIDU_LOCATION_SERVICE" > + </uses-permission> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" > + </uses-permission> + <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" > + </uses-permission> + <uses-permission android:name="android.permission.ACCESS_GPS" /> <application + android:name="com.macaroon.piztor.myApp" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" @@ -47,6 +49,7 @@ android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> @@ -56,27 +59,40 @@ </activity> <activity android:name="com.macaroon.piztor.Main" - android:label="@string/title_activity_main" - android:screenOrientation="portrait" - android:configChanges="orientation"> + android:configChanges="orientation" + android:label="@string/title_activity_main" + android:screenOrientation="portrait" > </activity> <activity android:name="com.macaroon.piztor.Settings" - android:label="@string/title_activity_settings" - android:screenOrientation="portrait" - android:configChanges="orientation"> + android:configChanges="orientation" + android:label="@string/title_activity_settings" + android:screenOrientation="portrait" > + </activity> + <activity + android:name="com.macaroon.piztor.SubscribeSettings" + android:configChanges="orientation" + android:label="@string/title_activity_subscribesettings" + android:screenOrientation="portrait" > </activity> + <service android:name="com.baidu.location.f" android:enabled="true" android:process=":remote" > </service> + + <activity + android:name="com.macaroon.piztor.UpdateInfo" + android:label="@string/title_activity_update_info" > + </activity> </application> - - <supports-screens android:largeScreens="true" - android:normalScreens="true" - android:smallScreens="true" - android:resizeable="true" - android:anyDensity="true"/> + + <supports-screens + android:anyDensity="true" + android:largeScreens="true" + android:normalScreens="true" + android:resizeable="true" + android:smallScreens="true" /> </manifest> diff --git a/client/Piztor/libs/baidumapapi_v2_1_3.jar b/client/Piztor/libs/baidumapapi_v2_1_3.jar Binary files differindex c4d1a3f..b6d2c93 100644 --- a/client/Piztor/libs/baidumapapi_v2_1_3.jar +++ b/client/Piztor/libs/baidumapapi_v2_1_3.jar diff --git a/client/Piztor/project.properties b/client/Piztor/project.properties index b7c2081..ce39f2d 100644 --- a/client/Piztor/project.properties +++ b/client/Piztor/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-10 +target=android-18 diff --git a/client/Piztor/res/drawable/circle_blue.png b/client/Piztor/res/drawable/circle_blue.png Binary files differindex 09c3658..d174635 100644 --- a/client/Piztor/res/drawable/circle_blue.png +++ b/client/Piztor/res/drawable/circle_blue.png diff --git a/client/Piztor/res/drawable/circle_glass.png b/client/Piztor/res/drawable/circle_glass.png Binary files differindex 826b2b7..d5dbec4 100644 --- a/client/Piztor/res/drawable/circle_glass.png +++ b/client/Piztor/res/drawable/circle_glass.png diff --git a/client/Piztor/res/drawable/circle_green.png b/client/Piztor/res/drawable/circle_green.png Binary files differindex ded6938..3ab51d4 100644 --- a/client/Piztor/res/drawable/circle_green.png +++ b/client/Piztor/res/drawable/circle_green.png diff --git a/client/Piztor/res/drawable/circle_metal.png b/client/Piztor/res/drawable/circle_metal.png Binary files differindex d84e1ad..07c72f0 100644 --- a/client/Piztor/res/drawable/circle_metal.png +++ b/client/Piztor/res/drawable/circle_metal.png diff --git a/client/Piztor/res/drawable/circle_paper.png b/client/Piztor/res/drawable/circle_paper.png Binary files differindex 973787d..b8d7b0d 100644 --- a/client/Piztor/res/drawable/circle_paper.png +++ b/client/Piztor/res/drawable/circle_paper.png diff --git a/client/Piztor/res/drawable/circle_tan.png b/client/Piztor/res/drawable/circle_tan.png Binary files differindex 27d10ad..667cc25 100644 --- a/client/Piztor/res/drawable/circle_tan.png +++ b/client/Piztor/res/drawable/circle_tan.png diff --git a/client/Piztor/res/drawable/circle_wood.png b/client/Piztor/res/drawable/circle_wood.png Binary files differindex ea18f7a..b2752de 100644 --- a/client/Piztor/res/drawable/circle_wood.png +++ b/client/Piztor/res/drawable/circle_wood.png diff --git a/client/Piztor/res/drawable/circle_yellow.png b/client/Piztor/res/drawable/circle_yellow.png Binary files differindex 7c1dfc7..c596806 100644 --- a/client/Piztor/res/drawable/circle_yellow.png +++ b/client/Piztor/res/drawable/circle_yellow.png diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index a8cf47f..c408a1d 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -39,7 +39,8 @@ android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" - android:hint="@string/username" android:maxLines="1" + android:hint="@string/username" + android:maxLines="1" android:maxLength="16"/> <View android:background="#ffc0c3c4" @@ -75,7 +76,7 @@ android:layout_marginLeft="70.0dip" android:layout_marginRight="70.0dip" android:layout_marginTop="12.0dip" - android:text="login" + android:text="@string/login" android:layout_below="@id/user_layout" /> </RelativeLayout>
\ No newline at end of file diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml index 49e8dfe..36bacf3 100644 --- a/client/Piztor/res/layout/activity_settings.xml +++ b/client/Piztor/res/layout/activity_settings.xml @@ -16,14 +16,21 @@ android:layout_height="wrap_content" android:layout_marginTop="10dip" android:orientation="horizontal"> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + > <TextView android:id="@+id/settings_GPSrefreshrate_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:gravity="center" android:layout_marginTop="10dip" - android:layout_marginLeft="60dip" - android:text="GPS refresh rate" + android:text="@string/GPSrefreshrate" android:textColor="@android:color/white" android:textSize="20dip" /> <TextView @@ -32,12 +39,12 @@ android:layout_height="wrap_content" android:textSize="20dip" android:layout_marginTop="10dip" - android:layout_marginLeft="20dip" + android:layout_marginLeft="10dip" android:layout_gravity="center_vertical" android:textColor="@android:color/white" android:layout_toRightOf="@+id/settings_GPSrefreshrate_text" android:text="30s"/> - + </LinearLayout> </RelativeLayout> <SeekBar @@ -80,24 +87,22 @@ android:layout_marginLeft="20dip" android:layout_marginRight="20dip" android:background="#ffc0c3c4" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:gravity="center" - android:textSize="30dip" - android:textColor="@android:color/white" - android:text="@string/subscribe_info"/> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" - android:layout_marginTop="20dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" + android:layout_marginTop="10dip" android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:textSize="30dip" + android:textColor="@android:color/white" + android:text="@string/subscribe_info"/> + <Button android:id="@+id/settings_btn_subscribe" android:layout_width="wrap_content" @@ -116,6 +121,45 @@ android:layout_marginRight="20dip" android:background="#ffc0c3c4" /> <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dip" + android:text="@string/colormode" + android:textColor="#FFFFFF"/> + <RadioGroup + android:id="@+id/radioGroup" + android:contentDescription="@string/colormode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:orientation="horizontal"> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/show_by_team" + android:text="@string/show_team" + android:checked="true"/> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/show_by_sex" + android:text="@string/show_sex"/> + </RadioGroup> + </LinearLayout> + <View + android:layout_width="fill_parent" + android:layout_height="1.0px" + android:layout_marginTop="20dip" + android:layout_marginBottom="20dip" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:background="#ffc0c3c4" /> + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="50dip" diff --git a/client/Piztor/res/layout/activity_subscribe_settings.xml b/client/Piztor/res/layout/activity_subscribe_settings.xml new file mode 100644 index 0000000..53ff8ee --- /dev/null +++ b/client/Piztor/res/layout/activity_subscribe_settings.xml @@ -0,0 +1,16 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context=".SubscribeSettings" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/hello_world" /> + +</RelativeLayout> diff --git a/client/Piztor/res/layout/activity_updateinfo.xml b/client/Piztor/res/layout/activity_updateinfo.xml index de9ecc6..5d0c66c 100644 --- a/client/Piztor/res/layout/activity_updateinfo.xml +++ b/client/Piztor/res/layout/activity_updateinfo.xml @@ -7,7 +7,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginTop="20dip" + android:layout_marginTop="20dip" android:orientation="vertical" > <include layout="@layout/settings_headbar"></include> @@ -17,105 +17,105 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="10dip" - android:gravity="center" + android:gravity="center" android:textSize="20dip" android:textColor="#FFFFFF" - android:text="haha" - android:id="@+id/username_text" /> + android:id="@+id/username" /> <View - android:layout_width="fill_parent" - android:layout_height="1.0px" - android:layout_marginTop="10dip" - android:layout_marginBottom="20dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:background="#ffc0c3c4" /> + android:layout_width="fill_parent" + android:layout_height="1.0px" + android:layout_marginTop="10dip" + android:layout_marginBottom="20dip" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:background="#ffc0c3c4" /> - <EditText - android:id="@+id/editText1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dip" - android:layout_marginRight="25dip" - android:hint=" new nickname" - android:ems="10" > - </EditText> - <View - android:layout_width="fill_parent" - android:layout_height="1.0px" - android:layout_marginTop="20dip" - android:layout_marginBottom="20dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:background="#ffc0c3c4" /> + <TextView + android:id="@+id/nickname" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:layout_marginLeft="25dip" + android:layout_marginRight="25dip" + android:textSize="20dip" + android:ems="10" > + </TextView> + <View + android:layout_width="fill_parent" + android:layout_height="1.0px" + android:layout_marginTop="20dip" + android:layout_marginBottom="20dip" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:background="#ffc0c3c4" /> - <EditText - android:id="@+id/editText2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dip" - android:layout_marginRight="25dip" - android:ems="10" - android:inputType="textPassword" - android:hint=" * old password"/> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dip" - android:layout_marginRight="25dip" - android:layout_marginBottom="10dip" - android:layout_gravity="center" - android:gravity="center" - android:textSize="14dip" - android:text="Must enter your current password" - android:textColor="#808080"/> + <EditText + android:id="@+id/password_old" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="25dip" + android:layout_marginRight="25dip" + android:ems="10" + android:inputType="textPassword" + android:hint="@string/old_password"/> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="25dip" + android:layout_marginRight="25dip" + android:layout_marginBottom="10dip" + android:layout_gravity="center" + android:gravity="center" + android:textSize="14dip" + android:textColor="#808080"/> - <EditText - android:id="@+id/editText3" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dip" - android:layout_marginRight="25dip" - android:ems="10" - android:inputType="textPassword" - android:hint=" new password"/> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dip" - android:layout_marginRight="25dip" - android:layout_gravity="center" - android:gravity="center" - android:textSize="14dip" - android:text="Keep this blank if you don't want to change" - android:textColor="#808080"/> - <View - android:layout_width="fill_parent" - android:layout_height="1.0px" - android:layout_marginTop="20dip" - android:layout_marginBottom="20dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" - android:background="#ffc0c3c4" /> + <EditText + android:id="@+id/password_new" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="25dip" + android:layout_marginRight="25dip" + android:ems="10" + android:inputType="textPassword" + android:hint="@string/new_password"/> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="25dip" + android:layout_marginRight="25dip" + android:layout_gravity="center" + android:gravity="center" + android:textSize="14dip" + android:textColor="#808080"/> + <View + android:layout_width="fill_parent" + android:layout_height="1.0px" + android:layout_marginTop="20dip" + android:layout_marginBottom="20dip" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:background="#ffc0c3c4" /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center" - android:gravity="center"> - <Button - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:paddingLeft="30dip" - android:paddingRight="30dip" - android:paddingTop="4dip" - android:paddingBottom="4dip" - android:background="#0F9D58" - android:textColor="#FFFFFF" - android:textSize="25dip" - android:text="Submit"/> - </LinearLayout> - + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center" + android:gravity="center"> + <Button + android:id="@+id/btn_submit" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingLeft="30dip" + android:paddingRight="30dip" + android:paddingTop="4dip" + android:paddingBottom="4dip" + android:background="#0F9D58" + android:textColor="#FFFFFF" + android:textSize="25dip" + android:text="@string/submit"/> + </LinearLayout> + </LinearLayout> |