From e7022e78a79f04b62d9ec788428b04a01420bb66 Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 16:14:54 +0800
Subject: Piztor rc1

---
 client/Piztor/res/drawable/footbar_fetch.png      | Bin 4849 -> 742 bytes
 client/Piztor/res/drawable/footbar_fetch_1.png    | Bin 3300 -> 319 bytes
 client/Piztor/res/drawable/footbar_settings.png   | Bin 4340 -> 1051 bytes
 client/Piztor/res/drawable/footbar_settings0.png  | Bin 0 -> 4340 bytes
 client/Piztor/res/drawable/footbar_settings_1.png | Bin 3205 -> 383 bytes
 client/Piztor/res/layout/activity_login.xml       |  26 +++++++---
 client/Piztor/res/layout/activity_settings.xml    |  56 +++++++++++-----------
 client/Piztor/res/values/strings.xml              |   5 +-
 8 files changed, 50 insertions(+), 37 deletions(-)
 create mode 100644 client/Piztor/res/drawable/footbar_settings0.png

(limited to 'client/Piztor/res')

diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png
index 138ef6a..71d1a20 100644
Binary files a/client/Piztor/res/drawable/footbar_fetch.png and b/client/Piztor/res/drawable/footbar_fetch.png differ
diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png
index 0d098ab..564b1da 100644
Binary files a/client/Piztor/res/drawable/footbar_fetch_1.png and b/client/Piztor/res/drawable/footbar_fetch_1.png differ
diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png
index a6987f8..7879ceb 100644
Binary files a/client/Piztor/res/drawable/footbar_settings.png and b/client/Piztor/res/drawable/footbar_settings.png differ
diff --git a/client/Piztor/res/drawable/footbar_settings0.png b/client/Piztor/res/drawable/footbar_settings0.png
new file mode 100644
index 0000000..a6987f8
Binary files /dev/null and b/client/Piztor/res/drawable/footbar_settings0.png differ
diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png
index 8b61042..b76fe9f 100644
Binary files a/client/Piztor/res/drawable/footbar_settings_1.png and b/client/Piztor/res/drawable/footbar_settings_1.png differ
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index c408a1d..cb27495 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -1,10 +1,12 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
 <RelativeLayout 
     android:orientation="vertical" 
     android:id="@+id/login_layout"
     android:background="@android:color/black" 
     android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:layout_height="fill_parent">
 
     
     <LinearLayout
@@ -12,14 +14,23 @@
     android:layout_height="wrap_content"
     android:background="@android:color/black"
     android:gravity="center_horizontal"
-    android:orientation="vertical" >
+    android:orientation="vertical" 
+    android:layout_marginTop="16dip">
     
     <ImageView
         android:id="@+id/main_headbar_img"
         android:layout_width="180dp"
-        android:layout_height="190dp"
+        android:layout_height="200dp"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/title_logo" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/app_name"
+        android:textSize="30dip"
+        android:textColor="#FFFFFF"/>
     </LinearLayout>
 
     <LinearLayout 
@@ -27,7 +38,7 @@
         android:id="@+id/user_layout" 
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content" 
-        android:layout_marginTop="200.0dip" 
+        android:layout_marginTop="260.0dip" 
         android:layout_marginLeft="28.0dip" 
         android:layout_marginRight="28.0dip">
         <EditText 
@@ -75,8 +86,9 @@
         android:layout_height="wrap_content" 
         android:layout_marginLeft="70.0dip"
         android:layout_marginRight="70.0dip" 
-        android:layout_marginTop="12.0dip" 
+        android:layout_marginTop="40.0dip" 
         android:text="@string/login"    
         android:layout_below="@id/user_layout" />
     
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
+</ScrollView>
\ 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 36bacf3..ba67683 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -30,16 +30,18 @@
 	        	android:layout_gravity="center"
 	        	android:gravity="center"
 	        	android:layout_marginTop="10dip"
+           		android:layout_marginBottom="2dip"
 	        	android:text="@string/GPSrefreshrate"
 	        	android:textColor="@android:color/white"
-	        	android:textSize="20dip" />
+	        	android:textSize="17dip" />
         	<TextView
             	android:id="@+id/settings_GPSrefreshrate"
             	android:layout_width="wrap_content"
             	android:layout_height="wrap_content"
-            	android:textSize="20dip"
+            	android:textSize="17dip"
            		android:layout_marginTop="10dip"
-           		android:layout_marginLeft="10dip"
+           		android:layout_marginLeft="4dip"
+           		android:layout_marginBottom="2dip"
             	android:layout_gravity="center_vertical"
             	android:textColor="@android:color/white"
             	android:layout_toRightOf="@+id/settings_GPSrefreshrate_text"
@@ -87,31 +89,26 @@
 	        android:layout_marginLeft="20dip"
 	        android:layout_marginRight="20dip"
 	        android:background="#ffc0c3c4" />
+	    
 	    <LinearLayout
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
-	        android:layout_gravity="center"
-	        android:gravity="center"
-	        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"
-		   	    android:layout_height="wrap_content"
-		   	    android:layout_marginLeft="20dip"
-		   	    android:text="@string/change"
-		   	    android:textSize="22dip" />
-
-	    </LinearLayout>
+	        android:layout_marginLeft="50dip"
+            android:layout_marginRight="50dip"
+            android:orientation="vertical">
+		    
+        	<Button
+            	android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:paddingTop="5dip"
+				android:paddingBottom="5dip"
+            	android:layout_marginTop="20dip"
+            	android:text="@string/change"
+            	android:textSize="20dip"
+            	android:textColor="@android:color/white"
+            	android:background="#0F9D58"
+            	android:id="@+id/settings_btn_subscribe" />
+        	</LinearLayout>
 	    <View
 	        android:layout_width="fill_parent"
 	        android:layout_height="1.0px"
@@ -141,13 +138,16 @@
  			<RadioButton 
  			    android:layout_width="wrap_content" 
  			    android:layout_height="wrap_content" 
- 			    android:id="@+id/show_by_team" 
+ 			    android:id="@+id/show_by_team"
+ 			    android:textSize="18dip" 
  			    android:text="@string/show_team" 
  			    android:checked="true"/>
 			<RadioButton 
 			    android:layout_width="wrap_content" 
 			    android:layout_height="wrap_content" 
+			    android:layout_marginLeft="10dip"
 			    android:id="@+id/show_by_sex" 
+			    android:textSize="18dip"
 			    android:text="@string/show_sex"/>    
 		</RadioGroup>
 	    </LinearLayout>
@@ -171,7 +171,7 @@
             	android:paddingTop="5dip"
             	android:paddingBottom="5dip"
             	android:text="@string/update_info"
-            	android:textSize="30dip"
+            	android:textSize="20dip"
             	android:textColor="@android:color/white"
             	android:background="#4285F4"
             	android:id="@+id/settings_btn_updateinfo" />
@@ -182,7 +182,7 @@
 				android:paddingBottom="5dip"
             	android:layout_marginTop="20dip"
             	android:text="@string/logout"
-            	android:textSize="30dip"
+            	android:textSize="20dip"
             	android:textColor="@android:color/white"
             	android:background="#DB4437"
             	android:id="@+id/settings_btn_logout" />
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
index 82132ed..25e980a 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="hello_world">Hello world!</string>
     <string name="settings">设置</string>
     <string name="search">搜索</string>
-    <string name="fetch">获取</string>
+    <string name="fetch">上传</string>
     <string name="checkin">签到</string>
     <string name="focus">聚焦</string>
     <string name="show_sex">按性别</string>
@@ -25,7 +25,7 @@
     <string name="logout">注销</string>
     <string name="update_info">修改密码</string>
     <string name="subscribe_info">关注信息</string>
-    <string name="change">查看及修改</string>
+    <string name="change">关注信息</string>
     <string name="title_activity_subscribesettings">SubscribeSettings</string>
     <string name="title_activity_subscribe_settings">SubscribeSettings</string>
     <string name="title_activity_update_info">UpdateInfo</string>
@@ -39,5 +39,6 @@
     <string name="new_password">新密码</string>
     <string name="submit">提交</string>
     <string name="colormode">着色方式</string>
+    <string name="save">保存</string>
 
 </resources>
-- 
cgit v1.2.3-70-g09d2


From 2f6cb801f2374fd6ded925fb1438d6ce72837d81 Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Sun, 1 Sep 2013 17:42:14 +0800
Subject: beta version released

---
 client/Piztor/res/layout/subscribe_settings.xml    | 4 ++--
 client/Piztor/src/com/macaroon/piztor/Main.java    | 7 ++++---
 client/Piztor/src/com/macaroon/piztor/Transam.java | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'client/Piztor/res')

diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml
index 1bfd975..a90837c 100644
--- a/client/Piztor/res/layout/subscribe_settings.xml
+++ b/client/Piztor/res/layout/subscribe_settings.xml
@@ -19,7 +19,7 @@
 	    android:gravity="center"
 	    android:orientation="horizontal">
 	    <EditText
-	        android:layout_width="120dip"
+	        android:layout_width="80dip"
 	        android:layout_height="wrap_content"
 	        android:layout_alignParentLeft="true"
 	        android:layout_marginLeft="10dip"
@@ -28,7 +28,7 @@
 	        android:phoneNumber="true"
 	 		android:id="@+id/subscribe_company"/>
 	    <EditText
-	        android:layout_width="120dip"
+	        android:layout_width="80dip"
 	        android:layout_height="wrap_content"
 	        android:layout_marginLeft="10dip"
 	        android:layout_toRightOf="@+id/subscribe_company"
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
index 97d2f7b..5951db1 100644
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ b/client/Piztor/src/com/macaroon/piztor/Main.java
@@ -55,7 +55,7 @@ public class Main extends PiztorAct {
 	public MyLocationListener myListener = new MyLocationListener();
 	boolean isFirstLocation = true;
 	public static int GPSrefreshrate = 20;
-	private final int checkinRadius = 10;
+	private final double checkinRadius = 10.0;
 
 	ImageButton btnCheckin, btnFetch, btnFocus, btnSettings;
 
@@ -334,11 +334,11 @@ public class Main extends PiztorAct {
 				(int) (locData.longitude * 1E6));
 		double disFromMarker = DistanceUtil.getDistance(curPoint,
 				mapMaker.getMakerLocation());
-		if (disFromMarker < locData.accuracy) {
+		if (disFromMarker < Math.max(Math.min(locData.accuracy, 20.0), (float)checkinRadius) ) {
 			alertMaker.showCheckinAlter();
 		} else {
 			Toast toast = Toast.makeText(Main.this,
-					"请靠近路标", 2000);
+					String.format("请靠近路标,现在距离%.2f米", disFromMarker), 2000);
 			toast.setGravity(Gravity.TOP, 0, 80);
 			toast.show();
 		}
@@ -376,6 +376,7 @@ public class Main extends PiztorAct {
 		mLocClient.registerLocationListener(myListener);
 		LocationClientOption option = new LocationClientOption();
 		option.setOpenGps(true);
+		option.setPriority(LocationClientOption.GpsFirst);
 		option.setCoorType("bd09ll");
 		option.setScanSpan(GPSrefreshrate * 1000);
 		mLocClient.setLocOption(option);
diff --git a/client/Piztor/src/com/macaroon/piztor/Transam.java b/client/Piztor/src/com/macaroon/piztor/Transam.java
index 6660899..df2194f 100644
--- a/client/Piztor/src/com/macaroon/piztor/Transam.java
+++ b/client/Piztor/src/com/macaroon/piztor/Transam.java
@@ -55,10 +55,10 @@ public class Transam implements Runnable {
 	Timer pushtimer;
 	boolean running = false; 
 	boolean pushing = false;
-	int cnt = 5;				//retry times
+	int cnt = 3;				//retry times
 	int tcnt;				//current remain retry times
 	int rcnt;				//current remain retry times (push)
-	int retime = 5000;		//timeout time
+	int retime = 10000;		//timeout time
 	Req req;
 	int p;					//port
 	String i;				//ip
-- 
cgit v1.2.3-70-g09d2