Pārlūkot izejas kodu

1.完成POP模式界面搭建。
2.完成Upload Setting功能实现。

Pen Li 9 gadi atpakaļ
vecāks
revīzija
ca8251a77e

+ 10 - 4
RA Image/app/src/main/AndroidManifest.xml

@@ -124,12 +124,18 @@
             android:theme="@style/FullscreenTheme" />
         <activity
             android:name=".ModeActivity"
-            android:theme="@style/Base.Theme.AppCompat.Light"></activity>
-
-        <activity android:name=".uploadSettingActivity"
-            android:theme="@style/Base.Theme.AppCompat.Light">
+            android:theme="@style/Base.Theme.AppCompat.Light" />
+        <activity
+            android:name=".uploadSettingActivity"
+            android:theme="@style/Base.Theme.AppCompat.Light" />
+        <activity
+            android:name=".POP.PopActivity"
+            android:theme="@style/Theme.AppCompat.Light"
+            android:label="@string/app_name"
+            android:stateNotNeeded="true">
 
         </activity>
+
     </application>
 
 </manifest>

+ 264 - 264
RA Image/app/src/main/java/com/usai/redant/raimage/MainActivity.java

@@ -143,26 +143,26 @@ public class MainActivity extends Activity
 		Log.d(TAG, "=======================>MainActivity Created!");
 		super.onCreate(savedInstanceState);
 		
-		setContentView(R.layout.activity_main1);
-
-		setTitle(getTitle() + "(" + RedAntApplication.station_name + ")");
-		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
-		thumbsImageView.setOnClickListener(new View.OnClickListener()
-		{
-
-			@Override
-			public void onClick(View v)
-			{
-				if (photoList.size() < 1)
-					return;
-
-				Intent intent = new Intent(MainActivity.this,
-						PhotoPreviewActivity.class);
-				intent.putExtra("pic_list", (Serializable) photoList);
-				startActivityForResult(intent, REQUEST_PREVIEW);
-
-			}
-		});
+//		setContentView(R.layout.activity_main1);
+//
+//		setTitle(getTitle() + "(" + RedAntApplication.station_name + ")");
+//		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
+//		thumbsImageView.setOnClickListener(new View.OnClickListener()
+//		{
+//
+//			@Override
+//			public void onClick(View v)
+//			{
+//				if (photoList.size() < 1)
+//					return;
+//
+//				Intent intent = new Intent(MainActivity.this,
+//						PhotoPreviewActivity.class);
+//				intent.putExtra("pic_list", (Serializable) photoList);
+//				startActivityForResult(intent, REQUEST_PREVIEW);
+//
+//			}
+//		});
 		// m_sName = intent.getStringExtra("user");
 		// m_sPassword = intent.getStringExtra("password");
 
@@ -188,69 +188,69 @@ public class MainActivity extends Activity
 			// Arrays.asList(savedInstanceState.getStringArray("arrayLabel"));
 			photoList = savedInstanceState.getStringArrayList("photoList");
 			
-			TextView pidval = (TextView) findViewById(R.id.pidval);
-			pidval.setText(savedInstanceState.getString("PIID"));
+//			TextView pidval = (TextView) findViewById(R.id.pidval);
+//			pidval.setText(savedInstanceState.getString("PIID"));
 			// photoList = A
 			// savedInstanceState.getStringArrayList("photoList");
 			photoFile = (File) savedInstanceState.getSerializable("photoFile");
 
 			if (thumbBitmap != null)
 			{
-				thumbsImageView.setImageBitmap(thumbBitmap);
+//				thumbsImageView.setImageBitmap(thumbBitmap);
 				// Log.d(TAG, "load thumbpath==" + thumbpath);
 			}
 			// photoFile.delete();
-			TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
-			countTextView.setText(photoList.size() + " Photos");
+//			TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
+//			countTextView.setText(photoList.size() + " Photos");
 
 		}
 
-		ImageButton ibtnscan = (ImageButton) findViewById(R.id.ibtnScan);
-		ibtnscan.setOnClickListener(new View.OnClickListener()
-		{
-
-			@Override
-			public void onClick(View v)
-			{
-				Log.d(TAG, "==============>Click Scan button");
-				Intent intent = new Intent();
-
-				intent.setClass(MainActivity.this, CaptureActivity.class);
-				startActivityForResult(intent, REQUEST_SCAN_BARCODE);
-			}
-		});
-
-		ImageButton captureButton = (ImageButton) findViewById(R.id.ibtnCapture);
-		captureButton.setOnClickListener(new View.OnClickListener()
-		{
-
-			@Override
-			public void onClick(View v)
-			{
-
-				StartCamera();
-			}
-		});
-		ImageButton uploadButton = (ImageButton) findViewById(R.id.ibtnOk);
-		uploadButton.setOnClickListener(new View.OnClickListener()
-		{
-
-			@Override
-			public void onClick(View v)
-			{
-
-				sendBroadcast(new Intent("REDANT.POP.REQUEST_LOCATION"));
-				return;
-
-			}
-		});
-
-		m_tvalert = (TextView) findViewById(R.id.tvalert);
-		m_tvalert.setSelected(true);
-
-		// Intent intent = ;
-		sendBroadcast(new Intent("REDANT.POP.MODIFY_QUEUE"));
-		updateUploadButton();
+//		ImageButton ibtnscan = (ImageButton) findViewById(R.id.ibtnScan);
+//		ibtnscan.setOnClickListener(new View.OnClickListener()
+//		{
+//
+//			@Override
+//			public void onClick(View v)
+//			{
+//				Log.d(TAG, "==============>Click Scan button");
+//				Intent intent = new Intent();
+//
+//				intent.setClass(MainActivity.this, CaptureActivity.class);
+//				startActivityForResult(intent, REQUEST_SCAN_BARCODE);
+//			}
+//		});
+//
+//		ImageButton captureButton = (ImageButton) findViewById(R.id.ibtnCapture);
+//		captureButton.setOnClickListener(new View.OnClickListener()
+//		{
+//
+//			@Override
+//			public void onClick(View v)
+//			{
+//
+//				StartCamera();
+//			}
+//		});
+//		ImageButton uploadButton = (ImageButton) findViewById(R.id.ibtnOk);
+//		uploadButton.setOnClickListener(new View.OnClickListener()
+//		{
+//
+//			@Override
+//			public void onClick(View v)
+//			{
+//
+//				sendBroadcast(new Intent("REDANT.POP.REQUEST_LOCATION"));
+//				return;
+//
+//			}
+//		});
+//
+//		m_tvalert = (TextView) findViewById(R.id.tvalert);
+//		m_tvalert.setSelected(true);
+//
+//		// Intent intent = ;
+//		sendBroadcast(new Intent("REDANT.POP.MODIFY_QUEUE"));
+//		updateUploadButton();
 	}
 
 	@Override
@@ -263,13 +263,13 @@ public class MainActivity extends Activity
 		super.onDestroy();
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu)
-	{
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.main, menu);
-		return true;
-	}
+//	@Override
+//	public boolean onCreateOptionsMenu(Menu menu)
+//	{
+//		// Inflate the menu; this adds items to the action bar if it is present.
+//		getMenuInflater().inflate(R.menu.main, menu);
+//		return true;
+//	}
 
 	private File createImageFile() throws IOException
 	{
@@ -358,88 +358,88 @@ public class MainActivity extends Activity
 	 * @see android.app.Activity#onActivityResult(int, int,
 	 * android.content.Intent)
 	 */
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data)
-	{
-
-		if (requestCode == REQUEST_TAKE_PHOTO)
-			// ������������յ�ͼƬ
-			if (resultCode == Activity.RESULT_OK) // ��������
-
-			{
-
-				Log.d(TAG, photoFile.toString());
-				photoList.add(photoFile.toString());
-
-				StartCamera();
-				// iPhotoCount++;
-				super.onActivityResult(requestCode, resultCode, data);
-
-			}
-			else
-			{
-
-				ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
-
-				if (photoList.size() > 0)
-				{
-					thumbBitmap = ThumbnailUtils.extractThumbnail(BitmapFactory
-							.decodeFile(photoList.get(photoList.size() - 1)),
-							iwidth, iheight);
-					if (thumbBitmap != null)
-						thumbsImageView.setImageBitmap(thumbBitmap);
-				}
-
-				photoFile.delete();
-				TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
-				countTextView.setText(photoList.size() + " Photos");
-				// ImageButton ibtnUpload = (ImageButton)
-				// findViewById(R.id.ibtnOk);
-				updateUploadButton();
-
-			}
-
-		else if (requestCode == REQUEST_LOCKER)
-		{
-			if (resultCode == Activity.RESULT_OK)
-				m_blocked = false;
-		}
-		else if (requestCode == REQUEST_PREVIEW)
-		{
-			for (int i = 0; i < photoList.size(); i++)
-			{
-				File file = new File(photoList.get(i));
-				if (!file.exists())
-				{
-					photoList.remove(i);
-					i--;
-				}
-			}
-			TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
-			countTextView.setText(photoList.size() + " Photos");
-			if (photoList.size() == 0)
-			{
-				ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
-				thumbsImageView.setImageResource(R.drawable.no_pic);
-				thumbBitmap = null;
-			}
-		}
-		else if (requestCode == REQUEST_SCAN_BARCODE)
-		{
-			if (resultCode == Activity.RESULT_OK)
-			{
-				Bundle bundle = data.getExtras();
-				String pid = bundle.getString("pid");
-				Log.d(TAG,
-						"REQUEST_SCAN_BARCODE==========>pid="
-								+ bundle.getString("pid"));
-				TextView pidval = (TextView) findViewById(R.id.pidval);
-				pidval.setText(pid);
-				updateUploadButton();
-			}
-		}
-		super.onActivityResult(requestCode, resultCode, data);
-	}
+//	@Override
+//	public void onActivityResult(int requestCode, int resultCode, Intent data)
+//	{
+//
+//		if (requestCode == REQUEST_TAKE_PHOTO)
+//			// ������������յ�ͼƬ
+//			if (resultCode == Activity.RESULT_OK) // ��������
+//
+//			{
+//
+//				Log.d(TAG, photoFile.toString());
+//				photoList.add(photoFile.toString());
+//
+//				StartCamera();
+//				// iPhotoCount++;
+//				super.onActivityResult(requestCode, resultCode, data);
+//
+//			}
+//			else
+//			{
+//
+//				ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
+//
+//				if (photoList.size() > 0)
+//				{
+//					thumbBitmap = ThumbnailUtils.extractThumbnail(BitmapFactory
+//							.decodeFile(photoList.get(photoList.size() - 1)),
+//							iwidth, iheight);
+//					if (thumbBitmap != null)
+//						thumbsImageView.setImageBitmap(thumbBitmap);
+//				}
+//
+//				photoFile.delete();
+//				TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
+//				countTextView.setText(photoList.size() + " Photos");
+//				// ImageButton ibtnUpload = (ImageButton)
+//				// findViewById(R.id.ibtnOk);
+//				updateUploadButton();
+//
+//			}
+//
+//		else if (requestCode == REQUEST_LOCKER)
+//		{
+//			if (resultCode == Activity.RESULT_OK)
+//				m_blocked = false;
+//		}
+//		else if (requestCode == REQUEST_PREVIEW)
+//		{
+//			for (int i = 0; i < photoList.size(); i++)
+//			{
+//				File file = new File(photoList.get(i));
+//				if (!file.exists())
+//				{
+//					photoList.remove(i);
+//					i--;
+//				}
+//			}
+//			TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
+//			countTextView.setText(photoList.size() + " Photos");
+//			if (photoList.size() == 0)
+//			{
+//				ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
+//				thumbsImageView.setImageResource(R.drawable.no_pic);
+//				thumbBitmap = null;
+//			}
+//		}
+//		else if (requestCode == REQUEST_SCAN_BARCODE)
+//		{
+//			if (resultCode == Activity.RESULT_OK)
+//			{
+//				Bundle bundle = data.getExtras();
+//				String pid = bundle.getString("pid");
+//				Log.d(TAG,
+//						"REQUEST_SCAN_BARCODE==========>pid="
+//								+ bundle.getString("pid"));
+//				TextView pidval = (TextView) findViewById(R.id.pidval);
+//				pidval.setText(pid);
+//				updateUploadButton();
+//			}
+//		}
+//		super.onActivityResult(requestCode, resultCode, data);
+//	}
 
 	public void saveMyBitmap(String bitName, Bitmap mBitmap)
 	{
@@ -488,93 +488,93 @@ public class MainActivity extends Activity
 	//
 	// return bret;
 	// }
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item)
-	{
-		// TODO Auto-generated method stub
-		switch (item.getItemId())
-		{
-			case R.id.action_clear:
-				dbgUtil.fileLog("menu item clear click , clear...");
-				clear();
-				break;
-			case R.id.action_type_pid:
-			{
-				final View edit = new EditText(this);
-				new AlertDialog.Builder(this)
-						.setIconAttribute(android.R.attr.alertDialogIcon)
-						.setTitle(R.string.title_input_pid)
-						.setView(edit)
-						.setPositiveButton(android.R.string.ok,
-								new DialogInterface.OnClickListener()
-								{
-									public void onClick(DialogInterface dialog,
-											int whichButton)
-									{
-										String pid = ((EditText) edit)
-												.getText().toString();
-										TextView pidval = (TextView) findViewById(R.id.pidval);
-										pidval.setText(pid);
-										updateUploadButton();
-
-										/* User clicked OK so do some stuff */
-									}
-								})
-						.setNegativeButton(android.R.string.cancel,
-								new DialogInterface.OnClickListener()
-								{
-									public void onClick(DialogInterface dialog,
-											int whichButton)
-									{
-										updateUploadButton();
-										/* User clicked cancel so do some stuff */
-									}
-								}).create().show();
-			}
-				break;
-			case R.id.action_server_settings:
-			{
-				Intent intent = new Intent();
-				intent.setClass(MainActivity.this, ServerSettingActivity.class);
-				startActivity(intent);
-
-			}
-				break;
-			case R.id.action_view_queue:
-			{
-				Intent intent = new Intent();
-				intent.setClass(MainActivity.this, UploadQueueActivity.class);
-				startActivity(intent);
-				break;
-			}
-			default:
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	protected void onSaveInstanceState(Bundle outState)
-	{
-		// TODO Auto-generated method stub
-		super.onSaveInstanceState(outState);
-		if (photoFile != null)
-			outState.putSerializable("photoFile", photoFile);
-
-		if (thumbBitmap != null)
-			outState.putByteArray("thumbBitmap", getBytes(thumbBitmap));// ("thumbBitmap",
-																		// (Object)thumbBitmap);
-																		// outState.putString("thumbpath",
-																		// thumbpath);
-		// outState.putString("m_sName", m_sName);
-		// outState.putString("m_sPassword", m_sPassword);
-
-		outState.putStringArrayList("photoList", photoList);
-		// Log.d(TAG, "save thumbpath==" + thumbpath);
-		//outState.putInt("iPhotoCount", photoList.size());
-		TextView pidval = (TextView) findViewById(R.id.pidval);
-		outState.putString("PIID", pidval.getText().toString());
-	}
+//	@Override
+//	public boolean onOptionsItemSelected(MenuItem item)
+//	{
+//		// TODO Auto-generated method stub
+//		switch (item.getItemId())
+//		{
+//			case R.id.action_clear:
+//				dbgUtil.fileLog("menu item clear click , clear...");
+//				clear();
+//				break;
+//			case R.id.action_type_pid:
+//			{
+//				final View edit = new EditText(this);
+//				new AlertDialog.Builder(this)
+//						.setIconAttribute(android.R.attr.alertDialogIcon)
+//						.setTitle(R.string.title_input_pid)
+//						.setView(edit)
+//						.setPositiveButton(android.R.string.ok,
+//								new DialogInterface.OnClickListener()
+//								{
+//									public void onClick(DialogInterface dialog,
+//											int whichButton)
+//									{
+//										String pid = ((EditText) edit)
+//												.getText().toString();
+//										TextView pidval = (TextView) findViewById(R.id.pidval);
+//										pidval.setText(pid);
+//										updateUploadButton();
+//
+//										/* User clicked OK so do some stuff */
+//									}
+//								})
+//						.setNegativeButton(android.R.string.cancel,
+//								new DialogInterface.OnClickListener()
+//								{
+//									public void onClick(DialogInterface dialog,
+//											int whichButton)
+//									{
+//										updateUploadButton();
+//										/* User clicked cancel so do some stuff */
+//									}
+//								}).create().show();
+//			}
+//				break;
+//			case R.id.action_server_settings:
+//			{
+//				Intent intent = new Intent();
+//				intent.setClass(MainActivity.this, ServerSettingActivity.class);
+//				startActivity(intent);
+//
+//			}
+//				break;
+//			case R.id.action_view_queue:
+//			{
+//				Intent intent = new Intent();
+//				intent.setClass(MainActivity.this, UploadQueueActivity.class);
+//				startActivity(intent);
+//				break;
+//			}
+//			default:
+//				break;
+//		}
+//		return super.onOptionsItemSelected(item);
+//	}
+
+//	@Override
+//	protected void onSaveInstanceState(Bundle outState)
+//	{
+//		// TODO Auto-generated method stub
+//		super.onSaveInstanceState(outState);
+//		if (photoFile != null)
+//			outState.putSerializable("photoFile", photoFile);
+//
+//		if (thumbBitmap != null)
+//			outState.putByteArray("thumbBitmap", getBytes(thumbBitmap));// ("thumbBitmap",
+//																		// (Object)thumbBitmap);
+//																		// outState.putString("thumbpath",
+//																		// thumbpath);
+//		// outState.putString("m_sName", m_sName);
+//		// outState.putString("m_sPassword", m_sPassword);
+//
+//		outState.putStringArrayList("photoList", photoList);
+//		// Log.d(TAG, "save thumbpath==" + thumbpath);
+//		//outState.putInt("iPhotoCount", photoList.size());
+//		TextView pidval = (TextView) findViewById(R.id.pidval);
+//		outState.putString("PIID", pidval.getText().toString());
+//	}
 
 	public static byte[] getBytes(Bitmap bitmap)
 	{
@@ -656,29 +656,29 @@ public class MainActivity extends Activity
 			
 		}
 		photoList.clear();
-		TextView pidval = (TextView) findViewById(R.id.pidval);
-		pidval.setText("");
-		updateUploadButton();
-		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
-		thumbsImageView.setImageResource(R.drawable.no_pic);
-		thumbBitmap = null;
-		TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
-		countTextView.setText("no photo");
+//		TextView pidval = (TextView) findViewById(R.id.pidval);
+//		pidval.setText("");
+//		updateUploadButton();
+//		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
+//		thumbsImageView.setImageResource(R.drawable.no_pic);
+//		thumbBitmap = null;
+//		TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
+//		countTextView.setText("no photo");
 
 	}
 
 	private void clearfornew()
 	{
 
-		photoList.clear();
-		TextView pidval = (TextView) findViewById(R.id.pidval);
-		pidval.setText("");
-		updateUploadButton();
-		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
-		thumbsImageView.setImageResource(R.drawable.no_pic);
-		thumbBitmap = null;
-		TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
-		countTextView.setText("no photo");
+//		photoList.clear();
+//		TextView pidval = (TextView) findViewById(R.id.pidval);
+//		pidval.setText("");
+//		updateUploadButton();
+//		ImageView thumbsImageView = (ImageView) findViewById(R.id.ivThumbs);
+//		thumbsImageView.setImageResource(R.drawable.no_pic);
+//		thumbBitmap = null;
+//		TextView countTextView = (TextView) findViewById(R.id.tvPhotoCount);
+//		countTextView.setText("no photo");
 
 	}
 

+ 18 - 3
RA Image/app/src/main/java/com/usai/redant/raimage/ModeActivity.java

@@ -10,6 +10,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -25,6 +26,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.usai.redant.raimage.POP.PopActivity;
 import com.usai.util.Network;
 
 import org.json.JSONArray;
@@ -116,8 +118,7 @@ public class ModeActivity extends AppCompatActivity {
                try {
                    int enable = mode.getInt("enable");
                    if (enable != 0) {
-                       String mode_name = mode.getString("name");
-                       showActivityMode(mode_name);
+                       showActivityMode(mode);
                    }
 
                } catch (Exception e) {
@@ -139,6 +140,7 @@ public class ModeActivity extends AppCompatActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.logout_menu,menu);
+
         return true;
     }
 
@@ -155,7 +157,20 @@ public class ModeActivity extends AppCompatActivity {
     }
 
     /***/
-    void showActivityMode(String mode) {
+    void showActivityMode(JSONObject mode) {
+
+       try {
+           String name = mode.getString("name");
+
+           if (name.equals("POP")) {
+               Intent intent = new Intent(this,PopActivity.class);
+               startActivity(intent);
+           } else if (name.equals("Model")) {
+
+           }
+       } catch (Exception e) {
+           e.printStackTrace();
+       }
 
     }
 

+ 34 - 0
RA Image/app/src/main/java/com/usai/redant/raimage/POP/PopActivity.java

@@ -0,0 +1,34 @@
+package com.usai.redant.raimage.POP;
+
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import com.usai.redant.raimage.R;
+
+public class PopActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pop);
+
+        ActionBar mActionBar = getSupportActionBar();
+        mActionBar.setHomeButtonEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setTitle("RA Image");
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        switch (item.getItemId()) {
+            case android.R.id.home: {
+                finish();
+            }
+            break;
+        }
+        return true;
+    }
+}

+ 105 - 0
RA Image/app/src/main/java/com/usai/redant/raimage/uploadSettingActivity.java

@@ -1,14 +1,119 @@
 package com.usai.redant.raimage;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Switch;
 
 public class uploadSettingActivity extends AppCompatActivity {
 
+    private Switch auto_start_swt;
+    private Switch auto_rm_fs_swt;
+    private Switch auto_rm_er_swt;
+    private Switch compress_swt;
+    private EditText retry_count_et;
+
+    public void initSetting() {
+        boolean auto_upload = true;
+        boolean auto_rm_fs = true;
+        boolean auto_rm_er = false;
+        boolean compress = true;
+        int retry_count = 2;
+
+        SharedPreferences preferences = getSharedPreferences("uploadSetting", Context.MODE_PRIVATE);
+        if (preferences != null) {
+
+            auto_upload = preferences.getBoolean("auto_upload",true);
+            auto_rm_fs = preferences.getBoolean("auto_rm_fs",true);
+            auto_rm_er = preferences.getBoolean("auto_rm_er",false);
+            compress = preferences.getBoolean("compress",true);
+            retry_count = preferences.getInt("retry_count",2);
+
+        } else  {
+
+        }
+
+
+        auto_start_swt.setChecked(auto_upload);
+        auto_rm_fs_swt.setChecked(auto_rm_fs);
+        auto_rm_er_swt.setChecked(auto_rm_er);
+        compress_swt.setChecked(compress);
+        retry_count_et.setText(String.valueOf(retry_count));
+        // 移动光标到末尾
+        retry_count_et.setSelection(retry_count_et.getText().length());
+    }
+
+    public void saveSetting() {
+
+        SharedPreferences preferences = getSharedPreferences("uploadSetting",Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+
+        boolean auto_upload = auto_start_swt.isChecked();
+        boolean auto_rm_fs = auto_rm_fs_swt.isChecked();
+        boolean auto_rm_er = auto_rm_er_swt.isChecked();
+        boolean compress = compress_swt.isChecked();
+        int retry_count = Integer.parseInt(retry_count_et.getText().toString());
+
+        editor.putBoolean("auto_upload",auto_upload);
+        editor.putBoolean("auto_rm_fs",auto_rm_fs);
+        editor.putBoolean("auto_rm_er",auto_rm_er);
+        editor.putBoolean("compress",compress);
+        editor.putInt("retry_count",retry_count);
+
+        editor.commit();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_upload_setting);
+
+        auto_start_swt = (Switch)findViewById(R.id.auto_start_swt);
+        auto_rm_fs_swt = (Switch)findViewById(R.id.auto_rm_fs_swt);
+        auto_rm_er_swt = (Switch)findViewById(R.id.auto_rm_er_swt);
+        compress_swt = (Switch)findViewById(R.id.compress_swt);
+        retry_count_et = (EditText)findViewById(R.id.retry_et);
+
+        initSetting();
+
+        ActionBar mActionBar=getSupportActionBar();
+        mActionBar.setHomeButtonEnabled(true);
+        mActionBar.setDisplayHomeAsUpEnabled(true);
+        mActionBar.setTitle("RA Image");
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        return super.onSupportNavigateUp();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.upload_setting_menu,menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.save_upload_setting_item : {
+                saveSetting();
+                finish();
+            }
+            break;
+            case android.R.id.home : {
+                finish();
+            }
+            break;
+        }
+        return true;
     }
 }

+ 113 - 0
RA Image/app/src/main/res/layout-land/activity_pop.xml

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black_overlay"
+    tools:context="com.usai.redant.raimage.POP.PopActivity">
+
+    <RelativeLayout
+        android:id="@+id/photo_layout"
+        android:layout_width="220dp"
+        android:layout_height="220dp"
+        android:layout_marginLeft="31dp"
+        android:layout_marginStart="31dp"
+        android:layout_centerVertical="true"
+        >
+
+        <ImageView
+            android:id="@+id/photo_iv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/no_pic"></ImageView>
+
+        <TextView
+            android:id="@+id/photo_count_lb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/photo_iv"
+            android:layout_centerHorizontal="true"
+            android:gravity="center_horizontal|bottom"
+            android:text="No Photos"
+            android:textColor="@color/blue"
+            android:textSize="12sp"
+             />
+
+    </RelativeLayout>
+
+
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PIIP:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        android:layout_marginLeft="11dp"
+        android:layout_marginStart="11dp"
+        android:layout_alignTop="@+id/photo_layout"
+        android:layout_toRightOf="@+id/photo_layout"
+        android:layout_toEndOf="@+id/photo_layout" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:inputType="number"
+        android:textSize="17sp"
+        android:layout_alignBaseline="@+id/barcode_tv"
+        android:layout_alignBottom="@+id/barcode_tv"
+        android:layout_toRightOf="@+id/barcode_tv"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginEnd="20dp"/>
+
+    <LinearLayout
+        android:id="@+id/divide_btn_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/barcode_tv"
+        android:layout_alignStart="@id/barcode_tv"
+        android:layout_alignEnd="@id/barcode_et"
+        android:layout_alignRight="@id/barcode_et"
+        android:layout_alignBottom="@id/photo_layout"
+        android:orientation="horizontal"
+        >
+
+        <ImageButton
+            android:id="@+id/scan_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@color/clear_color"
+            app:srcCompat="@drawable/bar2" />
+
+        <ImageButton
+            android:id="@+id/camera_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@color/clear_color"
+            app:srcCompat="@drawable/ic_action_camera" />
+
+        <ImageButton
+            android:id="@+id/upload_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@color/clear_color"
+            app:srcCompat="@drawable/ic_action_upload" />
+
+
+    </LinearLayout>
+
+
+</RelativeLayout>

+ 91 - 0
RA Image/app/src/main/res/layout/activity_pop.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black_overlay"
+    tools:context="com.usai.redant.raimage.POP.PopActivity">
+
+    <ImageView
+        android:id="@+id/photo_iv"
+        android:layout_width="280dp"
+        android:layout_height="280dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="56dp"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/no_pic" />
+
+    <TextView
+        android:id="@+id/photo_count_lb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/photo_iv"
+        android:layout_centerHorizontal="true"
+        android:ems="10"
+        android:gravity="center_horizontal|bottom"
+        android:inputType="textPersonName"
+        android:text="No Photos"
+        android:textColor="@color/blue"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/barcode_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PIIP:"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        android:layout_alignBaseline="@+id/barcode_et"
+        android:layout_alignBottom="@+id/barcode_et"
+        android:layout_alignLeft="@+id/photo_iv"
+        android:layout_alignStart="@+id/photo_iv" />
+
+    <EditText
+        android:id="@+id/barcode_et"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:inputType="number"
+        android:textSize="17sp"
+        android:layout_below="@+id/photo_iv"
+        android:layout_toRightOf="@+id/barcode_tv"
+        android:layout_marginTop="20dp"
+        android:layout_alignRight="@+id/photo_iv"
+        android:layout_alignEnd="@+id/photo_iv" />
+
+    <ImageButton
+        android:id="@+id/scan_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="29dp"
+        android:layout_alignLeft="@+id/photo_iv"
+        android:layout_alignStart="@+id/photo_iv"
+        app:srcCompat="@drawable/bar2"
+        android:background="@color/clear_color"/>
+
+    <ImageButton
+        android:id="@+id/camera_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_action_camera"
+        android:layout_alignTop="@+id/scan_btn"
+        android:layout_centerHorizontal="true"
+        android:background="@color/clear_color"/>
+
+    <ImageButton
+        android:id="@+id/upload_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/photo_iv"
+        android:layout_alignRight="@+id/photo_iv"
+        android:layout_alignTop="@+id/camera_btn"
+        android:layout_marginLeft="13dp"
+        android:layout_marginStart="13dp"
+        android:background="@color/clear_color"
+        app:srcCompat="@drawable/ic_action_upload" />
+
+
+</RelativeLayout>

+ 1 - 1
RA Image/app/src/main/res/layout/activity_upload_setting.xml

@@ -113,7 +113,7 @@
         android:textSize="17sp" />
 
     <EditText
-        android:id="@+id/retry_swt"
+        android:id="@+id/retry_et"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@+id/retry_text"

+ 1 - 2
RA Image/app/src/main/res/menu/logout_menu.xml

@@ -3,12 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-    <style>
+
         <item
             android:id="@+id/logout_item"
             android:title="Logout"
             app:showAsAction="always"
             />
-    </style>
 
 </menu>

+ 11 - 0
RA Image/app/src/main/res/menu/upload_setting_menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/save_upload_setting_item"
+        android:title="Save"
+        app:showAsAction="always"
+        />
+
+</menu>

+ 1 - 1
RA Image/app/src/main/res/values/colors.xml

@@ -51,5 +51,5 @@
 
     <color name="clear_color">#00000000</color>
 
-    <color name="blue">#2172FF</color>
+    <color name="blue">#2172ff</color>
 </resources>