diff options
Diffstat (limited to 'client/Piztor')
57 files changed, 256 insertions, 238 deletions
diff --git a/client/Piztor/.classpath b/client/Piztor/.classpath index 8499b03..1c0c6e1 100644 --- a/client/Piztor/.classpath +++ b/client/Piztor/.classpath @@ -5,7 +5,7 @@ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> - <classpathentry kind="lib" path="/home/goblin/piztor/client/Piztor/libs/locSDK_3.1.jar"/> <classpathentry kind="lib" path="/home/goblin/piztor/client/Piztor/libs/baidumapapi_v2_1_3.jar"/> + <classpathentry kind="lib" path="/home/goblin/piztor/client/Piztor/libs/locSDK_4.0.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/client/Piztor/.directory b/client/Piztor/.directory new file mode 100644 index 0000000..2e1894b --- /dev/null +++ b/client/Piztor/.directory @@ -0,0 +1,6 @@ +[Dolphin] +Timestamp=2013,8,28,16,5,42 +Version=3 + +[Settings] +HiddenFilesShown=true diff --git a/client/Piztor/.project b/client/Piztor/.project deleted file mode 100644 index 97100ec..0000000 --- a/client/Piztor/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>Piztor</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.android.ide.eclipse.adt.ApkBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>com.android.ide.eclipse.adt.AndroidNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/client/Piztor/.settings/org.eclipse.jdt.core.prefs b/client/Piztor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2d..0000000 --- a/client/Piztor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml index ece39f1..c026975 100644 --- a/client/Piztor/AndroidManifest.xml +++ b/client/Piztor/AndroidManifest.xml @@ -23,8 +23,6 @@ <!-- 获取设置信息和详情页直接拨打电话需要以下权限 --> <uses-permission android:name="android.permission.READ_PHONE_STATE"> </uses-permission> -<uses-permission android:name="android.permission.CALL_PHONE"> -</uses-permission> <!-- 使用定位功能所需权限,demo已集成百度定位SDK,不使用定位功能可去掉以下6项 --> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"> </uses-permission> diff --git a/client/Piztor/ic_launcher-web.png b/client/Piztor/ic_launcher-web.png Binary files differdeleted file mode 100644 index 3cd0ac2..0000000 --- a/client/Piztor/ic_launcher-web.png +++ /dev/null diff --git a/client/Piztor/libs/android-support-v4.jar b/client/Piztor/libs/android-support-v4.jar Binary files differnew file mode 100644 index 0000000..cf12d28 --- /dev/null +++ b/client/Piztor/libs/android-support-v4.jar diff --git a/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so b/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so Binary files differnew file mode 100644 index 0000000..54f4c05 --- /dev/null +++ b/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so diff --git a/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so b/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so Binary files differnew file mode 100644 index 0000000..93ece3d --- /dev/null +++ b/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so diff --git a/client/Piztor/libs/armeabi/liblocSDK4.so b/client/Piztor/libs/armeabi/liblocSDK4.so Binary files differnew file mode 100644 index 0000000..051896a --- /dev/null +++ b/client/Piztor/libs/armeabi/liblocSDK4.so diff --git a/client/Piztor/libs/baidumapapi_v2_1_3.jar b/client/Piztor/libs/baidumapapi_v2_1_3.jar Binary files differnew file mode 100644 index 0000000..c4d1a3f --- /dev/null +++ b/client/Piztor/libs/baidumapapi_v2_1_3.jar diff --git a/client/Piztor/libs/locSDK_4.0.jar b/client/Piztor/libs/locSDK_4.0.jar Binary files differnew file mode 100644 index 0000000..e6058dd --- /dev/null +++ b/client/Piztor/libs/locSDK_4.0.jar diff --git a/client/Piztor/proguard-project.txt b/client/Piztor/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/client/Piztor/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/client/Piztor/project.properties b/client/Piztor/project.properties deleted file mode 100644 index ce39f2d..0000000 --- a/client/Piztor/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-18 diff --git a/client/Piztor/res/drawable/circle_red.png b/client/Piztor/res/drawable/circle_red.png Binary files differnew file mode 100644 index 0000000..034cea8 --- /dev/null +++ b/client/Piztor/res/drawable/circle_red.png diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png Binary files differindex 90afba7..0a4b148 100644 --- a/client/Piztor/res/drawable/footbar_checkin.png +++ b/client/Piztor/res/drawable/footbar_checkin.png diff --git a/client/Piztor/res/drawable/footbar_checkin_1.png b/client/Piztor/res/drawable/footbar_checkin_1.png Binary files differindex a478d36..6fb89ac 100644 --- a/client/Piztor/res/drawable/footbar_checkin_1.png +++ b/client/Piztor/res/drawable/footbar_checkin_1.png diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png Binary files differindex 32d24d2..138ef6a 100644 --- a/client/Piztor/res/drawable/footbar_fetch.png +++ b/client/Piztor/res/drawable/footbar_fetch.png diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png Binary files differindex 208094f..0d098ab 100644 --- a/client/Piztor/res/drawable/footbar_fetch_1.png +++ b/client/Piztor/res/drawable/footbar_fetch_1.png diff --git a/client/Piztor/res/drawable/footbar_marker.png b/client/Piztor/res/drawable/footbar_marker.png Binary files differindex 3de909f..e84bffa 100644 --- a/client/Piztor/res/drawable/footbar_marker.png +++ b/client/Piztor/res/drawable/footbar_marker.png diff --git a/client/Piztor/res/drawable/footbar_marker_1.png b/client/Piztor/res/drawable/footbar_marker_1.png Binary files differindex 08c8715..75005a4 100644 --- a/client/Piztor/res/drawable/footbar_marker_1.png +++ b/client/Piztor/res/drawable/footbar_marker_1.png diff --git a/client/Piztor/res/drawable/footbar_search.png b/client/Piztor/res/drawable/footbar_search.png Binary files differindex 3549f84..8d3681f 100644 --- a/client/Piztor/res/drawable/footbar_search.png +++ b/client/Piztor/res/drawable/footbar_search.png diff --git a/client/Piztor/res/drawable/footbar_search_1.png b/client/Piztor/res/drawable/footbar_search_1.png Binary files differindex 1e6ac28..ab52656 100644 --- a/client/Piztor/res/drawable/footbar_search_1.png +++ b/client/Piztor/res/drawable/footbar_search_1.png diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png Binary files differindex 455bd0b..a6987f8 100644 --- a/client/Piztor/res/drawable/footbar_settings.png +++ b/client/Piztor/res/drawable/footbar_settings.png diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png Binary files differindex 6b0a2ab..8b61042 100644 --- a/client/Piztor/res/drawable/footbar_settings_1.png +++ b/client/Piztor/res/drawable/footbar_settings_1.png diff --git a/client/Piztor/res/drawable/icon_marka.png b/client/Piztor/res/drawable/icon_marka.png Binary files differnew file mode 100644 index 0000000..144f3db --- /dev/null +++ b/client/Piztor/res/drawable/icon_marka.png diff --git a/client/Piztor/res/drawable/marka.png b/client/Piztor/res/drawable/marka.png Binary files differdeleted file mode 100644 index a478d36..0000000 --- a/client/Piztor/res/drawable/marka.png +++ /dev/null diff --git a/client/Piztor/res/drawable/marker1.png b/client/Piztor/res/drawable/marker1.png Binary files differnew file mode 100644 index 0000000..3ba8760 --- /dev/null +++ b/client/Piztor/res/drawable/marker1.png diff --git a/client/Piztor/res/drawable/marker2.png b/client/Piztor/res/drawable/marker2.png Binary files differnew file mode 100644 index 0000000..90afba7 --- /dev/null +++ b/client/Piztor/res/drawable/marker2.png diff --git a/client/Piztor/res/drawable/navigation_back.png b/client/Piztor/res/drawable/navigation_back.png Binary files differindex 3bdda98..348dc3d 100644 --- a/client/Piztor/res/drawable/navigation_back.png +++ b/client/Piztor/res/drawable/navigation_back.png diff --git a/client/Piztor/res/drawable/navigation_back_1.png b/client/Piztor/res/drawable/navigation_back_1.png Binary files differindex a20b4ef..07578fb 100644 --- a/client/Piztor/res/drawable/navigation_back_1.png +++ b/client/Piztor/res/drawable/navigation_back_1.png diff --git a/client/Piztor/res/drawable/pop.png b/client/Piztor/res/drawable/pop.png Binary files differnew file mode 100644 index 0000000..07e897a --- /dev/null +++ b/client/Piztor/res/drawable/pop.png diff --git a/client/Piztor/res/drawable/popup.png b/client/Piztor/res/drawable/popup.png Binary files differnew file mode 100644 index 0000000..3dd9e51 --- /dev/null +++ b/client/Piztor/res/drawable/popup.png diff --git a/client/Piztor/res/drawable/popup_down.png b/client/Piztor/res/drawable/popup_down.png Binary files differnew file mode 100644 index 0000000..8dad382 --- /dev/null +++ b/client/Piztor/res/drawable/popup_down.png diff --git a/client/Piztor/res/drawable/popup_left.png b/client/Piztor/res/drawable/popup_left.png Binary files differnew file mode 100644 index 0000000..98c81b6 --- /dev/null +++ b/client/Piztor/res/drawable/popup_left.png diff --git a/client/Piztor/res/drawable/popup_middle.png b/client/Piztor/res/drawable/popup_middle.png Binary files differnew file mode 100644 index 0000000..750b455 --- /dev/null +++ b/client/Piztor/res/drawable/popup_middle.png diff --git a/client/Piztor/res/drawable/popup_right.png b/client/Piztor/res/drawable/popup_right.png Binary files differnew file mode 100644 index 0000000..84745ff --- /dev/null +++ b/client/Piztor/res/drawable/popup_right.png diff --git a/client/Piztor/res/drawable/popup_side.png b/client/Piztor/res/drawable/popup_side.png Binary files differnew file mode 100644 index 0000000..49135ca --- /dev/null +++ b/client/Piztor/res/drawable/popup_side.png diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index b1f2f5b..670a3dc 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -17,7 +17,7 @@ <ImageView android:id="@+id/main_headbar_img" android:layout_width="180dp" - android:layout_height="240dp" + android:layout_height="190dp" android:layout_gravity="center_horizontal" android:src="@drawable/title_logo" /> </LinearLayout> @@ -27,7 +27,7 @@ android:id="@+id/user_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="220.0dip" + android:layout_marginTop="200.0dip" android:layout_marginLeft="28.0dip" android:layout_marginRight="28.0dip"> <EditText @@ -39,7 +39,7 @@ android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" - android:hint="account" android:maxLines="1" + android:hint="@string/username" android:maxLines="1" android:maxLength="16"/> <View android:background="#ffc0c3c4" @@ -57,7 +57,7 @@ android:paddingLeft="12.0dip" android:layout_width="fill_parent" android:layout_height="44.0dip" - android:hint="password" + android:hint="@string/password" android:maxLines="1" android:maxLength="16" android:inputType="textPassword" /> @@ -72,9 +72,9 @@ android:paddingTop="5.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="28.0dip" + android:layout_marginLeft="70.0dip" + android:layout_marginRight="70.0dip" android:layout_marginTop="12.0dip" - android:layout_marginRight="28.0dip" android:text="login" android:layout_below="@id/user_layout" /> diff --git a/client/Piztor/res/layout/activity_main.xml b/client/Piztor/res/layout/activity_main.xml index f72ac62..49ff03c 100644 --- a/client/Piztor/res/layout/activity_main.xml +++ b/client/Piztor/res/layout/activity_main.xml @@ -31,4 +31,4 @@ android:layout_below="@+id/main_headbar_layout" android:clickable="true" /> -</RelativeLayout> +</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 c386ae2..3080be0 100644 --- a/client/Piztor/res/layout/activity_settings.xml +++ b/client/Piztor/res/layout/activity_settings.xml @@ -80,7 +80,8 @@ android:id="@+id/settings_sex_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dip" > + android:layout_marginTop="50dip" + > <TextView android:id="@+id/settings_sex_text" @@ -117,7 +118,7 @@ android:id="@+id/settings_team_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="10dip" > + android:layout_marginTop="50dip" > <TextView android:id="@+id/settings_team_text" diff --git a/client/Piztor/res/layout/custom_text_view.xml b/client/Piztor/res/layout/custom_text_view.xml new file mode 100644 index 0000000..5ef1c9f --- /dev/null +++ b/client/Piztor/res/layout/custom_text_view.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="utf-8"?> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + > + + <TextView + android:id="@+id/popleft" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_side" + android:gravity="center" + android:textStyle="bold" + android:textColor="#3814ed" + android:text="更新位置" + android:textSize="12sp" /> + + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:id="@+id/popinfo" + > + + <TextView + android:id="@+id/textcache" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_middle" + android:gravity="center" + android:textStyle="bold" + android:textColor="@android:color/black" + android:textSize="12sp" /> + + <TextView + android:id="@+id/popdown" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="@drawable/popup_down" + android:textColor="@android:color/black" + android:textSize="12sp" /> + + + </LinearLayout> + + + <TextView + android:id="@+id/popright" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/popup_side" + android:textColor="#3814ed" + android:gravity="center" + android:textStyle="bold" + android:text="更新marker" + android:textSize="12sp" /> + +</LinearLayout> diff --git a/client/Piztor/res/layout/gather_footbar.xml b/client/Piztor/res/layout/gather_footbar.xml index e573032..2dfb6b6 100644 --- a/client/Piztor/res/layout/gather_footbar.xml +++ b/client/Piztor/res/layout/gather_footbar.xml @@ -15,7 +15,7 @@ android:layout_weight="1"> <ImageButton android:id="@+id/footbar_btn_search" - android:layout_width="30dip" + android:layout_width="61dip" android:layout_height="30dip" android:layout_gravity="center" android:background="@drawable/footbar_btn_search_style"/> @@ -40,7 +40,7 @@ android:layout_weight="1"> <ImageButton android:id="@+id/footbar_btn_fetch" |
