修改外勤打卡逻辑

app_core/common/src/main/res/layout/image_setting_activity.xml

@@ -7,6 +7,7 @@
         android:id="@+id/image_im"
         android:layout_width="200dp"
         android:layout_height="200dp"
+        android:scaleType="fitXY"
         android:src="@drawable/common_header_boy"
         android:layout_centerInParent="true"
         />

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -36,6 +36,7 @@ import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appme.R;
 import com.uas.appme.settings.Constant.Constant;
 import com.umeng.socialize.utils.Log;
@@ -49,192 +50,197 @@ import java.util.Map;
  * function:
  */
 
-public class ImageSettingActivity extends BaseActivity implements View.OnClickListener{
-    private ImageView mImageIm;
-    private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
-    private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
-    private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
-    private int Max_Size = 1;
-    private String photoselect=null;
-    private ProgressDialog mProgressDialog;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.image_setting_activity);
-
-        initView();
-    }
-    @Override
-    protected void onResume() {
-        super.onResume();
-        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
-        for (String permission : permissions) {
-            if (PermissionUtil.lacksPermissions(ct, permission)) {
-                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
-            }
-        }
-    }
-    private void initView() {
-        mImageIm = (ImageView) findViewById(R.id.image_im);
-        findViewById(R.id.image_tv).setOnClickListener(this);
-        findViewById(R.id.btn_save).setOnClickListener(this);
-        mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.image_tv){
-            showSelectPictureDialog();
-        }else if (v.getId() == R.id.btn_save){
-            doSaveImage();
-        }
-
-    }
-    private void doSaveImage() {
-        if (StringUtil.isEmpty(photoselect)) return;
-        File waterBitmapToFile=  new File(photoselect);
-        if (!waterBitmapToFile.isFile()){
-            return;
-        }else {
-            com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
-            params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-            params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-            params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
-            params.addBodyParameter("file1", waterBitmapToFile);
-            String url = "http://113.105.74.140:8080/upload/UploadServlet";
-            final HttpUtils http = new HttpUtils();
-            http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
-                @Override
-                public void onStart() {
-                    progressDialog.show();
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture)+"...");
-                }
-                @Override
-                public void onLoading(long total, long current, boolean isUploading) {
-                    if (isUploading) {
-                    } else {
-                    }
-                }
-
-                @Override
-                public void onSuccess(ResponseInfo<String> responseInfo) {
-                    if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
-                        LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
-
-                        try {
-                            JSONObject object = JSON.parseObject(responseInfo.result);
-                            JSONObject dataobject = object.getJSONObject("data");
-                            if (dataobject == null) return;
-                            JSONArray imagearray = dataobject.getJSONArray("images");
-                            if (ListUtils.isEmpty(imagearray)) return;
-                            String oUrl = imagearray.getJSONObject(0).getString("oUrl");
-                            if (!StringUtil.isEmpty(oUrl))
-                                doUpdateUrl(oUrl);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    }
-                }
-
-                @Override
-                public void onFailure(HttpException error, String msg) {
-                    ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
-                    progressDialog.dismiss();
-                }
-            });
-        }
-    }
-
-    private void doUpdateUrl(String oUrl) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("sc_imageurl",oUrl);
-        params.put("sc_uu",Constant.BASE_COMPANYID);
+public class ImageSettingActivity extends BaseActivity implements View.OnClickListener {
+	private ImageView mImageIm;
+	private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
+	private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
+	private static final int REQUEST_CODE_PICK_PHOTO = 2;//单选照片
+	private int Max_Size = 1;
+	private String photoselect = null;
+	private ProgressDialog mProgressDialog;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.image_setting_activity);
+
+		initView();
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+		for (String permission : permissions) {
+			if (PermissionUtil.lacksPermissions(ct, permission)) {
+				PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+			}
+		}
+	}
+
+	private void initView() {
+		mImageIm = (ImageView) findViewById(R.id.image_im);
+		findViewById(R.id.image_tv).setOnClickListener(this);
+		findViewById(R.id.btn_save).setOnClickListener(this);
+		mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
+	}
+
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.image_tv) {
+			showSelectPictureDialog();
+		} else if (v.getId() == R.id.btn_save) {
+			doSaveImage();
+		}
+
+	}
+
+	private void doSaveImage() {
+		if (StringUtil.isEmpty(photoselect)) return;
+		File waterBitmapToFile = new File(photoselect);
+		if (!waterBitmapToFile.isFile()) {
+			return;
+		} else {
+			com.lidroid.xutils.http.RequestParams params = new com.lidroid.xutils.http.RequestParams();
+			params.addQueryStringParameter("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
+			params.addHeader("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+			params.addBodyParameter("userid", MyApplication.getInstance().mLoginUser.getUserId());
+			params.addBodyParameter("file1", waterBitmapToFile);
+			String url = "http://113.105.74.140:8080/upload/UploadServlet";
+			final HttpUtils http = new HttpUtils();
+			http.send(HttpRequest.HttpMethod.POST, url, params, new RequestCallBack<String>() {
+				@Override
+				public void onStart() {
+					progressDialog.show();
+					ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.sending_picture) + "...");
+				}
+
+				@Override
+				public void onLoading(long total, long current, boolean isUploading) {
+					if (isUploading) {
+					} else {
+					}
+				}
+
+				@Override
+				public void onSuccess(ResponseInfo<String> responseInfo) {
+					if (JSONUtil.validate(responseInfo.result) && JSON.parseObject(responseInfo.result).getBoolean("success")) {
+						LogUtil.prinlnLongMsg("UploadServlet", responseInfo.result + "");
+
+						try {
+							JSONObject object = JSON.parseObject(responseInfo.result);
+							JSONObject dataobject = object.getJSONObject("data");
+							if (dataobject == null) return;
+							JSONArray imagearray = dataobject.getJSONArray("images");
+							if (ListUtils.isEmpty(imagearray)) return;
+							String oUrl = imagearray.getJSONObject(0).getString("oUrl");
+							if (!StringUtil.isEmpty(oUrl))
+								doUpdateUrl(oUrl);
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+					}
+				}
+
+				@Override
+				public void onFailure(HttpException error, String msg) {
+					ViewUtil.ToastMessage(ct, getString(com.uas.appworks.R.string.common_save_failed) + msg);
+					progressDialog.dismiss();
+				}
+			});
+		}
+	}
+
+	private void doUpdateUrl(String oUrl) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("sc_imageurl", oUrl);
+		params.put("sc_uu", Constant.BASE_COMPANYID);
 //        params.put("sc_uu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "erp_uu"));
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("user/appStorurl")
-                .add("map",JSONUtil.map2JSON(params))
-                .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                LogUtil.prinlnLongMsg("hi/appStorurl", o.toString()+"ddd");
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
-                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
-                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                    progressDialog.dismiss();
-                    finish();
-                }
-        }
-    }));
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == 0x01 && resultCode == 0x02 && data != null){  //新的多选方式
-            photoselect = data.getStringArrayListExtra("files").get(0);
-            mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
-            Log.i("files0x01",data.getStringArrayListExtra("files").toString());
-            Log.i("files0x01",photoselect);
-        }else if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
-            if (resultCode == Activity.RESULT_OK) {
-                if (mNewPhotoUri != null) {
-                    photoselect = mNewPhotoUri.getPath();
-                    mImageIm.setImageURI(mNewPhotoUri);
-                } else {
-                    ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
-                }
-            }
-        }else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
-            if (resultCode == Activity.RESULT_OK){
-                if (data != null && data.getData() != null){
-                    photoselect= CameraUtil.getImagePathFromUri(this, data.getData());
-                    mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
-                    Log.i("files0x01",photoselect);
-                }
-            }
-        }
-    }
-
-    private void showSelectPictureDialog() {
-        String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
-        AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == 0) {
-                            takePhoto();
-                        } else {
-                            selectPhoto();
-                        }
-                        dialog.dismiss();
-                    }
-                });
-        builder.show();
-    }
-
-    private void takePhoto() {
-        try {
-            mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
-            CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void selectPhoto() {
-        CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
-        //新式多选方式
+		HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+		httpClient.Api().send(new HttpClient.Builder()
+				.url("user/appStorurl")
+				.add("map", JSONUtil.map2JSON(params))
+				.add("token", MyApplication.getInstance().mAccessToken)
+				.method(Method.POST)
+				.build(), new ResultSubscriber<>(new ResultListener<Object>() {
+			@Override
+			public void onResponse(Object o) {
+				LogUtil.prinlnLongMsg("hi/appStorurl", o.toString() + "ddd");
+				if (!JSONUtil.validate(o.toString()) || o == null) return;
+				if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")) {
+					Toast.makeText(ct, getString(R.string.common_save_success), Toast.LENGTH_LONG).show();
+					progressDialog.dismiss();
+					finish();
+				}
+			}
+		}));
+	}
+
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+
+		if (requestCode == 0x01 && resultCode == 0x02 && data != null) {  //新的多选方式
+			photoselect = data.getStringArrayListExtra("files").get(0);
+			mImageIm.setImageURI(Uri.fromFile(new File(photoselect)));
+			Log.i("files0x01", data.getStringArrayListExtra("files").toString());
+			Log.i("files0x01", photoselect);
+		} else if (requestCode == REQUEST_CODE_CAPTURE_PHOTO) {// 拍照返回
+			if (resultCode == Activity.RESULT_OK) {
+				if (mNewPhotoUri != null) {
+					photoselect = mNewPhotoUri.getPath();
+					LogUtil.i("photoselect=" + photoselect);
+					ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(),mImageIm);
+				} else {
+					ToastUtil.showToast(this, com.uas.appworks.R.string.c_take_picture_failed);
+				}
+			}
+		} else if (requestCode == REQUEST_CODE_PICK_PHOTO) {// 传统单选方式，选择一张图片,然后立即调用裁减
+			if (resultCode == Activity.RESULT_OK) {
+				if (data != null && data.getData() != null) {
+					photoselect = CameraUtil.getImagePathFromUri(this, data.getData());
+					ImageLoader.getInstance().displayImage(Uri.fromFile(new File(photoselect)).toString(),mImageIm);
+					Log.i("files0x01", photoselect);
+				}
+			}
+		}
+	}
+
+	private void showSelectPictureDialog() {
+		String[] items = new String[]{getString(com.uas.appworks.R.string.c_take_picture), getString(com.uas.appworks.R.string.c_photo_album)};
+		AlertDialog.Builder builder = new AlertDialog.Builder(this).setSingleChoiceItems(items, 0,
+				new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						if (which == 0) {
+							takePhoto();
+						} else {
+							selectPhoto();
+						}
+						dialog.dismiss();
+					}
+				});
+		builder.show();
+	}
+
+	private void takePhoto() {
+		try {
+			mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+			CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void selectPhoto() {
+		CameraUtil.pickImageSimple(this, REQUEST_CODE_PICK_PHOTO);  //传统单选方式
+		//新式多选方式
 //        Intent intent = new Intent();
 //        intent.putExtra("MAX_SIZE",Max_Size);
 //        intent.putExtra("CURRENT_SIZE",0);
 //        intent.setClass(ct,ImgFileListActivity.class);
 //        startActivityForResult(intent,0x01);
-    }
+	}
 
 }