summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoblin911 <goblinliu@gmail.com>2013-08-28 16:32:26 +0800
committerGoblin911 <goblinliu@gmail.com>2013-08-28 16:32:26 +0800
commit68ed59a88f2409f632c3731c0e5dc246713676a2 (patch)
treec0f7ba850655ed4ce0e95a5a7815541cbe24f4c9
parent0a8315a94d8ed1252f3f96d4ca41ddc632c3bc98 (diff)
Fixed screen-rotation bug
-rw-r--r--client/Piztor/.classpath2
-rw-r--r--client/Piztor/.directory6
-rw-r--r--client/Piztor/AndroidManifest.xml2
-rw-r--r--client/Piztor/libs/android-support-v4.jarbin0 -> 556198 bytes
-rw-r--r--client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.sobin0 -> 797256 bytes
-rw-r--r--client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.sobin0 -> 201904 bytes
-rw-r--r--client/Piztor/libs/armeabi/liblocSDK4.sobin0 -> 32304 bytes
-rw-r--r--client/Piztor/libs/baidumapapi_v2_1_3.jarbin0 -> 843490 bytes
-rw-r--r--client/Piztor/libs/locSDK_4.0.jarbin0 -> 168001 bytes
-rw-r--r--client/Piztor/res/drawable/circle_red.pngbin0 -> 690 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_checkin.pngbin468 -> 3251 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_checkin_1.pngbin3371 -> 3249 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_fetch.pngbin2541 -> 4849 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_fetch_1.pngbin3093 -> 3300 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_marker.pngbin1866 -> 3936 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_marker_1.pngbin3288 -> 3113 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_search.pngbin2127 -> 4295 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_search_1.pngbin3589 -> 3219 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_settings.pngbin1372 -> 4340 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_settings_1.pngbin3442 -> 3205 bytes
-rw-r--r--client/Piztor/res/drawable/icon_marka.pngbin0 -> 4129 bytes
-rw-r--r--client/Piztor/res/drawable/marka.pngbin3371 -> 0 bytes
-rw-r--r--client/Piztor/res/drawable/marker1.pngbin0 -> 4318 bytes
-rw-r--r--client/Piztor/res/drawable/marker2.pngbin0 -> 468 bytes
-rw-r--r--client/Piztor/res/drawable/navigation_back.pngbin1324 -> 621 bytes
-rw-r--r--client/Piztor/res/drawable/navigation_back_1.pngbin401 -> 346 bytes
-rw-r--r--client/Piztor/res/drawable/popup.pngbin0 -> 3296 bytes
-rw-r--r--client/Piztor/res/layout/activity_login.xml12
-rw-r--r--client/Piztor/res/layout/activity_main.xml2
-rw-r--r--client/Piztor/res/layout/activity_settings.xml5
-rw-r--r--client/Piztor/res/layout/gather_footbar.xml10
-rw-r--r--client/Piztor/res/layout/main_footbar.xml16
-rw-r--r--client/Piztor/res/layout/settings_headbar.xml4
-rw-r--r--client/Piztor/res/menu/init.xml1
-rw-r--r--client/Piztor/res/menu/login.xml1
-rw-r--r--client/Piztor/res/menu/main.xml1
-rw-r--r--client/Piztor/res/menu/setting.xml1
-rw-r--r--client/Piztor/res/values-v11/styles.xml2
-rw-r--r--client/Piztor/res/values-v14/styles.xml2
-rw-r--r--client/Piztor/res/values/strings.xml7
-rw-r--r--client/Piztor/src/com/macaroon/piztor/AppMgr.java7
-rw-r--r--client/Piztor/src/com/macaroon/piztor/BMapUtil.java22
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Main.java44
-rw-r--r--client/Piztor/src/com/macaroon/piztor/MapMaker.java31
-rw-r--r--client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java98
45 files changed, 117 insertions, 159 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/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/libs/android-support-v4.jar b/client/Piztor/libs/android-support-v4.jar
new file mode 100644
index 0000000..cf12d28
--- /dev/null
+++ b/client/Piztor/libs/android-support-v4.jar
Binary files differ
diff --git a/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so b/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so
new file mode 100644
index 0000000..54f4c05
--- /dev/null
+++ b/client/Piztor/libs/armeabi/libBaiduMapSDK_v2_1_3.so
Binary files differ
diff --git a/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so b/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so
new file mode 100644
index 0000000..93ece3d
--- /dev/null
+++ b/client/Piztor/libs/armeabi/libBaiduMapVOS_v2_1_3.so
Binary files differ
diff --git a/client/Piztor/libs/armeabi/liblocSDK4.so b/client/Piztor/libs/armeabi/liblocSDK4.so
new file mode 100644
index 0000000..051896a
--- /dev/null
+++ b/client/Piztor/libs/armeabi/liblocSDK4.so
Binary files differ
diff --git a/client/Piztor/libs/baidumapapi_v2_1_3.jar b/client/Piztor/libs/baidumapapi_v2_1_3.jar
new file mode 100644
index 0000000..c4d1a3f
--- /dev/null
+++ b/client/Piztor/libs/baidumapapi_v2_1_3.jar
Binary files differ
diff --git a/client/Piztor/libs/locSDK_4.0.jar b/client/Piztor/libs/locSDK_4.0.jar
new file mode 100644
index 0000000..e6058dd
--- /dev/null
+++ b/client/Piztor/libs/locSDK_4.0.jar
Binary files differ
diff --git a/client/Piztor/res/drawable/circle_red.png b/client/Piztor/res/drawable/circle_red.png
new file mode 100644
index 0000000..034cea8
--- /dev/null
+++ b/client/Piztor/res/drawable/circle_red.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png
index 90afba7..0a4b148 100644
--- a/client/Piztor/res/drawable/footbar_checkin.png
+++ b/client/Piztor/res/drawable/footbar_checkin.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_checkin_1.png b/client/Piztor/res/drawable/footbar_checkin_1.png
index a478d36..6fb89ac 100644
--- a/client/Piztor/res/drawable/footbar_checkin_1.png
+++ b/client/Piztor/res/drawable/footbar_checkin_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png
index 32d24d2..138ef6a 100644
--- a/client/Piztor/res/drawable/footbar_fetch.png
+++ b/client/Piztor/res/drawable/footbar_fetch.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png
index 208094f..0d098ab 100644
--- a/client/Piztor/res/drawable/footbar_fetch_1.png
+++ b/client/Piztor/res/drawable/footbar_fetch_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_marker.png b/client/Piztor/res/drawable/footbar_marker.png
index 3de909f..e84bffa 100644
--- a/client/Piztor/res/drawable/footbar_marker.png
+++ b/client/Piztor/res/drawable/footbar_marker.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_marker_1.png b/client/Piztor/res/drawable/footbar_marker_1.png
index 08c8715..75005a4 100644
--- a/client/Piztor/res/drawable/footbar_marker_1.png
+++ b/client/Piztor/res/drawable/footbar_marker_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_search.png b/client/Piztor/res/drawable/footbar_search.png
index 3549f84..8d3681f 100644
--- a/client/Piztor/res/drawable/footbar_search.png
+++ b/client/Piztor/res/drawable/footbar_search.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_search_1.png b/client/Piztor/res/drawable/footbar_search_1.png
index 1e6ac28..ab52656 100644
--- a/client/Piztor/res/drawable/footbar_search_1.png
+++ b/client/Piztor/res/drawable/footbar_search_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png
index 455bd0b..a6987f8 100644
--- a/client/Piztor/res/drawable/footbar_settings.png
+++ b/client/Piztor/res/drawable/footbar_settings.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png
index 6b0a2ab..8b61042 100644
--- a/client/Piztor/res/drawable/footbar_settings_1.png
+++ b/client/Piztor/res/drawable/footbar_settings_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/icon_marka.png b/client/Piztor/res/drawable/icon_marka.png
new file mode 100644
index 0000000..144f3db
--- /dev/null
+++ b/client/Piztor/res/drawable/icon_marka.png
Binary files differ
diff --git a/client/Piztor/res/drawable/marka.png b/client/Piztor/res/drawable/marka.png
deleted file mode 100644
index a478d36..0000000
--- a/client/Piztor/res/drawable/marka.png
+++ /dev/null
Binary files differ
diff --git a/client/Piztor/res/drawable/marker1.png b/client/Piztor/res/drawable/marker1.png
new file mode 100644
index 0000000..3ba8760
--- /dev/null
+++ b/client/Piztor/res/drawable/marker1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/marker2.png b/client/Piztor/res/drawable/marker2.png
new file mode 100644
index 0000000..90afba7
--- /dev/null
+++ b/client/Piztor/res/drawable/marker2.png
Binary files differ
diff --git a/client/Piztor/res/drawable/navigation_back.png b/client/Piztor/res/drawable/navigation_back.png
index 3bdda98..348dc3d 100644
--- a/client/Piztor/res/drawable/navigation_back.png
+++ b/client/Piztor/res/drawable/navigation_back.png
Binary files differ
diff --git a/client/Piztor/res/drawable/navigation_back_1.png b/client/Piztor/res/drawable/navigation_back_1.png
index a20b4ef..07578fb 100644
--- a/client/Piztor/res/drawable/navigation_back_1.png
+++ b/client/Piztor/res/drawable/navigation_back_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/popup.png b/client/Piztor/res/drawable/popup.png
new file mode 100644
index 0000000..3dd9e51
--- /dev/null
+++ b/client/Piztor/res/drawable/popup.png
Binary files differ
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/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"
- android:layout_width="30dip"
+ android:layout_width="61dip"
android:layout_height="30dip"
android:layout_gravity="center"
android:background="@drawable/footbar_btn_fetch_style"/>
@@ -65,7 +65,7 @@
android:orientation="vertical">
<ImageButton
android:id="@+id/footbar_btn_checkin"
- android:layout_width="30dip"
+ android:layout_width="61dip"
android:layout_height="30dip"
android:layout_gravity="center"
android:background="@drawable/footbar_btn_checkin_style"
@@ -91,7 +91,7 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_focus"
- android:layout_width="30dip"
+ android:layout_width="61dip"
android:layout_height="30dip"
android:layout_gravity="center"
android:background="@drawable/footbar_btn_focus_style"/>
@@ -116,7 +116,7 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_settings"
- android:layout_width="30dip"
+ android:layout_width="61dip"
android:layout_height="30dip"
android:layout_gravity="center"
android:background="@drawable/footbar_btn_settings_style"/>
diff --git a/client/Piztor/res/layout/main_footbar.xml b/client/Piztor/res/layout/main_footbar.xml
index 69760c0..b4659ff 100644
--- a/client/Piztor/res/layout/main_footbar.xml
+++ b/client/Piztor/res/layout/main_footbar.xml
@@ -3,7 +3,7 @@
android:layout_width="fill_parent"
android:layout_height="48dip"
android:orientation="horizontal"
- android:background="@drawable/footbar_background" >
+ android:background="@drawable/footbar_background" android:baselineAligned="false">
<LinearLayout
android:id="@+id/footbar_btn_search_layout"
@@ -15,12 +15,13 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_search"
- android:layout_width="30dip"
+ android:layout_width="90dip"
android:layout_height="30dip"
android:layout_gravity="center"
+ android:contentDescription="@string/desc"
android:background="@drawable/footbar_btn_search_style"/>
<TextView
- android:id="@+id/footbar_btn_search"
+ android:id="@+id/footbar_btn_search_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
@@ -40,9 +41,10 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_fetch"
- android:layout_width="30dip"
+ android:layout_width="90dip"
android:layout_height="30dip"
android:layout_gravity="center"
+ android:contentDescription="@string/desc"
android:background="@drawable/footbar_btn_fetch_style"/>
<TextView
android:id="@+id/footbar_btn_fetch_text"
@@ -65,9 +67,10 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_focus"
- android:layout_width="30dip"
+ android:layout_width="90dip"
android:layout_height="30dip"
android:layout_gravity="center"
+ android:contentDescription="@string/desc"
android:background="@drawable/footbar_btn_focus_style"/>
<TextView
android:id="@+id/footbar_btn_focus_text"
@@ -90,9 +93,10 @@
android:layout_weight="1">
<ImageButton
android:id="@+id/footbar_btn_settings"
- android:layout_width="30dip"
+ android:layout_width="90dip"
android:layout_height="30dip"
android:layout_gravity="center"
+ android:contentDescription="@string/desc"
android:background="@drawable/footbar_btn_settings_style"/>
<TextView
android:id="@+id/footbar_btn_settings_text"
diff --git a/client/Piztor/res/layout/settings_headbar.xml b/client/Piztor/res/layout/settings_headbar.xml
index 9065bdb..606c172 100644
--- a/client/Piztor/res/layout/settings_headbar.xml
+++ b/client/Piztor/res/layout/settings_headbar.xml
@@ -7,9 +7,9 @@
<ImageButton
android:id="@+id/settings_btn_back"
- android:layout_width="40dip"
+ android:layout_width="110dip"
android:layout_height="40dip"
- android:layout_marginLeft="5dip"
+ android:layout_marginLeft="0dip"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:background="@drawable/navigation_back"/>
diff --git a/client/Piztor/res/menu/init.xml b/client/Piztor/res/menu/init.xml
index c002028..5e4b11a 100644
--- a/client/Piztor/res/menu/init.xml
+++ b/client/Piztor/res/menu/init.xml
@@ -3,7 +3,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>
diff --git a/client/Piztor/res/menu/login.xml b/client/Piztor/res/menu/login.xml
index c002028..5e4b11a 100644
--- a/client/Piztor/res/menu/login.xml
+++ b/client/Piztor/res/menu/login.xml
@@ -3,7 +3,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>
diff --git a/client/Piztor/res/menu/main.xml b/client/Piztor/res/menu/main.xml
index c002028..5e4b11a 100644
--- a/client/Piztor/res/menu/main.xml
+++ b/client/Piztor/res/menu/main.xml
@@ -3,7 +3,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>
diff --git a/client/Piztor/res/menu/setting.xml b/client/Piztor/res/menu/setting.xml
index c002028..5e4b11a 100644
--- a/client/Piztor/res/menu/setting.xml
+++ b/client/Piztor/res/menu/setting.xml
@@ -3,7 +3,6 @@
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
- android:showAsAction="never"
android:title="@string/action_settings"/>
</menu>
diff --git a/client/Piztor/res/values-v11/styles.xml b/client/Piztor/res/values-v11/styles.xml
index 3c02242..aeeae24 100644
--- a/client/Piztor/res/values-v11/styles.xml
+++ b/client/Piztor/res/values-v11/styles.xml
@@ -4,7 +4,7 @@
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+ <style name="AppBaseTheme" parent="android:Theme.Light">
<!-- API 11 theme customizations can go here. -->
</style>
diff --git a/client/Piztor/res/values-v14/styles.xml b/client/Piztor/res/values-v14/styles.xml
index a91fd03..afb7b31 100644
--- a/client/Piztor/res/values-v14/styles.xml
+++ b/client/Piztor/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+ <style name="AppBaseTheme" parent="android:Theme.Light">
<!-- API 14 theme customizations can go here. -->
</style>
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
index 5500982..192d392 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -1,6 +1,6 @@
<resources>
- <string name="app_name">piztor</string>
+ <string name="app_name">Piztor</string>
<string name="action_settings">Settings</string>
<string name="hello_world">Hello world!</string>
<string name="settings">Settings</string>
@@ -17,6 +17,9 @@
<string name="title_activity_login">Login</string>
<string name="title_activity_main">Main</string>
<string name="title_activity_settings">Settings</string>
- <string name="title_activity_mapmaker">MapMaker</string>
+ <string name="password">password</string>
+ <string name="username">username</string>
+ <string name="login">login</string>
+ <string name="desc">desc</string>
</resources>
diff --git a/client/Piztor/src/com/macaroon/piztor/AppMgr.java b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
index 8e82384..aed8ca6 100644
--- a/client/Piztor/src/com/macaroon/piztor/AppMgr.java
+++ b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
@@ -15,10 +15,8 @@ import com.baidu.mapapi.MKGeneralListener;
@SuppressLint("UseSparseArrays")
public class AppMgr {
- private static final String strKey = "5ba8abf7b4694ad49706b8b7538c9d6a";
+ private static final String strKey = "8a0ae50048d103b2b8b12b7066f4ea7d";
static BMapManager mBMapManager = null;
- static Context context;
-
// Status
public enum ActivityStatus {
@@ -83,6 +81,8 @@ public class AppMgr {
i.putExtra("status", true);
else i.putExtra("status", false);
}
+ if (event == loginSuccess) mBMapManager.start();
+ if (event == logout) mBMapManager.stop();
nowAct.startActivity(i);
}
@@ -127,7 +127,6 @@ public class AppMgr {
}
});
}
- AppMgr.context = context;
mp = new HashMap<Class<?>, HashMap<Integer, Class<?>>>();
handler = new Handler();
transam = new Transam(Infomation.ip, Infomation.port, handler);
diff --git a/client/Piztor/src/com/macaroon/piztor/BMapUtil.java b/client/Piztor/src/com/macaroon/piztor/BMapUtil.java
new file mode 100644
index 0000000..04e2e71
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/BMapUtil.java
@@ -0,0 +1,22 @@
+package com.macaroon.piztor;
+
+import android.graphics.Bitmap;
+import android.view.View;
+
+public class BMapUtil {
+
+ /**
+ * 从view 得到图片
+ * @param view
+ * @return
+ */
+ public static Bitmap getBitmapFromView(View view) {
+ view.destroyDrawingCache();
+ view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
+ View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+ view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
+ view.setDrawingCacheEnabled(true);
+ Bitmap bitmap = view.getDrawingCache(true);
+ return bitmap;
+ }
+}
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
index 2820090..c3f6047 100644
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ b/client/Piztor/src/com/macaroon/piztor/Main.java
@@ -12,6 +12,7 @@ import android.view.KeyEvent;
import android.view.Menu;
import android.view.View;