pageSize=1000

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

@@ -1,12 +1,17 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.message;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
+import com.alibaba.fastjson.JSON;
 import com.andreabaccega.widget.FormEditText;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
@@ -15,20 +20,103 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.view.MyListView;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import de.hdodenhof.circleimageview.CircleImageView;
 
 /**
  * Created by FANGLH on 2017/7/5.
  */
-
 public class NewComApprovalActivity extends BaseActivity implements RecognizerDialogListener,View.OnClickListener {
-    @ViewInject(R.id.common_docui_sv)
+    private final static int common_language_code = 0x01;
+    private String[] common_language_words = new String[]{"这个","需求","是","真的","春","虫虫"};
+    @ViewInject(R.id.common_docui_sv)  // 同意、不同意上面的整个布局 加载时候GONE掉，数据出来了后再显示比较友好
     private LinearLayout common_docui_sv;
-    @ViewInject(R.id.shuru_iv)
+    @ViewInject(R.id.shuru_iv)   //请输入审批意见左边的提示
     private ImageView shuru_iv;
-    @ViewInject(R.id.approval_word_et)
+    @ViewInject(R.id.approval_word_et) //请输入审批意见
     private FormEditText approval_word_et;
+    @ViewInject(R.id.docui_photo_img)  // 单据申请人头像
+    private CircleImageView docui_photo_img;
+    @ViewInject(R.id.doc_name_tv)  // 单据名 ：xxx的xxx表
+    private TextView doc_name_tv;
+    @ViewInject(R.id.statues_iv)  // 单据状态用图片表示
+    private ImageView statues_iv;
+    @ViewInject(R.id.common_docui_main_msg_lv)
+    private MyListView common_docui_main_msg_lv; //单据主表列表
+    @ViewInject(R.id.common_docui_secondmsg_ll)
+    private LinearLayout common_docui_secondmsg_ll;//从表的布局
+    @ViewInject(R.id.common_docui_second_msg_lv)
+    private MyListView common_docui_second_msg_lv; //从表的列表
+    @ViewInject(R.id.common_docui_annex_ll)
+    private LinearLayout common_docui_annex_ll;//附件的布局
+    @ViewInject(R.id.common_docui_annex_lv)
+    private MyListView common_docui_annex_lv;//附件的列表
+    private Handler caHandler = new Handler(){
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            String result = msg.getData().getString("result");
+            switch (msg.what){
+                case 0x02:
+                    if (!StringUtils.isEmpty(result)){
+                        handleDocMsg(result);
+                    }
+                    LogUtil.prinlnLongMsg("0x02"+"result",result);
+                    break;
+                case 0x03:
+                    if (!StringUtils.isEmpty(result)){
+                        AFshow(result);  //单据审批流信息展示
+                    }
+                    LogUtil.prinlnLongMsg("0x03"+"result",result);
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    if (new JsonValidator().validate(result)) {
+                        ToastMessage(JSON.parseObject(result).getString("exceptionInfo"));
+                    } else {
+                        ToastMessage(result);
+                    }
+                    progressDialog.dismiss();
+                    break;
+            }
+        }
+    };
+
+    private void AFshow(String result) {
+
+    }
+
+    private String doc_caller;
+    private int doc_id;
+
+    private void handleDocMsg(String result) {
+        //TODO 处理单据信息
+
+        //then 获取单据审批流
+        //请求获取单据审批流数据
+        String url = Constants.getAppBaseUrl(getApplicationContext()) + "common/getCurrentJnodes.action";
+        Map<String, Object> param = new HashMap<>();
+        param.put("caller", doc_caller);
+        param.put("keyValue", doc_id);
+        param.put("_noc", 1);
+        LinkedHashMap headers = new LinkedHashMap();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+        ViewUtil.httpSendRequest(getApplicationContext(), url, param, caHandler, headers, 0x03, null, null, "post");
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,9 +142,23 @@ public class NewComApprovalActivity extends BaseActivity implements RecognizerDi
         approval_word_et.setOnClickListener(this);
     }
     private void initData() {
+        Intent intent = getIntent();
+        doc_caller = intent.getStringExtra("caller");
+        doc_id = intent.getIntExtra("keyValue", -1);
 
-    }
+        if (doc_id != -1 && !StringUtils.isEmail(doc_caller)){
+            //请求获取单据提交内容数据
+            progressDialog.show();
+            String docmsg_url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/common/getformandgriddata.action";
+            Map<String, Object> param_am = new HashMap<>();
+            param_am.put("caller", doc_caller);
+            param_am.put("id", doc_id);
+            LinkedHashMap headers_am = new LinkedHashMap();
+            headers_am.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));
+            ViewUtil.httpSendRequest(getApplicationContext(), docmsg_url, param_am, caHandler, headers_am, 0x02, null, null, "post");
 
+        }
+    }
 
     @Override
     public void onClick(View v) {
@@ -72,30 +174,55 @@ public class NewComApprovalActivity extends BaseActivity implements RecognizerDi
             case R.id.voice_iv:
                 RecognizerDialogUtil.showRecognizerDialog(ct, this);
                 break;
+            case R.id.common_language_iv:
+                selectComWords();
+                break;
         }
     }
-    private void initOnclickEvents() {
-
-
-
 
+    private void initOnclickEvents() {
         // 审批语编辑框监听，隐藏左边图片
         approval_word_et.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (count != 0) {
-                    shuru_iv.setVisibility(View.INVISIBLE);
-                }
-            }
+            public void onTextChanged(CharSequence s, int start, int before, int count) {if (count != 0) {shuru_iv.setVisibility(View.INVISIBLE);}}
             @Override
-            public void afterTextChanged(Editable s) {
-                if (TextUtils.isEmpty(s)) {
-                    shuru_iv.setVisibility(View.VISIBLE);
+            public void afterTextChanged(Editable s) {if (TextUtils.isEmpty(s)) {shuru_iv.setVisibility(View.VISIBLE);}}
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (resultCode == 0x20){  // 常用语返回取值
+            SelectBean b = data.getParcelableExtra("data");
+            if (b != null){
+                switch (requestCode){
+                    case common_language_code:
+                            approval_word_et.setText(b.getName());
+                    default:
                 }
             }
-        });
+
+        }
+    }
+
+    private void selectComWords() {
+        ArrayList<SelectBean> formBeaan = new ArrayList<>();
+        SelectBean selectBean;
+        for (int i = 0; i < common_language_words.length; i++) {
+            selectBean = new SelectBean();
+            selectBean.setName(common_language_words[i]);
+            formBeaan.add(selectBean);
+        }
+        Intent intent = new Intent();
+        intent.setClass(this, SelectActivity.class);
+        intent.putExtra("type", 2);
+        intent.putExtra("title", "常用语选择");
+        intent.putParcelableArrayListExtra("data", formBeaan);
+        startActivityForResult(intent, common_language_code);
     }
     @Override
     public void onResult(RecognizerResult recognizerResult, boolean b) {

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

@@ -545,7 +545,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             if (resultJsonObject != null){
                 String dataresult = resultJsonObject.getString("data");
                 if (!StringUtils.isEmpty(dataresult)){
-                    com.alibaba.fastjson.JSONArray dataArray = JSON.parseArray(dataresult);
+                    JSONArray dataArray = JSON.parseArray(dataresult);
                     mAddCost_list.addAll(JSON.parseArray(dataArray.toString(),AddCostBean.class));
                     LogUtil.prinlnLongMsg("mAddCost_list",JSON.toJSONString(mAddCost_list));
                 }
@@ -740,7 +740,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         params_Details.put("field", "fpd_d1");
         params_Details.put("page", "1");
         params_Details.put("condition", "1=1" + " AND fcs_departmentname='"+deparmentname+"'");
-        params_Details.put("pageSize", "30");
+        params_Details.put("pageSize", "1000");
         LinkedHashMap<String, Object> headers1 = new LinkedHashMap<>();
         headers1.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (!ListUtils.isEmpty(mGridconfigsBean)){
@@ -771,7 +771,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         params_type.put("page", "1");
         params_type.put("which", "form");
         params_type.put("condition", "1=1");
-        params_type.put("pageSize", "30");
+        params_type.put("pageSize", "1000");
         LinkedHashMap<String, Object> headers1 = new LinkedHashMap<>();
         headers1.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         if (!ListUtils.isEmpty(mFormconfigsBean)){

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -364,15 +364,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         picture_selector_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(ct, PictureSelectorDemo.class));
-            }
-        });
-
-        picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+//                startActivity(new Intent(ct, PictureSelectorDemo.class));
                 startActivity(new Intent(ct, NewComApprovalActivity.class));
-                return true;
             }
         });
 

WeiChat/src/main/res/layout/fragment_me.xml

@@ -617,7 +617,7 @@
                 android:drawableLeft="@drawable/icon_uu_setting"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="Picture Selector"
+                android:text="NewComApprovalActivity"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 

WeiChat/src/main/res/layout/newcom_approval_activity.xml

@@ -21,12 +21,11 @@
         android:layout_alignParentStart="true">
 
         <LinearLayout
-            android:id="@+id/ly_head_display"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_marginBottom="10dp">
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/common_docdata_rl"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -34,23 +33,32 @@
                 >
 
                 <de.hdodenhof.circleimageview.CircleImageView
-                    android:id="@+id/common_docui_photo_img"
+                    android:id="@+id/docui_photo_img"
                     android:layout_width="45dp"
                     android:layout_height="45dp"
                     android:contentDescription="@string/app_name"
                     android:src="@drawable/uuu"/>
 
                 <TextView
-                    android:id="@+id/common_doc_name_tv"
+                    android:id="@+id/doc_name_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
                     android:textColor="#575757"
                     android:textSize="@dimen/text_size_month"
                     android:text="鲁班七号的无尽之刃"
-                    android:layout_gravity="center_vertical"
+                    android:layout_toRightOf="@+id/docui_photo_img"
+                    android:layout_centerVertical="true"
                     />
-            </LinearLayout>
+                <ImageView
+                    android:id="@+id/statues_iv"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:contentDescription="@string/app_name"
+                    android:src="@drawable/uuu"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="20dp"/>
+            </RelativeLayout>
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
@@ -245,7 +253,7 @@
         />
     <LinearLayout
         android:id="@+id/change_dealman_ll"
-        android:layout_weight="3"
+        android:layout_weight="2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"