diff --git a/.classpath b/.classpath
index 7bc01d9..ca4f68d 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="lib" path="libs/httpmime-4.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/httpcore-4.3.jar"/>
 	<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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b75b43..81817a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -5,8 +5,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="19" />
+        android:minSdkVersion="11"
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -19,6 +19,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
+	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
     <application
         android:allowBackup="true"
@@ -40,13 +42,17 @@
             android:name="edu.bupt.camera.CameraActivity"
             android:label="@string/title_activity_camera"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+             >
         </activity>
         <activity
             android:name="edu.bupt.pickimg.ImagePickActivity"
             android:label="@string/title_activity_image_pick"
             android:screenOrientation="portrait" >
         </activity>
+        <activity android:name="edu.bupt.camera.VideoActivity"></activity>
+        <activity android:name="edu.buptant.pointscloudviewer.MainActivity"></activity>
+        <activity android:name="edu.bupt.camera.WebCameraActivity"></activity>
+        <service android:name="edu.bupt.camera.FrameLifting"></service>
     </application>
 
 </manifest>
diff --git a/libs/httpcore-4.3.jar b/libs/httpcore-4.3.jar
old mode 100755
new mode 100644
diff --git a/libs/httpmime-4.3.jar b/libs/httpmime-4.3.jar
old mode 100755
new mode 100644
diff --git a/project.properties b/project.properties
index 9adab71..5ff0ee3 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
-android.library.reference.1=../../appcompat_v7
+target=android-21
+android.library.reference.1=../android-support-v7-appcompat
diff --git a/res/layout/activity_auto_capture.xml b/res/layout/activity_auto_capture.xml
new file mode 100644
index 0000000..596d8d1
--- /dev/null
+++ b/res/layout/activity_auto_capture.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>    
+<RelativeLayout    
+    xmlns:android="http://schemas.android.com/apk/res/android"    
+    android:orientation="vertical"    
+    android:layout_width="fill_parent"    
+    android:layout_height="fill_parent">      
+    <FrameLayout 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true" >
+        
+	    <SurfaceView android:id="@+id/SurfaceView"    
+	        android:visibility="visible" 
+	        android:layout_gravity="center"    
+	        android:layout_width="match_parent"     
+	        android:layout_height="match_parent">    
+	    </SurfaceView>    
+    </FrameLayout>  
+      
+    <RelativeLayout    
+        android:layout_width="fill_parent"    
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:gravity="center">
+	    
+        <ProgressBar
+            android:id="@+id/progressBar_record_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:visibility="gone" />"
+
+        <Button
+            android:id="@+id/start"
+            android:layout_below="@id/progressBar_record_progress"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Capture" />
+
+    </RelativeLayout>    
+</RelativeLayout>   
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 8d5e8f3..d6daaf3 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -107,10 +107,30 @@
         android:textSize="20sp"
         android:text="MCC" />
     
+    <TextView android:id="@+id/title4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/bt_mcc"
+        android:layout_marginTop="5dp"
+        android:layout_marginLeft="10dp"
+        android:textSize="22sp"
+        android:textColor="#0000FF"
+        android:text="Reconstruction result"/>
+    
+    <Button
+        android:id="@+id/bt_result"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title4"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:textSize="20sp"
+        android:text="3D Viewer" />
+    
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/bt_mcc"
+        android:layout_below="@id/bt_result"
         android:layout_marginTop="10dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
diff --git a/res/layout/frame_dialog.xml b/res/layout/frame_dialog.xml
new file mode 100644
index 0000000..696ac59
--- /dev/null
+++ b/res/layout/frame_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/et_frame_dialog"
+        android:layout_width="280dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="1"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+</LinearLayout>
diff --git a/res/layout/threshold_dialog.xml b/res/layout/threshold_dialog.xml
new file mode 100644
index 0000000..3a285b3
--- /dev/null
+++ b/res/layout/threshold_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/et_threshold_dialog"
+        android:layout_width="280dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="0.01"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+</LinearLayout>
diff --git a/res/layout/url_dialog.xml b/res/layout/url_dialog.xml
new file mode 100644
index 0000000..04cf899
--- /dev/null
+++ b/res/layout/url_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/et_url_dialog"
+        android:layout_width="280dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="10.105.32.59"
+        android:ems="10" >
+
+        <requestFocus />
+    </EditText>
+
+</LinearLayout>
diff --git a/res/layout/webcamera.xml b/res/layout/webcamera.xml
new file mode 100644
index 0000000..1c3aa8e
--- /dev/null
+++ b/res/layout/webcamera.xml
@@ -0,0 +1,12 @@
+<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"
+    tools:context="${relativePackage}.${activityClass}" >
+
+    <SurfaceView 
+        android:id="@+id/sView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/res/menu/main.xml b/res/menu/main.xml
new file mode 100644
index 0000000..289b8a1
--- /dev/null
+++ b/res/menu/main.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/capture_mode"
+      android:title="Capture Mode">
+        <menu >
+            <group android:checkableBehavior="single">
+               <item android:id="@+id/camera" android:title="Camera"></item>
+               <item android:id="@+id/video" android:title="Video"  android:checked="true"></item>
+            </group>
+        </menu>
+    </item>
+   <item android:id="@+id/web_camera" android:title="Web Camera"/>
+    <item android:id="@+id/frame_lifting"
+        android:title="Frame Lifting"/>
+    <item android:id="@+id/peek_threshold"
+      android:title="Peek Threshold"/>
+    <item android:id="@+id/upload_url"
+      android:title="Upload Url"/>
+    <item android:id="@+id/clear_history"
+        android:title="Clear History"/>
+</menu>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index a4a95bc..3c02242 100644
--- a/res/values-v11/styles.xml
+++ b/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="Theme.AppCompat.Light">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
         <!-- API 11 theme customizations can go here. -->
     </style>
 
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index 664f4f1..a91fd03 100644
--- a/res/values-v14/styles.xml
+++ b/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="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 845fb57..6ce89c7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,7 +4,7 @@
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+    <style name="AppBaseTheme" parent="android:Theme.Light">
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
diff --git a/src/edu/bupt/camera/CameraActivity.java b/src/edu/bupt/camera/CameraActivity.java
index bd7a719..1ee4195 100644
--- a/src/edu/bupt/camera/CameraActivity.java
+++ b/src/edu/bupt/camera/CameraActivity.java
@@ -6,7 +6,11 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+
+import edu.bupt.mccam.MainActivity;
 import edu.bupt.mccam.R;
+import edu.bupt.mccam.MainActivity.MyUploadHelper;
+import edu.bupt.utils.UploadHelper;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -19,10 +23,13 @@
 import android.graphics.PorterDuff.Mode;
 import android.hardware.Camera;
 import android.hardware.Camera.AutoFocusCallback;
+import android.hardware.Camera.Parameters;
 import android.hardware.Camera.PictureCallback;
 import android.media.ExifInterface;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -94,7 +101,7 @@ public void onAutoFocus(boolean success, Camera camera) {
 				Log.d("AutoFocus", "success!");
 				if(!onTouchFocus) {
 					try {
-						camera.takePicture(null, null, mPicture);	
+						camera.takePicture(null, null, mPicture);
 					} catch(Exception e) {
 						e.printStackTrace();
 					}
@@ -176,12 +183,17 @@ protected void onPostExecute(File result) {
 				try {
 					ExifInterface exif = new ExifInterface(result.getAbsolutePath());
 					Log.d("orientation", " " + exif.getAttribute(ExifInterface.TAG_ORIENTATION));
+					Log.d("make", " " + exif.getAttribute(ExifInterface.TAG_MAKE));
+					Log.d("model", " " + exif.getAttribute(ExifInterface.TAG_MODEL));
 					exif.setAttribute(ExifInterface.TAG_ORIENTATION, "" + ExifInterface.ORIENTATION_ROTATE_90);
 					exif.saveAttributes();
 				} catch (IOException e) {
 					e.printStackTrace();
 				}
 				Toast.makeText(getApplicationContext(), "Picture saved", Toast.LENGTH_LONG).show();
+				File[] files = new File[1];
+				files[0] = result;
+				new PicRealtimeUpload(MainActivity.serverIp).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, files);
 				newFile = result;
 				scanImages(result.getAbsolutePath(), false);
 			}
@@ -284,6 +296,13 @@ public void onClick(View v) {
 		}
 	}
 	
+	public boolean isNetworkConnected() {
+		ConnectivityManager connManager = (ConnectivityManager) this
+				.getSystemService(CONNECTIVITY_SERVICE);
+		NetworkInfo networkInfo = connManager.getActiveNetworkInfo();
+		return networkInfo != null ? networkInfo.isConnected() : false;
+	}
+	
 	private void scanImages(final String scanPath, final boolean open) {
 		conn = new MediaScannerConnection(this, 
 			new MediaScannerConnectionClient() {
@@ -425,7 +444,9 @@ private void setCameraParameters(){
 			List<Camera.Size> picSizes = params.getSupportedPictureSizes();
 			Camera.Size mSize = picSizes.get(0);
 			for(Camera.Size s:picSizes){
-				if(s.width > mSize.width){
+				Log.d("camera_size", "w" + s.width + ",h" + s.height);
+				int tmp = s.width*s.height;
+				if(tmp > 300000 && tmp < 340000){
 					mSize = s;
 				}
 			}
@@ -468,6 +489,21 @@ private Camera.Size getOptimalPreviewSize(List<Camera.Size> sizes, int w, int h)
 		return optimalSize;
 	}
 	
+	public class PicRealtimeUpload extends UploadHelper{
+		public String user_upload_url;
+		
+		public PicRealtimeUpload(String addr) {
+			super(addr);
+			this.user_upload_url = addr;
+		}
+		
+		@Override
+		protected Object doInBackground(File[]... params) {
+			super.uploadFile(params[0]);
+			return null;
+		}
+	}
+	
 	@Override
 	protected void onPause() {
 		releaseCamera();
diff --git a/src/edu/bupt/camera/FrameLifting.java b/src/edu/bupt/camera/FrameLifting.java
new file mode 100644
index 0000000..6cfdcc9
--- /dev/null
+++ b/src/edu/bupt/camera/FrameLifting.java
@@ -0,0 +1,115 @@
+package edu.bupt.camera;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import edu.bupt.mccam.MainActivity;
+import android.app.Service;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Matrix;
+import android.media.ExifInterface;
+import android.media.MediaMetadataRetriever;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.util.Log;
+import android.widget.Toast;
+
+public class FrameLifting extends Service {
+	private static final String TAG = "FrameLifting";
+	
+	private static String filePath;
+	private static String phoneMode;
+	private static String phoneMake;
+	private static float focalLength; 
+	
+	private static int frameNumber;
+	
+	private Handler mHandler;
+
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		Log.d(TAG, "onCreate");
+		mHandler = new Handler(){
+        	@Override
+        	public void handleMessage(Message msg) {
+        		if(msg.what == 0x123){
+        			Log.d(TAG, "Frame Lifting Complete!");
+        			Toast.makeText(FrameLifting.this, frameNumber + " frames have been lifted!", Toast.LENGTH_LONG).show();
+        			stopSelf();
+        		}
+        	}
+        };
+	}
+	
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		Log.d(TAG, "onStartCommand");
+		filePath = intent.getExtras().getString("filePath");
+		phoneMode = intent.getExtras().getString("phoneMode");
+		phoneMake = intent.getExtras().getString("phoneMake");
+		focalLength = intent.getExtras().getFloat("focalLength");
+		Log.d(TAG, "filePath: " + filePath + "\n" 
+							+ "phoneMode: " + phoneMode + "\n"
+							  + "focalLength: " + focalLength);
+		mThread.start();
+		return super.onStartCommand(intent, flags, startId);
+	}
+	
+	@Override
+	public IBinder onBind(Intent arg0) {
+		return null;
+	}
+
+	Thread mThread = new Thread(new Runnable() {
+			
+			@Override
+			public void run() {
+				Message msg = new Message();
+	//			String dataPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/"+"RecordVideo"+ "/testVideo.mp4";
+				String dataPath = filePath;
+				MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+				retriever.setDataSource(dataPath);
+				// 取得视频的长度(单位为毫秒)
+				String time = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
+				// 取得视频的长度(单位为秒)
+				int seconds = Integer.valueOf(time) / 1000;
+				// 得到每一秒时刻的bitmap比如第一秒,第二秒
+				frameNumber = seconds*MainActivity.frameNum;
+				for (int i = 1; i <= frameNumber; i++) {
+					Log.d(TAG, "framelift : " + i);
+					Bitmap bitmap = retriever.getFrameAtTime((i/MainActivity.frameNum)*1000*1000,MediaMetadataRetriever.OPTION_CLOSEST_SYNC);
+//					Matrix matrix = new Matrix();
+//					matrix.setScale(1, 360/480);
+//					Bitmap tempBitmap = Bitmap.createBitmap(bitmap, 0, 0, 640, 360);
+					String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+					String path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/"+"MCCam"+ File.separator + timeStamp + "_" + i +".jpg";
+					FileOutputStream fos = null;
+					try {
+						fos = new FileOutputStream(path);
+						bitmap.compress(CompressFormat.JPEG, 100, fos);
+						ExifInterface exif = new ExifInterface(path);
+						exif.setAttribute(ExifInterface.TAG_MAKE, phoneMake);
+						exif.setAttribute(ExifInterface.TAG_MODEL, phoneMode);
+						exif.setAttribute(ExifInterface.TAG_FOCAL_LENGTH, focalLength+"");
+						exif.saveAttributes();
+						fos.close();
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+				msg.what = 0x123;
+				mHandler.sendMessage(msg);
+			}
+		});
+	
+	public void onDestroy() {
+		Log.d(TAG, "onDestroy");
+	};
+	}
diff --git a/src/edu/bupt/camera/VideoActivity.java b/src/edu/bupt/camera/VideoActivity.java
new file mode 100644
index 0000000..6a9c4e1
--- /dev/null
+++ b/src/edu/bupt/camera/VideoActivity.java
@@ -0,0 +1,650 @@
+package edu.bupt.camera;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import edu.bupt.camera.CameraActivity.PicRealtimeUpload;
+import edu.bupt.mccam.MainActivity;
+import edu.bupt.mccam.R;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.hardware.Camera.Parameters;
+import android.hardware.Camera.Size;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.hardware.Camera.AutoFocusCallback;
+import android.hardware.Camera.PictureCallback;
+import android.hardware.Camera.PreviewCallback;
+import android.media.CamcorderProfile;
+import android.media.ExifInterface;
+import android.media.MediaRecorder;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+public class VideoActivity extends Activity implements SensorEventListener,OnClickListener,SurfaceHolder.Callback,PreviewCallback{
+	
+	private static String TAG = "VideoActivity";
+	private static final float NS2S = 1.0f / 1000000000.0f;
+	public static final int MEDIA_TYPE_VIDEO = 2;
+	private static final int MEDIA_TYPE_IMAGE = 1;
+	
+	private static final String packageName = "edu.bupt.framelifting";
+	private static final String className = "edu.bupt.framelifting.MainActivity";
+	
+	private SensorManager sensorManager;
+	private Sensor gyroscopeSensor;
+	
+	private float timestamp;
+	private float angle[] = new float[3];
+	private ProgressBar progressBar;
+	private int rotateProgress = 0;
+	private static int captureNum = 24;
+	
+	private float anglex, angley, anglez;
+	
+	private Handler handler;
+	
+	private Camera mCamera;
+	private SurfaceView mSurfaceView;
+	private SurfaceHolder mSurfaceHolder;
+	private MediaRecorder mMediaRecorder;
+	private Button bt_capture;
+	
+	private boolean isRecording;
+	private boolean flag = false;
+	
+	private static String filePath;
+	private static String phoneMode;
+	private static String phoneMake;
+	private static float focalLength;
+	
+	private RealFrameTask mRealFrameTask;
+	private boolean isPreview =false;
+	private boolean touchFlag = true;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		setContentView(R.layout.activity_auto_capture);
+		progressBar=(ProgressBar)findViewById(R.id.progressBar_record_progress);
+		progressBar.setVisibility(View.GONE);
+		sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+		gyroscopeSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+		bt_capture=(Button) findViewById(R.id.start);
+		bt_capture.setOnClickListener(this);
+		mCamera=getCameraInstance();
+		mSurfaceView=(SurfaceView) findViewById(R.id.SurfaceView);
+		mSurfaceView.setOnClickListener(new OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				if(touchFlag){
+					mCamera.autoFocus(mAFCallback);
+				}
+			}
+		});
+		mSurfaceHolder=mSurfaceView.getHolder();
+		mSurfaceHolder.addCallback(this);
+		mSurfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+	
+		phoneMode = Build.MODEL;
+		phoneMake = Build.BRAND;
+		
+		new Thread(new ScanThread()).start();
+		
+		handler=new Handler(){
+			@Override
+			public void handleMessage(Message msg){
+				if(msg.what==1){
+					progressBar.setProgress(rotateProgress);
+				}
+				if(msg.what==2){
+					Toast.makeText(VideoActivity.this,"Capture Complete!",Toast.LENGTH_SHORT).show();
+					
+					Intent intent = new Intent(VideoActivity.this, FrameLifting.class);
+					intent.putExtra("filePath", filePath);
+					intent.putExtra("phoneMode", phoneMode);
+					intent.putExtra("phoneMake", phoneMake);
+					intent.putExtra("focalLength", focalLength);
+//					startService(intent);
+					VideoActivity.this.finish();
+				}
+			}
+		};
+		
+	}
+	
+	public void init(){
+		rotateProgress=0;
+		angle[0]=0;
+		angle[1]=0;
+		angle[2]=0;
+		progressBar.setProgress(rotateProgress);
+		
+	}
+	
+	
+	
+	@Override
+	public void onSensorChanged(SensorEvent event) {
+		if (event.sensor.getType() == Sensor.TYPE_GYROSCOPE) {
+			if (timestamp != 0) {
+				final float dT = (event.timestamp - timestamp) * NS2S;
+				angle[0] += event.values[0] * dT;
+				angle[1] += event.values[1] * dT;
+				angle[2] += event.values[2] * dT;
+				anglex = (float) Math.toDegrees(angle[0]);
+				angley= (float) Math.toDegrees(angle[1]);
+				anglez = (float) Math.toDegrees(angle[2]);
+				flag = true;
+				
+				if(rotateProgress < 100){
+					rotateProgress = Math.abs((int)(((float)angley/360)*100));
+					handler.sendEmptyMessage(1);
+				}else{
+					stopRecorder();
+				}
+			}
+			timestamp = event.timestamp;
+		}
+	}
+
+	@Override
+	public void surfaceChanged(SurfaceHolder holder, int format, int width,
+			int height) {
+		if(holder.getSurface()==null){
+			return;
+		}
+		mCamera.stopPreview();
+		try {
+			mCamera.setPreviewDisplay(holder);
+			setCameraDisplayOrientation(this, 0, mCamera);
+			Parameters params = mCamera.getParameters();
+			params.setPreviewSize(640, 480);
+			mCamera.setParameters(params);
+			mCamera.startPreview();
+		} catch (IOException e) {
+			e.printStackTrace();
+			Log.d("Surface Changed", e.getMessage());
+		}
+	}
+
+	@Override
+	public void surfaceCreated(SurfaceHolder holder) {
+		
+		if(mCamera==null){
+			mCamera=getCameraInstance();
+		}
+		try {
+			mCamera.setPreviewDisplay(holder);
+			
+			mCamera.startPreview();
+		} catch (Exception e) {
+			e.printStackTrace();
+			Log.d("surfaceCreated", "error setting camera preview" + e.getMessage());
+		}
+		
+	}
+
+	private Camera getCameraInstance() {
+		Camera c=null;
+		try {
+			c=Camera.open();
+		} catch (Exception e) {
+			e.printStackTrace();
+			Log.d("Open Camera", "failed");
+		}
+		return c;
+	}
+	
+	private boolean prepareVideoRecorder(){
+		if (mCamera == null) {
+			mCamera=getCameraInstance();
+		}
+		mMediaRecorder=new MediaRecorder();
+		// Step 1: Unlock and set camera to MediaRecorder
+//		setCameraParameters();
+		mCamera.unlock();
+		mMediaRecorder.setCamera(mCamera);
+		// Step 2: Set sources
+		mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
+		mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+		// Step 3: Set a CamcorderProfile (requires API Level 8 or higher instead of setting format and encoding)
+		mMediaRecorder.setProfile(CamcorderProfile.get(CamcorderProfile.QUALITY_HIGH));
+		// Step 4: Set output file
+		mMediaRecorder.setOutputFile(getOutputMediaFile(MEDIA_TYPE_VIDEO).toString());
+		mMediaRecorder.setVideoSize(640, 480);
+		// Step 5: Set the preview output
+		mMediaRecorder.setPreviewDisplay(mSurfaceHolder.getSurface());
+		 // Step 6: Prepare configured MediaRecorder
+		
+		try {
+			mMediaRecorder.prepare();
+		} catch (IllegalStateException e) {
+			e.printStackTrace();
+			Log.d("TAG", "IllegalStateException preparing MediaRecorder: " + e.getMessage());
+			releaseMediaRecorder();
+		} catch (IOException e) {
+			Log.d("TAG", "IOException preparing MediaRecorder: " + e.getMessage());
+			e.printStackTrace();
+			releaseMediaRecorder();
+		}	
+		return true;	
+	}
+	
+	public static void setCameraDisplayOrientation(Activity activity, int cameraId, Camera camera) {
+		Camera.CameraInfo info = new Camera.CameraInfo();
+		Camera.getCameraInfo(cameraId, info);
+		int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+		int degrees = 0;
+		switch (rotation) {
+		case Surface.ROTATION_0:
+			degrees = 0;
+			break;
+		case Surface.ROTATION_90:
+			degrees = 90;
+			break;
+		case Surface.ROTATION_180:
+			degrees = 180;
+			break;
+		case Surface.ROTATION_270:
+			degrees = 270;
+			break;
+		}
+		int rotationDegrees;
+		if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+			rotationDegrees = (info.orientation + degrees) % 360;
+			rotationDegrees = (360 - rotationDegrees) % 360; // compensate the mirror
+		} else {
+			rotationDegrees = (info.orientation - degrees + 360) % 360;
+		}
+		camera.setDisplayOrientation(rotationDegrees);
+	}
+	
+	private void releaseMediaRecorder(){
+		if(mMediaRecorder!=null){
+			mMediaRecorder.reset();// clear recorder configuration
+			mMediaRecorder.release();// release the recorder object
+			mMediaRecorder=null;
+			mCamera.lock();// lock camera for later use
+		}
+	}
+	
+	private void releaseCamera(){
+		if(mCamera!=null){
+			mCamera.release();// release the camera for other applications
+			mCamera=null;
+		}
+	}
+	private static File getOutputMediaFile(int type){
+		File mediaStorageDir=new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/"+"RecordVideo");
+		if(!mediaStorageDir.exists()){
+			if(!mediaStorageDir.mkdirs()){
+				Log.d("getOutputMediaFile", "failed to create directory");
+				return null;
+			}
+		}
+		String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+		File mediaFile;
+		if(type == MEDIA_TYPE_VIDEO){
+			mediaFile = new File(mediaStorageDir.getPath() + 
+					File.separator + "VID_" + timeStamp + ".mp4");
+			filePath = mediaFile.getAbsolutePath();
+		} else {
+			return null;
+		}
+		return mediaFile;	
+	}
+	
+	@Override
+	public void surfaceDestroyed(SurfaceHolder holder) {
+		releaseMediaRecorder();
+		releaseCamera();
+	}
+
+	
+	protected void onPause(){
+		super.onPause();
+		sensorManager.unregisterListener(this);
+		flag=false;
+		releaseMediaRecorder();// if you are using MediaRecorder, release it first
+		releaseCamera();// release the camera immediately on pause event
+	}
+
+	@Override
+	public void onClick(View v) {
+		switch(v.getId()){
+		case R.id.start:
+			if(isRecording){
+				stopRecorder();
+				isPreview = false;
+				touchFlag = true;
+			}else{
+				// initialize video camera
+				mCamera.setOneShotPreviewCallback(VideoActivity.this);
+				isPreview = true;
+				if(prepareVideoRecorder()){
+					touchFlag = false;
+					mMediaRecorder.start();
+					bt_capture.setText("Stop");
+					mCamera.autoFocus(mAFCallback);
+					isRecording = true;
+					init();
+					sensorManager.registerListener(this, gyroscopeSensor,
+							SensorManager.SENSOR_DELAY_GAME);
+				}else{
+					releaseMediaRecorder();
+				}
+			}
+		}
+		
+	}
+	@Override
+	public void onAccuracyChanged(Sensor sensor, int accuracy) {
+		
+	}
+	
+	private AutoFocusCallback mAFCallback = new AutoFocusCallback() {
+		@Override
+		public void onAutoFocus(boolean success, Camera camera) {
+			if(success) {
+				Log.d("AutoFocus", "success!");
+					try {
+						Parameters parameters = mCamera.getParameters();
+						focalLength = parameters.getFocalLength();
+						Log.d(TAG, "FocalLength: " + focalLength);
+					} catch(Exception e) {
+						e.printStackTrace();
+					}
+			}else {
+				Log.d("AutoFocus", "failed!");
+			}
+		}	
+	};
+	
+	private void stopRecorder(){
+		sensorManager.unregisterListener(this);
+		handler.sendEmptyMessage(2);
+		mMediaRecorder.stop();// stop the recording
+		releaseMediaRecorder();// release the MediaRecorder object
+		mCamera.lock();// take camera access back from MediaRecorder
+		bt_capture.setText("Capture");
+		isRecording = false;
+		flag = false;
+		init();
+	}
+	
+	private void setCameraParameters(){
+		if (mCamera != null){
+			Camera.Parameters params = mCamera.getParameters();
+			List<String> focusModes = params.getSupportedFocusModes();
+			for (String s:focusModes){
+				Log.d("FocusMode", s);
+			}
+			if (focusModes.contains(Camera.Parameters.FOCUS_MODE_AUTO)) {
+				params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+			}
+			
+			DisplayMetrics dm = getScreenSize();
+			List<Camera.Size> previewSizes = params.getSupportedPreviewSizes();
+			Camera.Size mPreviewSize = getOptimalPreviewSize(previewSizes, dm.widthPixels, dm.heightPixels);
+			Log.d("OptimalPreviewSize", mPreviewSize.width + "X" + mPreviewSize.height);
+			params.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
+			
+			double screenRatio = (double) dm.heightPixels/dm.widthPixels;
+			double previewRatio = (double) Math.max(mPreviewSize.height,mPreviewSize.width)/
+					Math.min(mPreviewSize.height,mPreviewSize.width);
+			int width, height;
+			if (screenRatio > previewRatio){
+				height = dm.heightPixels;
+				width = (int) (height/previewRatio);
+			} else {
+				width = dm.widthPixels;
+				height = (int) (width*previewRatio);
+			}
+			Log.d("setFrameLayout", "w:" + width + "h:" + height);
+			FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(width, height);
+			
+			
+			List<Camera.Size> picSizes = params.getSupportedPictureSizes();
+			Camera.Size mSize = picSizes.get(0);
+			for(Camera.Size s:picSizes){
+				Log.d("camera_size", "w" + s.width + ",h" + s.height);
+				int tmp = s.width*s.height;
+				if(tmp > 300000 && tmp < 340000){
+					mSize = s;
+				}
+			}
+			params.setPictureSize(mSize.width, mSize.height);
+			mCamera.setParameters(params);
+		}
+	}
+	
+	private DisplayMetrics getScreenSize(){
+		DisplayMetrics dm = new DisplayMetrics();
+		dm = getResources().getDisplayMetrics();
+		return dm;
+	}
+	
+	private Camera.Size getOptimalPreviewSize(List<Camera.Size> sizes, int w, int h) {
+		final double ASPECT_TOLERANCE = 0.1;
+		double targetRatio = (double) w / h;
+
+		if (sizes == null)
+			return null;
+
+		Camera.Size optimalSize = null;
+		double minDiff = Double.MAX_VALUE;
+
+		int targetHeight = h;
+
+		for (Camera.Size size : sizes) {
+			double ratio = (double) size.width / size.height;
+			if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE)
+				continue;
+			if (Math.abs(size.height - targetHeight) < minDiff) {
+				optimalSize = size;
+				minDiff = Math.abs(size.height - targetHeight);
+			}
+		}
+
+		if (optimalSize == null) {
+			minDiff = Double.MAX_VALUE;
+			for (Camera.Size size : sizes) {
+				if (Math.abs(size.height - targetHeight) < minDiff) {
+					optimalSize = size;
+					minDiff = Math.abs(size.height - targetHeight);
+				}
+			}
+		}
+		return optimalSize;
+	}
+
+	
+	@Override
+	public void onPreviewFrame(byte[] data, Camera camera) {
+		Log.d(TAG, "onPreviewFrame");
+		if(mRealFrameTask != null){
+			switch (mRealFrameTask.getStatus()) {
+			case RUNNING:
+				return;
+
+			case PENDING:
+				mRealFrameTask.cancel(false);
+				break;
+			}
+		}
+		mRealFrameTask = new RealFrameTask(data);
+		mRealFrameTask.execute((Void)null);
+	}
+	
+	private class RealFrameTask extends AsyncTask<Void, Void, Void>{
+		
+		private byte[] data;
+		
+		public RealFrameTask(byte[] data) {
+			this.data = data; 
+		}
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			Log.d(TAG, "realFrameTask");
+			Size size = mCamera.getParameters().getPreviewSize();
+			final int width = size.width;
+			final int height = size.height;
+			Log.d(TAG, "width: " + width +" height: " + height);
+			final YuvImage image = new YuvImage(data, ImageFormat.NV21, width, height, null);
+			ByteArrayOutputStream os = new ByteArrayOutputStream(data.length);
+			if(!image.compressToJpeg(new Rect(0, 0, width, height), 100, os)){
+				return null;
+			}
+			byte[] tmp = os.toByteArray();
+			Bitmap bitmap = BitmapFactory.decodeByteArray(tmp, 0, tmp.length);
+			String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+			String path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/"+"MCCam"+ File.separator + timeStamp + ".jpg";
+			File file = new File(path);
+			if(!file.exists()){
+				try {
+					file.createNewFile();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			FileOutputStream fos;
+			try {
+				fos = new FileOutputStream(file);
+				bitmap.compress(Bitmap.CompressFormat.JPEG, 90, fos);
+				ExifInterface exif = new ExifInterface(path);
+				exif.setAttribute(ExifInterface.TAG_MAKE, phoneMake);
+				exif.setAttribute(ExifInterface.TAG_MODEL, phoneMode);
+				exif.setAttribute(ExifInterface.TAG_FOCAL_LENGTH, focalLength+"");
+				exif.saveAttributes();
+				fos.flush();
+				fos.close();
+			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			uploadFile(file);
+			return null;
+		}
+		
+		@Override
+		protected void onPostExecute(Void result) {
+			super.onPostExecute(result);
+		}
+	}
+	
+	public void uploadFile(File file) {
+		
+		HttpClient httpClient = new DefaultHttpClient();
+		InputStream is = null;
+		try {
+			HttpPost httpPost = new HttpPost(MainActivity.serverIp);
+				Log.d("UploadFile", file.getAbsolutePath());
+				FileBody bin = new FileBody(file);
+				MultipartEntityBuilder me = MultipartEntityBuilder.create();
+				me.addPart("file", bin);
+				HttpEntity reqEntity = me.build();
+				httpPost.setEntity(reqEntity);
+				Log.i("HttpPost","request " + httpPost.getRequestLine());
+				HttpResponse response = httpClient.execute(httpPost);
+				Log.i("HttpResponse",response.getStatusLine().toString());
+				HttpEntity resEntity = response.getEntity();
+				if (resEntity != null) {
+					Log.i("resEntity","response content length: " + resEntity.getContentLength());
+				}
+				is = resEntity.getContent();
+				BufferedReader br = new BufferedReader(new InputStreamReader(is));
+				String line = "";
+				String result = "";
+				while ((line = br.readLine()) != null) {
+					result += line;
+				}
+				Log.i("Result", result);
+			if(is != null) is.close();
+		} catch (ClientProtocolException e){
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			if (httpClient != null){
+				httpClient.getConnectionManager().shutdown();
+			}
+		}
+	}
+	
+	class ScanThread implements Runnable{
+
+		@Override
+		public void run() {
+			while(!Thread.currentThread().isInterrupted()){
+				try {
+					if(mCamera != null && isPreview){
+						mCamera.setOneShotPreviewCallback(VideoActivity.this);
+						Log.d(TAG, "scan");
+					}
+					Thread.sleep(MainActivity.frameNum*1000);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+					Thread.currentThread().interrupt();
+				}
+			}
+			
+		}
+		
+	}
+}
diff --git a/src/edu/bupt/camera/WebCameraActivity.java b/src/edu/bupt/camera/WebCameraActivity.java
new file mode 100644
index 0000000..815d208
--- /dev/null
+++ b/src/edu/bupt/camera/WebCameraActivity.java
@@ -0,0 +1,188 @@
+package edu.bupt.camera;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import edu.bupt.mccam.R;
+import android.app.Activity;
+import android.graphics.ImageFormat;
+import android.graphics.Rect;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.hardware.Camera.Size;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.SurfaceHolder.Callback;
+
+public class WebCameraActivity extends Activity{
+		SurfaceView sView;
+		SurfaceHolder surfaceHolder;
+		Camera camera; // 定义系统所用的照相机
+		boolean isPreview = false; // 是否在浏览中
+		private String ipname;
+
+		@Override
+		public void onCreate(Bundle savedInstanceState) {
+			super.onCreate(savedInstanceState);
+			// 设置全屏
+			requestWindowFeature(Window.FEATURE_NO_TITLE);
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+			setContentView(R.layout.webcamera);
+
+			// 获取IP地址
+			ipname = "10.105.39.42";
+			sView = (SurfaceView) findViewById(R.id.sView); // 获取界面中SurfaceView组件
+			surfaceHolder = sView.getHolder(); // 获得SurfaceView的SurfaceHolder
+
+			// 为surfaceHolder添加一个回调监听器
+			surfaceHolder.addCallback(new Callback() {
+				@Override
+				public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+				}
+
+				@Override
+				public void surfaceCreated(SurfaceHolder holder) {
+					initCamera(); // 打开摄像头
+				}
+
+				@Override
+				public void surfaceDestroyed(SurfaceHolder holder) {
+					// 如果camera不为null ,释放摄像头
+					if (camera != null) {
+						if (isPreview)
+							camera.stopPreview();
+					}
+				}
+			});
+			// 设置该SurfaceView自己不维护缓冲
+			surfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+
+		}
+
+		private void initCamera() {
+			if (!isPreview) {
+				camera = Camera.open();
+			}
+			if (camera != null && !isPreview) {
+				try {
+					camera.setPreviewDisplay(surfaceHolder); // 通过SurfaceView显示取景画面
+					setCameraDisplayOrientation(WebCameraActivity.this, 0, camera);
+					camera.setPreviewCallback(new StreamIt(ipname)); // 设置回调的类
+					camera.startPreview(); // 开始预览
+					camera.autoFocus(null); // 自动对焦
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				isPreview = true;
+			}
+	}
+
+		public static void setCameraDisplayOrientation(Activity activity, int cameraId, Camera camera) {
+			Camera.CameraInfo info = new Camera.CameraInfo();
+			Camera.getCameraInfo(cameraId, info);
+			int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+			int degrees = 0;
+			switch (rotation) {
+			case Surface.ROTATION_0:
+				degrees = 0;
+				break;
+			case Surface.ROTATION_90:
+				degrees = 90;
+				break;
+			case Surface.ROTATION_180:
+				degrees = 180;
+				break;
+			case Surface.ROTATION_270:
+				degrees = 270;
+				break;
+			}
+			int rotationDegrees;
+			if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+				rotationDegrees = (info.orientation + degrees) % 360;
+				rotationDegrees = (360 - rotationDegrees) % 360; // compensate the mirror
+			} else {
+				rotationDegrees = (info.orientation - degrees + 360) % 360;
+			}
+			camera.setDisplayOrientation(rotationDegrees);
+		}
+
+	class StreamIt implements Camera.PreviewCallback {
+		private String ipname;
+
+		public StreamIt(String ipname) {
+			this.ipname = ipname;
+		}
+
+		@Override
+		public void onPreviewFrame(byte[] data, Camera camera) {
+			Size size = camera.getParameters().getPreviewSize();
+			try {
+				// 调用image.compressToJpeg（）将YUV格式图像数据data转为jpg格式
+				YuvImage image = new YuvImage(data, ImageFormat.NV21, size.width, size.height, null);
+				Log.d("size", "width: " + size.width + " height: " + size.height);
+				if (image != null) {
+					ByteArrayOutputStream outstream = new ByteArrayOutputStream();
+//					image.compressToJpeg(new Rect(0, 0, size.width, size.height), 100, outstream);
+					image.compressToJpeg(new Rect(0, 0, size.width, size.height), 80, outstream);
+					outstream.flush();
+					// 启用线程将图像数据发送出去
+					Thread th = new MyThread(outstream, ipname);
+					th.start();
+				}
+			} catch (Exception ex) {
+				Log.e("Sys", "Error:" + ex.getMessage());
+			}
+		}
+	}
+
+	class MyThread extends Thread {
+		private byte byteBuffer[] = new byte[1024];
+		private OutputStream outsocket;
+		private ByteArrayOutputStream myoutputstream;
+		private String ipname;
+
+		public MyThread(ByteArrayOutputStream myoutputstream, String ipname) {
+			this.myoutputstream = myoutputstream;
+			this.ipname = ipname;
+			try {
+				myoutputstream.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+		public void run() {
+			try {
+				// 将图像数据通过Socket发送出去
+				Socket tempSocket = new Socket(ipname, 6000);
+				outsocket = tempSocket.getOutputStream();
+				ByteArrayInputStream inputstream = new ByteArrayInputStream(myoutputstream.toByteArray());
+				int amount;
+				while ((amount = inputstream.read(byteBuffer)) != -1) {
+					outsocket.write(byteBuffer, 0, amount);
+				}
+				myoutputstream.flush();
+				myoutputstream.close();
+				tempSocket.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+	  }
+	
+		@Override
+		protected void onDestroy() {
+			super.onDestroy();
+			camera.release();
+			camera = null;
+		}
+}
diff --git a/src/edu/bupt/mccam/MainActivity.java b/src/edu/bupt/mccam/MainActivity.java
index 0dbccb5..83651ff 100644
--- a/src/edu/bupt/mccam/MainActivity.java
+++ b/src/edu/bupt/mccam/MainActivity.java
@@ -1,28 +1,44 @@
 package edu.bupt.mccam;
 
 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
 import edu.bupt.camera.CameraActivity;
+import edu.bupt.camera.VideoActivity;
+import edu.bupt.camera.WebCameraActivity;
 import edu.bupt.pickimg.ImagePickActivity;
+import edu.bupt.utils.DownloadHelper;
 import edu.bupt.utils.HttpClientHelper;
 import edu.bupt.utils.UploadHelper;
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.util.AttributeSet;
 import android.util.Log;
+import android.view.InflateException;
+import android.view.LayoutInflater;
+import android.view.LayoutInflater.Factory;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
-import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -32,25 +48,44 @@
 import android.widget.Toast;
 
 public class MainActivity extends Activity implements OnClickListener {
+	private static final String TAG = "MainActivity";
 	
 	private static final int SELECT_IMAGES = 1;
-	private String serverIp = "http://10.105.32.59/save_file.php";
-	private String server_url_reconstruction = "http://10.105.32.59/reconstruction.php?peak_threshold=";
+	public static String serverIp = "http://10.105.32.59/save_file.php";
+	private static String server_url_reconstruction = "http://10.105.32.59/reconstruction.php?peak_threshold=";
 	private String server_url_log = "http://10.105.32.59/loglog.php";
+//	private String download_url = "http://60.247.77.137:52002/result/option-0000.obj";
+	private String download_url = "http://10.105.32.59/result/option-0000.ply.csv";
 	private static File mediaStorageDir = new File(Environment.getExternalStoragePublicDirectory(
 			Environment.DIRECTORY_PICTURES), "MCCam");
+	private static File resultsFileDir = new File(Environment.getExternalStorageDirectory()
+			.getAbsolutePath() + "/MCCResults");
 	private ArrayList<String> paths = new ArrayList<String>();
 	
 	private Button bt_capture;
 	private Button bt_upload;
 	private Button bt_reconstruction;
+	private Button bt_result;
 	private TextView tv_message;
 	private ProgressBar progressBar;
 	private AutoCompleteTextView tv_auto;
 	private ArrayAdapter<String> tv_adapter;
+	private String filePath;
 	
 	private SharedPreferences sp;
 	
+	private static final String packageName = "edu.buptant.pointscloudviewer";
+	private static final String className = "edu.buptant.pointscloudviewer.MainActivity";
+		
+	public static int frameNum = 1;
+	public static float peek_threshold = 0.01f;
+//	public static String upload_url = "60.247.77.137:52002";
+	public static String upload_url = "";
+	private static int capture_mode = 1;	
+	private static boolean uploadFlag = false;
+	
+	private ActionBar actionBar;
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -59,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		bt_capture = (Button)findViewById(R.id.bt_capture);
 		bt_upload = (Button)findViewById(R.id.bt_upload);
 		bt_reconstruction = (Button)findViewById(R.id.bt_reconstruction);
+		bt_result = (Button)findViewById(R.id.bt_result);
 		progressBar = (ProgressBar)findViewById(R.id.progressBar);
 		tv_message = (TextView) findViewById(R.id.tv_message);
 		
@@ -66,93 +102,311 @@ protected void onCreate(Bundle savedInstanceState) {
 		bt_capture.setOnClickListener(this);
 		bt_upload.setOnClickListener(this);
 		bt_reconstruction.setOnClickListener(this);
+		bt_result.setOnClickListener(this);
 		tv_auto = new AutoCompleteTextView(this);
-		initAutoCompleteTextView();
+//		initAutoCompleteTextView();
+		Log.d("MainActivity", "Frame numbers: " + frameNum + " Peek threshold: " + peek_threshold);
+		
+		if(!mediaStorageDir.exists()){
+			mediaStorageDir.mkdirs();
+		}
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		getMenuInflater().inflate(R.menu.main, menu);
+//		setMenuBackground();
+		return true;
 	}
 	
-	private void initAutoCompleteTextView() {
-		sp = getSharedPreferences("server_addr", 0);
-		Set<String> history = sp.getStringSet("history", new HashSet<String>());
-		String[] histArray = history.toArray(new String[0]);
-		tv_adapter = new ArrayAdapter<String>(this,
-				android.R.layout.simple_dropdown_item_1line, histArray);
-		tv_auto.setAdapter(tv_adapter);
-		tv_auto.setThreshold(1);
-		tv_auto.setOnFocusChangeListener(new OnFocusChangeListener(){
+//	private void setMenuBackground() {
+//		MainActivity.this.getLayoutInflater().setFactory(new Factory() {
+//			
+//			@Override
+//			public View onCreateView(String name, Context context, AttributeSet attrs) {
+//				Log.d(TAG, "menu background name: " + name);
+//				 // 指定自定义inflate的对象  
+//                if (name.equalsIgnoreCase("com.android.internal.view.menu.ListMenuItemView")) {  
+//                	Log.d(TAG, "menu");
+//                    try {  
+//                        LayoutInflater f = getLayoutInflater();  
+//                        final View view = f.createView(name, null,attrs);  
+//                        new Handler().post(new Runnable() {  
+//                            public void run() {  
+//                                // 设置背景图片  
+////                                view.setBackgroundResource(R.color.menu); 
+//                            	view.setBackgroundColor(Color.GRAY);
+//                            }  
+//                        });  
+//                        return view;  
+//                    } catch (InflateException e) {  
+//                        e.printStackTrace();  
+//                    } catch (ClassNotFoundException e) {  
+//                        e.printStackTrace();  
+//                    }  
+//                }  
+//				return null;
+//			}
+//		});
+//		
+//	}
+
+	@Override
+	public boolean onMenuItemSelected(int featureId, MenuItem item) {
+		int id = item.getItemId();
+		switch (id) {
+		case R.id.web_camera:
+			Intent intent = new Intent(MainActivity.this, WebCameraActivity.class);
+			startActivity(intent);
+			break;
+		case R.id.frame_lifting:
+			showFrameSettingDialog();
+			break;
+		case R.id.peek_threshold:
+			showThresholdSettingDialog();
+			break;	
+		case R.id.upload_url:
+			showUrlSettingDialog();
+			break;	
+		case R.id.camera:
+			capture_mode = 0;
+			item.setChecked(true);
+			Toast.makeText(this, "Camera Mode", Toast.LENGTH_SHORT).show();
+			Log.d("Capture Mode", "Camera Mode");
+			break;
+		case R.id.video:
+			capture_mode = 1;
+			item.setChecked(true);
+			Toast.makeText(this, "Video Mode", Toast.LENGTH_SHORT).show();
+			Log.d("Capture Mode", "Video Mode");
+			break;
+		case R.id.clear_history:
+			new AlertDialog.Builder(this)
+			.setTitle("Clear history?")
+			.setPositiveButton("ok",
+					new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog,
+								int which) {
+							File file = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)+"/"+"MCCam");
+							deleteFile(file);
+//							if(!file.exists()){
+//								file.mkdirs();
+//							}
+							Toast.makeText(MainActivity.this, "Clear complete!", Toast.LENGTH_SHORT).show();
+						}
+					})
+			.setNegativeButton("cancel",
+					new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog,
+								int which) {
+						}
+					})
+			.show();
+			break;
+		default:
+			break;
+		}
+		return true;
+	}
+	
+	private void showFrameSettingDialog(){
+		AlertDialog dialog = null;
+		AlertDialog.Builder builder = null;
+		View view = LayoutInflater.from(MainActivity.this).inflate(R.layout.frame_dialog, null);
+		final EditText et_num = (EditText) view.findViewById(R.id.et_frame_dialog);
+		builder = new AlertDialog.Builder(MainActivity.this);
+		builder.setTitle("Input frame interval：");
+		builder.setView(view);
+		builder.setPositiveButton("Confirm",new DialogInterface.OnClickListener() {
+			
 			@Override
-			public void onFocusChange(View v, boolean hasFocus) {
-				AutoCompleteTextView view = (AutoCompleteTextView) v;
-				if(hasFocus) {
-					view.showDropDown();
-				}
+			public void onClick(DialogInterface dialog, int which) {
+				int num = Integer.parseInt(et_num.getText().toString());
+				frameNum = num;
+				Log.d("frame number", "Frame numbers: " + frameNum);
+			}
+		}).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.dismiss();
 			}
 		});
+
+		dialog = builder.create();
+		dialog.show();
 	}
-	
-	private void saveServerAddr(String s) {
-		if(!s.equals("")) {
-			Set<String> hist = sp.getStringSet("history", new HashSet<String>());
-			if(!hist.contains(s)) {
-				tv_adapter.add(s);
-				Set<String> nhist = new HashSet<String>(hist);
-				nhist.add(s);
-				sp.edit().putStringSet("history", nhist).commit();
+		
+	private void showThresholdSettingDialog(){
+		AlertDialog dialog = null;
+		AlertDialog.Builder builder = null;
+		View view = LayoutInflater.from(MainActivity.this).inflate(R.layout.threshold_dialog, null);
+		final EditText et_num = (EditText) view.findViewById(R.id.et_threshold_dialog);
+		builder = new AlertDialog.Builder(MainActivity.this);
+		builder.setTitle("Input peek threshold：");
+		builder.setView(view);
+		builder.setPositiveButton("Confirm",new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				float threshold = Float.parseFloat(et_num.getText().toString());
+				peek_threshold = threshold;
+				Log.d("peek threshold", "Peek threshold: " + peek_threshold);
 			}
-		}
+		}).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.dismiss();
+			}
+		});
+
+		dialog = builder.create();
+		dialog.show();
 	}
+	
+	private void showUrlSettingDialog(){
+		AlertDialog dialog = null;
+		AlertDialog.Builder builder = null;
+		View view = LayoutInflater.from(MainActivity.this).inflate(R.layout.url_dialog, null);
+		final EditText et_num = (EditText) view.findViewById(R.id.et_url_dialog);
+		builder = new AlertDialog.Builder(MainActivity.this);
+		builder.setTitle("Input upload url：");
+		builder.setView(view);
+		builder.setPositiveButton("Confirm",new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				upload_url = et_num.getText().toString();
+				Log.d("upload url", "Upload Url: " + upload_url);
+			}
+		}).setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				dialog.dismiss();
+			}
+		});
 
+		dialog = builder.create();
+		dialog.show();
+	}
+	
+	
+//	private void initAutoCompleteTextView() {
+//		sp = getSharedPreferences("server_addr", 0);
+//		Set<String> history = sp.getStringSet("history", new HashSet<String>());
+//		String[] histArray = history.toArray(new String[0]);
+//		tv_adapter = new ArrayAdapter<String>(this,
+//				android.R.layout.simple_dropdown_item_1line, histArray);
+//		tv_auto.setAdapter(tv_adapter);
+//		tv_auto.setThreshold(1);
+//		tv_auto.setOnFocusChangeListener(new OnFocusChangeListener(){
+//			@Override
+//			public void onFocusChange(View v, boolean hasFocus) {
+//				AutoCompleteTextView view = (AutoCompleteTextView) v;
+//				if(hasFocus) {
+//					view.showDropDown();
+//				}
+//			}
+//		});
+//	}
+	
 	@Override
 	public void onClick(View v) {
 		switch(v.getId()) {
 		case R.id.bt_capture:
-			Intent camIntent = new Intent(MainActivity.this, CameraActivity.class);
-			startActivity(camIntent);
+			if(capture_mode == 0){
+				Intent cameraIntent = new Intent(MainActivity.this, CameraActivity.class);
+				startActivity(cameraIntent);
+			}else{
+				Intent videoIntent = new Intent(MainActivity.this, VideoActivity.class);
+				startActivity(videoIntent);
+			}
 			break;		
 		case R.id.bt_upload:
-			bt_upload.setEnabled(false);
-			if(mediaStorageDir.exists()) {
-				if (mediaStorageDir.list().length > 0) {
-					InputServerAddress();
-					break;
+			if(isNetworkConnected()){
+				bt_upload.setEnabled(false);
+				if(mediaStorageDir.exists()) {
+					if (mediaStorageDir.list().length > 0) {
+						updateServerAddr(upload_url);
+						Log.d("InputAddress", upload_url);
+						picImage();
+						break;
+					}
 				}
+				bt_upload.setEnabled(true);
+				Toast.makeText(getApplicationContext(), "Nothing to upload", Toast.LENGTH_LONG).show();
+			} else{
+				Toast.makeText(this, "Network is unavailable!",
+						Toast.LENGTH_LONG).show();
 			}
-			bt_upload.setEnabled(true);
-			Toast.makeText(getApplicationContext(), "Nothing", Toast.LENGTH_LONG).show();
 			break;
 		case R.id.bt_reconstruction:
-			bt_reconstruction.setEnabled(false);
-			InputPeakThreshold();
+//			if(uploadFlag){
+				uploadFlag = false;
+				bt_reconstruction.setEnabled(false);
+				new MyHttpClientTask().execute(server_url_reconstruction + peek_threshold,
+						server_url_log);
+//			}else{
+//				Toast.makeText(this, "Nothing to reconstruct", Toast.LENGTH_SHORT).show();
+//			}
+//			InputPeakThreshold();
+			break;
+		case R.id.bt_result:
+			new AlertDialog.Builder(this)
+			.setTitle("Download the newest model?")
+			.setPositiveButton("ok",
+					new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog,
+								int which) {
+							downloadResult(download_url);
+						}
+					})
+			.setNegativeButton("cancel",
+					new DialogInterface.OnClickListener() {
+						@Override
+						public void onClick(DialogInterface dialog,
+								int which) {
+							startPointCloudViewer(filePath);
+						}
+					})
+			.show();
+			
+			break;
 		default: break;
 		}
 	}
 	
-	private void InputPeakThreshold() {
-		tv_message.setText("");
-		final EditText et = new EditText(this);
-		et.setHint("1");
-		new AlertDialog.Builder(this)
-			.setTitle("Input peak threshold")
-			.setView(et)
-			.setCancelable(false)
-			.setPositiveButton(android.R.string.ok,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						String s = et.getText().toString();
-						String value = s.equals("") ? "10" : s;				
-						Log.d("InputValue", " " + value);
-						new MyHttpClientTask().execute(server_url_reconstruction + value,
-								server_url_log);
-					}
-				})
-			.setNegativeButton(android.R.string.cancel,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						bt_reconstruction.setEnabled(true);
-					}
-				})
-			.show();
+	private void startPointCloudViewer(String filePath) {
+		Intent intent = new Intent(Intent.ACTION_MAIN);
+		intent.addCategory(Intent.CATEGORY_LAUNCHER);            
+		ComponentName cn = new ComponentName(packageName, className);            
+		intent.setComponent(cn);
+		intent.putExtra("filePath", filePath);
+		startActivity(intent);
+	}
+	
+	private void downloadResult(String downloadAddr) {
+		if(!resultsFileDir.exists()){
+			resultsFileDir.mkdir();
+		}
+		String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+		File result = new File(resultsFileDir, "3d_" + timeStamp + ".csv");
+		filePath = result.getAbsolutePath();
+		progressBar.setMax(100);
+		progressBar.setVisibility(ProgressBar.VISIBLE);
+		new MyDownloadHelper(downloadAddr).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, result);
+	}
+
+	public boolean isNetworkConnected() {
+		ConnectivityManager connManager = (ConnectivityManager) this
+				.getSystemService(CONNECTIVITY_SERVICE);
+		NetworkInfo networkInfo = connManager.getActiveNetworkInfo();
+		return networkInfo != null ? networkInfo.isConnected() : false;
 	}
 	
 	private void updateServerAddr(String ip) {
@@ -168,38 +422,6 @@ private void updateServerAddr(String ip) {
 		
 	}
 	
-	private void InputServerAddress() {
-		ViewGroup vg = (ViewGroup) tv_auto.getParent();
-		if(vg != null) {
-			vg.removeView(tv_auto);
-		}
-		new AlertDialog.Builder(this)
-			.setTitle("Input server address")
-			.setView(tv_auto)
-			.setCancelable(false)
-			.setPositiveButton(android.R.string.ok,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						String s = tv_auto.getText().toString();
-						updateServerAddr(s);
-						Log.d("InputAddress", " " + serverIp);
-						saveServerAddr(s);
-						tv_auto.setText("");
-						picImage();
-					}
-				})
-			.setNegativeButton(android.R.string.cancel,
-				new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						tv_auto.setText("");
-						bt_upload.setEnabled(true);
-					}
-				})
-			.show();
-	}
-	
 	private void picImage() {
 		Intent intent = new Intent(this, ImagePickActivity.class);
 		startActivityForResult(intent, SELECT_IMAGES);
@@ -231,7 +453,22 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		}
 	}
 	
-	private class MyUploadHelper extends UploadHelper{
+	public void deleteFile(File file) { 
+        if (file.exists() == false) { 
+            Log.d(TAG, "file is not existed!"); 
+            return; 
+        } else { 
+                File[] childFile = file.listFiles(); 
+                if(childFile.length == 0){
+                	return;
+                }
+                for (File f : childFile) { 
+                    f.delete(); 
+            } 
+        } 
+    } 
+	
+	public class MyUploadHelper extends UploadHelper{
 		public MyUploadHelper(String addr) {
 			super(addr);
 		}
@@ -253,6 +490,7 @@ private String generateProgressInfo(int progress) {
 		@Override
 		public void onFinished() {
 			Toast.makeText(getApplicationContext(), "Upload finished", Toast.LENGTH_LONG).show();
+			uploadFlag = true;
 			progressBar.setVisibility(ProgressBar.GONE);
 			progressBar.setProgress(0);
 		}
@@ -275,7 +513,7 @@ public void onFinished() {
 	public void onBackPressed() {
 		new AlertDialog.Builder(this)
 			.setTitle(R.string.exit)
-			.setPositiveButton(android.R.string.ok,
+			.setPositiveButton("Confirm",
 					new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog,
@@ -283,7 +521,7 @@ public void onClick(DialogInterface dialog,
 							MainActivity.this.finish();
 						}
 					})
-			.setNegativeButton(android.R.string.cancel,
+			.setNegativeButton("Cancel",
 					new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog,
@@ -292,5 +530,32 @@ public void onClick(DialogInterface dialog,
 					})
 			.show();
 	}
+	
+	private class MyDownloadHelper extends DownloadHelper {
+
+		public MyDownloadHelper(String downloadAddr) {
+			super(downloadAddr);
+		}
+
+		@Override
+		public void updateProgress(int progress) {
+			progressBar.setProgress(progress);
+			tv_message.setText(generateProgressInfo(progress));
+		}
+		
+		private String generateProgressInfo(int progress) {
+			String result = "Downloading : " + (progress*100) / progressBar.getMax() + "%\n";
+			return result;
+		}
+
+		@Override
+		public void onFinished() {
+			Toast.makeText(getApplicationContext(), "Download finished", Toast.LENGTH_LONG).show();
+			progressBar.setVisibility(ProgressBar.GONE);
+			progressBar.setProgress(0);
+			startPointCloudViewer(filePath);
+		}
+		
+	}
 
 }
diff --git a/src/edu/bupt/utils/DownloadHelper.java b/src/edu/bupt/utils/DownloadHelper.java
new file mode 100644
index 0000000..412d511
--- /dev/null
+++ b/src/edu/bupt/utils/DownloadHelper.java
@@ -0,0 +1,80 @@
+package edu.bupt.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+public class DownloadHelper extends AsyncTask<File, Integer, Object> {
+
+	private String downloadAddr;
+	private long fileSize;
+	
+	public DownloadHelper(String downloadAddr){
+		this.downloadAddr = downloadAddr;
+	}
+	
+	public void downloadFile(File file){
+		HttpGet httpGet = new HttpGet(downloadAddr);  
+		HttpClient httpClient = new DefaultHttpClient();
+		try {
+			FileWriter fw = new FileWriter(file);
+			HttpResponse httpResponse = httpClient.execute(httpGet);
+			HttpEntity httpEntity = httpResponse.getEntity();
+			if(httpEntity != null){
+				BufferedReader br = new BufferedReader(new InputStreamReader(httpEntity.getContent()));
+				fileSize = httpEntity.getContentLength();
+				String line = null;
+				int tmpSize = 0;
+				while((line = br.readLine()) != null){
+					line += "\n";
+					fw.write(line);
+					tmpSize += line.getBytes().length;
+					publishProgress((int)(100*tmpSize/fileSize));
+				}
+				Log.d("download", "download complete!");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
+	protected Object doInBackground(File... params) {
+		downloadFile(params[0]);
+		return null;
+	}
+	
+	public void updateProgress(int progress) {
+	}
+	
+	public void onFinished() {
+	}
+
+	@Override
+	protected void onProgressUpdate(Integer... values) {
+		super.onProgressUpdate(values);
+		updateProgress(values[0].intValue());
+	}
+
+	@Override
+	protected void onPostExecute(Object result) {
+		super.onPostExecute(result);
+		onFinished();
+	}	
+}
diff --git a/src/edu/bupt/utils/UploadHelper.java b/src/edu/bupt/utils/UploadHelper.java
index 698240f..eac0611 100644
--- a/src/edu/bupt/utils/UploadHelper.java
+++ b/src/edu/bupt/utils/UploadHelper.java
@@ -24,9 +24,10 @@ public class UploadHelper extends AsyncTask<File[], Integer, Object> {
 	
 	public UploadHelper(String addr) {
 		user_upload_url = addr;
+		Log.d("url", "url: " + user_upload_url);
 	}
 	
-	private void uploadFile(File[] files) {
+	public void uploadFile(File[] files) {
 		if (files.length == 0) {
 			Log.i("FileList", "empty!");
 			return;