try 部分

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/PlatLeaveAddActivity.java

@@ -17,6 +17,7 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
@@ -204,14 +205,21 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
             switch (msg.what){
                 case DOC_FIRST_SAVE:
                     if (msg.getData() != null){
-                        String doc_first_save_result = msg.getData().getString("result");
-                        Log.d("doc_first_save_result", doc_first_save_result);
-                        Toast.makeText(getApplicationContext(),getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                        mkeyValue = JSON.parseObject(doc_first_save_result).getIntValue("va_id");
-                        if (mkeyValue != -1){
-                            jumpTODetails(mkeyValue);
+                        try{
+                            String doc_first_save_result = msg.getData().getString("result");
+                            Log.d("doc_first_save_result", doc_first_save_result);
+                            if(StringUtil.isEmpty(doc_first_save_result)) return;
+                            Toast.makeText(getApplicationContext(),getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                            mkeyValue = JSON.parseObject(doc_first_save_result).getIntValue("va_id");
+                            if (mkeyValue != -1){
+                                jumpTODetails(mkeyValue);
+                            }
+                            progressDialog.dismiss();
+                        }catch (JSONException e){
+                            e.printStackTrace();
+                        }catch (Exception e){
+                            e.printStackTrace();
                         }
-                        progressDialog.dismiss();
                     }else {
                         bt_save.setEnabled(true);
                         progressDialog.dismiss();
@@ -220,14 +228,20 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
 
                 case DOC_UPDATE_SAVE:
                     if (msg.getData() != null) {
-                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
-                            String doc_update_save_result = msg.getData().getString("result");
-                            Log.d("doc_update_save_result",doc_update_save_result);
-                            Toast.makeText(getApplicationContext(),getString(R.string.update_success),Toast.LENGTH_LONG).show();
-                            jumpTODetails(mkeyValue);
-                        }else {
-                            bt_save.setEnabled(true);
-                            progressDialog.dismiss();
+                        try{
+                            if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                                String doc_update_save_result = msg.getData().getString("result");
+                                Log.d("doc_update_save_result",doc_update_save_result);
+                                Toast.makeText(getApplicationContext(),getString(R.string.update_success),Toast.LENGTH_LONG).show();
+                                jumpTODetails(mkeyValue);
+                            }else {
+                                bt_save.setEnabled(true);
+                                progressDialog.dismiss();
+                            }
+                        }catch (JSONException e){
+                            e.printStackTrace();
+                        }catch (Exception e){
+                            e.printStackTrace();
                         }
                     }else {
                         bt_save.setEnabled(true);
@@ -235,11 +249,18 @@ public class PlatLeaveAddActivity extends BaseActivity implements RecognizerDial
                     }
                     break;
                 default:
-                    if (msg.getData() != null) {
-                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
-                            ToastMessage(msg.getData().getString("result"));
+                    try{
+                        if (msg.getData() != null) {
+                            if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                                ToastMessage(msg.getData().getString("result"));
+                            }
                         }
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
+
                     break;
             }
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TravelActivity.java

@@ -22,6 +22,7 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
@@ -150,18 +151,19 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
             switch (msg.what) {
                 case SUCCESS_SAVE:
                     progressDialog.dismiss();
-                    String result = msg.getData().getString("result");
+                    try{
+                        String result = msg.getData().getString("result");
 
-                    Toast.makeText(getApplicationContext(), getString(R.string.common_save_success), Toast.LENGTH_LONG).show();
-                    mkeyValue = JSON.parseObject(result).getIntValue("fp_id");
+                        Toast.makeText(getApplicationContext(), getString(R.string.common_save_success), Toast.LENGTH_LONG).show();
+                        mkeyValue = JSON.parseObject(result).getIntValue("fp_id");
 
-                    if (mkeyValue != -1 || mkeyValue != -1) {
-                        jumpTODetails(mkeyValue);
-                    } else {
-                        progressDialog.dismiss();
-                        bt_save.setEnabled(true);
-                    }
-                    LogUtil.e("travel", result);
+                        if (mkeyValue != -1 || mkeyValue != -1) {
+                            jumpTODetails(mkeyValue);
+                        } else {
+                            progressDialog.dismiss();
+                            bt_save.setEnabled(true);
+                        }
+                        LogUtil.e("travel", result);
 //                    try {
 //                        Map<Object, Object> keMap = FlexJsonUtil.fromJson(msg
 //                                .getData().getString("result"));
@@ -183,31 +185,50 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
 //                    } catch (Exception e) {
 //
 //                    }
-                    System.out.println("保存 result:" + result);
+                        System.out.println("保存 result:" + result);
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 case UPDATE_SAVE:
-                    if (msg.getData() != null) {
-                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
-                            String update_save_result = msg.getData().getString("result");
-                            Log.d("doc_update_save_result", update_save_result);
-                            Toast.makeText(getApplicationContext(), getString(R.string.update_success), Toast.LENGTH_LONG).show();
-                            jumpTODetails(mkeyValue);
+                    try{
+                        if (msg.getData() != null) {
+                            if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                                String update_save_result = msg.getData().getString("result");
+                                Log.d("doc_update_save_result", update_save_result);
+                                Toast.makeText(getApplicationContext(), getString(R.string.update_success), Toast.LENGTH_LONG).show();
+                                jumpTODetails(mkeyValue);
+                            } else {
+                                progressDialog.dismiss();
+                                bt_save.setEnabled(true);
+                            }
                         } else {
                             progressDialog.dismiss();
                             bt_save.setEnabled(true);
                         }
-                    } else {
-                        progressDialog.dismiss();
-                        bt_save.setEnabled(true);
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
+
                     break;
                 case SUCCESS_PRE:
-                    System.out.println("获取id result:"
-                            + msg.getData().getString("result"));
-                    va_id = Integer.valueOf(FlexJsonUtil
-                            .fromJson(msg.getData().getString("result")).get("id")
-                            .toString());
-                    getCodeHttpData();
+                    try{
+                        System.out.println("获取id result:"
+                                + msg.getData().getString("result"));
+                        va_id = Integer.valueOf(FlexJsonUtil
+                                .fromJson(msg.getData().getString("result")).get("id")
+                                .toString());
+                        getCodeHttpData();
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                     break;
                 case SUCCESS_COMMIT:
                     progressDialog.dismiss();
@@ -238,8 +259,15 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
                             + msg.getData().getString("result"));
                     break;
                 case SUCCESS_DELETE:
-                    System.out.println("删除  result:"
-                            + msg.getData().getString("result"));
+                    try{
+                        System.out.println("删除  result:"
+                                + msg.getData().getString("result"));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 case SUCCESS_UNCOMMIT:
                     progressDialog.dismiss();
@@ -283,11 +311,17 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
                             + msg.getData().getString("result"));
                     break;
                 case SUCCESS_PRECODE:
-                    va_code = FlexJsonUtil
-                            .fromJson(msg.getData().getString("result"))
-                            .get("code").toString();
-                    System.out.println("va_code=" + va_code);
-                    httpSave();
+                    try{
+                        va_code = FlexJsonUtil
+                                .fromJson(msg.getData().getString("result"))
+                                .get("code").toString();
+                        System.out.println("va_code=" + va_code);
+                        httpSave();
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                     break;
                 case Constants.SUCCESS_INITDATA:
                     progressDialog.dismiss();
@@ -315,28 +349,47 @@ public class TravelActivity extends BaseActivity implements OnClickListener, Rec
                     break;
                 case SUCCESS_SIGN:
                     progressDialog.dismiss();
-                    ;
-                    lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
-                            "combdatas");
-                    if (lists.isEmpty()) {
-                        lists.add("无");
+                    try{
+                        lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
+                                "combdatas");
+                        if (lists.isEmpty()) {
+                            lists.add("无");
+                        }
+                        showSignDialog(findViewById(R.id.et_extra_sign));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    showSignDialog(findViewById(R.id.et_extra_sign));
+
                     break;
                 case SUCCESS_MANKIND:
                     progressDialog.dismiss();
-                    ;
-                    lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
-                            "combdatas");
-                    if (lists.isEmpty()) {
-                        lists.add("无");
+                    try{
+                        lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
+                                "combdatas");
+                        if (lists.isEmpty()) {
+                            lists.add("无");
+                        }
+                        showTypeDialog(findViewById(R.id.et_trave_type));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    showTypeDialog(findViewById(R.id.et_trave_type));
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    String exception = msg.getData().getString("result");
-                    ViewUtil.ToastMessage(mContext, exception);
-                    progressDialog.dismiss();
+                    try{
+                        String exception = msg.getData().getString("result");
+                        ViewUtil.ToastMessage(mContext, exception);
+                        progressDialog.dismiss();
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 default:
                     break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WorkExtraActivity.java

@@ -23,6 +23,7 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
@@ -152,7 +153,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
             switch (msg.what) {
                 case SUCCESS_SAVE:
                     progressDialog.dismiss();
-                    String result = msg.getData().getString("result");
+                    try{
+                        String result = msg.getData().getString("result");
 //                    try {
 //                        Map<Object, Object> keMap = FlexJsonUtil.fromJson(msg
 //                                .getData().getString("result"));
@@ -178,29 +180,49 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
 //
 //                    }
 
-                    mkeyValue = JSON.parseObject(result).getIntValue("wo_id");
-                    if (mkeyValue != -1){
-                        jumpTODetails(mkeyValue);
+                        mkeyValue = JSON.parseObject(result).getIntValue("wo_id");
+                        if (mkeyValue != -1){
+                            jumpTODetails(mkeyValue);
+                        }
+                        System.out.println("保存 result:" + result);
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    System.out.println("保存 result:" + result);
+
                     break;
                 case UPDATE_SAVE:
-                    if (msg.getData() != null) {
-                        if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
-                            String doc_update_save_result = msg.getData().getString("result");
-                            Log.d("doc_update_save_result",doc_update_save_result);
-                            Toast.makeText(getApplicationContext(), "更新成功", Toast.LENGTH_LONG).show();
-                            jumpTODetails(mkeyValue);
+                    try{
+                        if (msg.getData() != null) {
+                            if (!StringUtil.isEmpty(msg.getData().getString("result"))) {
+                                String doc_update_save_result = msg.getData().getString("result");
+                                Log.d("doc_update_save_result",doc_update_save_result);
+                                Toast.makeText(getApplicationContext(), "更新成功", Toast.LENGTH_LONG).show();
+                                jumpTODetails(mkeyValue);
+                            }
                         }
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
+
                     break;
                 case SUCCESS_PRE:
-                    System.out.println("获取id result:"
-                            + msg.getData().getString("result"));
-                    va_id = Integer.valueOf(FlexJsonUtil
-                            .fromJson(msg.getData().getString("result")).get("id")
-                            .toString());
-                    getCodeHttpData();
+                    try{
+                        System.out.println("获取id result:"
+                                + msg.getData().getString("result"));
+                        va_id = Integer.valueOf(FlexJsonUtil
+                                .fromJson(msg.getData().getString("result")).get("id")
+                                .toString());
+                        getCodeHttpData();
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 case SUCCESS_COMMIT:
                     progressDialog.dismiss();
@@ -227,10 +249,26 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
 //                        messageDisplayCommit(msg);
 //                        editnoclik();
 //                    }
+                    try{
+                        System.out.println("提交 result:"
+                                + msg.getData().getString("result"));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                     System.out.println("提交 result:"
                             + msg.getData().getString("result"));
                     break;
                 case SUCCESS_DELETE:
+                    try{
+                        System.out.println("删除  result:"
+                                + msg.getData().getString("result"));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                     System.out.println("删除  result:"
                             + msg.getData().getString("result"));
                     break;
@@ -276,11 +314,18 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
                             + msg.getData().getString("result"));
                     break;
                 case SUCCESS_PRECODE:
-                    va_code = FlexJsonUtil
-                            .fromJson(msg.getData().getString("result"))
-                            .get("code").toString();
-                    httpSave();
-                    System.out.println("va_code=" + va_code);
+                    try{
+                        va_code = FlexJsonUtil
+                                .fromJson(msg.getData().getString("result"))
+                                .get("code").toString();
+                        httpSave();
+                        System.out.println("va_code=" + va_code);
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 case Constants.SUCCESS_INITDATA:
                     progressDialog.dismiss();
@@ -306,41 +351,66 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener,
                     break;
                 case SUCCESS_TYPE://加班类型
                     progressDialog.dismiss();
-                    ;
-                    lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
-                            "combdatas");
-                    if (lists.isEmpty()) {
-                        lists.add("无");
+                    try{
+                        lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
+                                "combdatas");
+                        if (lists.isEmpty()) {
+                            lists.add("无");
+                        }
+                        title = "加班类型";
+                        showTypeDialog(findViewById(R.id.et_extra_type));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    title = "加班类型";
-                    showTypeDialog(findViewById(R.id.et_extra_type));
+
                     break;
                 case SUCCESS_ISALLDAY://是否全天
                     progressDialog.dismiss();
-                    ;
-                    lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
-                            "combdatas");
-                    if (lists.isEmpty()) {
-                        lists.add("无");
+                    try{
+                        lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
+                                "combdatas");
+                        if (lists.isEmpty()) {
+                            lists.add("无");
+                        }
+                        title = "是否为全天";
+                        showTypeDialog(findViewById(R.id.et_extra_isallday));
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    title = "是否为全天";
-                    showTypeDialog(findViewById(R.id.et_extra_isallday));
+
                     break;
                 case SUCCESS_MANKIND:
                     progressDialog.dismiss();
-                    ;
-                    lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
-                            "combdatas");
-                    if (lists.isEmpty()) {
-                        lists.add("无");
+                    try{
+                        lists = (List<String>) FlexJsonUtil.fromJson(msg.getData().getString("result")).get(
+                                "combdatas");
+                        if (lists.isEmpty()) {
+                            lists.add("无");
+                        }
+                        title = "是否为全天";
+                        showListDialog("人员类型", et_extra_mankind);
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
-                    title = "是否为全天";
-                    showListDialog("人员类型", et_extra_mankind);
+
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
-                    String exception = msg.getData().getString("result");
-                    ViewUtil.ToastMessage(mContext, exception);
-                    progressDialog.dismiss();
+                    try{
+                        String exception = msg.getData().getString("result");
+                        ViewUtil.ToastMessage(mContext, exception);
+                        progressDialog.dismiss();
+                    }catch (JSONException e){
+                        e.printStackTrace();
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+
                     break;
                 default:
                     break;

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Mar 30 12:17:40 CST 2018
-debugName=351
+#Fri Mar 30 18:08:38 CST 2018
+debugName=355
 versionName=624
-debugCode=351
+debugCode=355
 versionCode=163

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

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:text="明细1"
+        android:text="明细"
         android:textColor="#FF3300"/>
 
     <com.core.widget.MyListView

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/ComDocGriddataOutAdapter.java

@@ -9,10 +9,9 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
-import com.core.utils.CommonUtil;
 import com.core.widget.MyListView;
-import com.uas.appworks.R;
 import com.uas.appworks.OA.erp.model.CommonDocAMBean;
+import com.uas.appworks.R;
 
 import java.util.List;
 
@@ -102,22 +101,23 @@ public class ComDocGriddataOutAdapter extends BaseAdapter {
 
         //明细显示
         if(!TextUtils.isEmpty(getCaller())){
-            String num = CommonUtil.numToCN(position + 1);
-            if ("Ask4Leave".equals(getCaller())){
-                viewHolder.detail_title_num.setText("请假明细" );
-            }
-            if ("FeePlease!CCSQ".equals(getCaller())){
-                viewHolder.detail_title_num.setText("出差明细");
-            }
-            if ("Workovertime".equals(getCaller())){
-                viewHolder.detail_title_num.setText("加班明细");
-            }
-            if ("SpeAttendance".equals(getCaller())){
-                viewHolder.detail_title_num.setText("特殊考勤明细");
-            }
-            if ("FeePlease!FYBX".equals(getCaller())){
-                viewHolder.detail_title_num.setText("消费明细");
-            }
+//            String num = CommonUtil.numToCN(position + 1);
+//            if ("Ask4Leave".equals(getCaller())){
+//                viewHolder.detail_title_num.setText("请假明细" );
+//            }
+//            if ("FeePlease!CCSQ!new".equals(getCaller())){
+//                viewHolder.detail_title_num.setText("出差明细");
+//            }
+//            if ("Workovertime".equals(getCaller())){
+//                viewHolder.detail_title_num.setText("加班明细");
+//            }
+//            if ("SpeAttendance".equals(getCaller())){
+//                viewHolder.detail_title_num.setText("特殊考勤明细");
+//            }
+//            if ("FeePlease!FYBX".equals(getCaller())){
+//                viewHolder.detail_title_num.setText("消费明细");
+//            }
+            viewHolder.detail_title_num.setText("明细" );
         }