bug 修复

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -374,7 +374,11 @@ public class CommonUtil {
         Pattern p = Pattern.compile("(\\d+)");
         Matcher m = p.matcher(chche);
         if (m.find()) {
-            return Integer.parseInt(m.group(0));
+            try {
+                return Integer.parseInt(m.group(0));
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
         }
         return -1;
     }

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

@@ -13,7 +13,6 @@ import com.common.ui.CameraUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
-import com.core.widget.view.Activity.ImgFileListActivity;
 import com.uas.appme.R;
 import com.umeng.socialize.utils.Log;
 
@@ -28,6 +27,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     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;
 
@@ -61,7 +61,7 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == 0x01 && resultCode == 0x02 && data != null){
+        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());
@@ -75,6 +75,14 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
                     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);
+                }
+            }
         }
     }
 
@@ -102,12 +110,13 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     }
 
     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);
+        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);
     }
 
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -1083,6 +1083,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         if (formdataArray != null && "FeePlease!FYBX".equals(mCaller)) {
             try {
                 String fb_attach = formdataArray.getJSONObject(0).getString("fb_attach");
+                Log.i("fb_attachshow",fb_attach+"show");
                 if (fb_attach==null||"null".equals(fb_attach)||fb_attach.length()<=0) {
                     ex_invoice_ll.setVisibility(View.GONE);
                 }else {
@@ -1091,7 +1092,6 @@ public class CommonDocDetailsActivity extends BaseActivity {
                     grid_view.deferNotifyDataSetChanged();
                     ex_invoice_ll.setVisibility(View.VISIBLE);
                 }
-                Log.i("fb_attachshow",fb_attach+"show");
             } catch (JSONException e) {
                 e.printStackTrace();
             }