日报详情审批流界面设计：已基本完成 03

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/DailyDetailsApprovalFlowAdapter.java

@@ -12,7 +12,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
 
-import java.util.List;
 
 /**
  * Created by FANGlh on 2016/11/4.
@@ -71,41 +70,56 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         }
 
         //ToDo 日报详情审批流过程显示，逻辑比较繁琐
-        if(mCommonApprovalFlowBean.getNodes() == null || mCommonApprovalFlowBean.getNodes().size() == 0){
+
+        //获取 已审批节点数量 和总审批节点数
+        int nodesnum = mCommonApprovalFlowBean.getNodes().size();
+        int datanum = mCommonApprovalFlowBean.getData().size();
+        viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
+        //当审批流为空时默认第一个审批人为审批节点
+        if(mCommonApprovalFlowBean.getNodes() == null ||nodesnum <= 0){
            viewHolder.AppFlowTime.setText(null);
             viewHolder.AppFlowStatus.setText(null);
-        }else{
             viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-
-            String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
-          //  String description_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_operatedDescription();
-            if (!approval_status.isEmpty() && approval_status.equals("同意")) {
-                viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.approval_flow));
-                viewHolder.AppFlowStatus.setText("已审批");
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
-            }else if(!approval_status.isEmpty() && approval_status.equals("不同意")){
+            if(position == 0){
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
-                viewHolder.AppFlowStatus.setText("不同意");
+                viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
-                viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
             }
-            //当节点是待审批状态时
-            else if(approval_status.isEmpty() && mCommonApprovalFlowBean.getData().get(position).getJP_NODENAME().equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())) {
+        }else{
+            if (position < nodesnum && datanum > 0){
+                String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
+                if (!approval_status.isEmpty() && approval_status.equals("同意")) {
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.approval_flow));
+                    viewHolder.AppFlowStatus.setText("已审批");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_finished3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
+                }
+
+                else if(!approval_status.isEmpty() && approval_status.equals("不同意")){
+                    viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
+                    viewHolder.AppFlowStatus.setText("不同意");
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
+                    viewHolder.AppFlowTime.setText(mCommonApprovalFlowBean.getNodes().get(position).getJn_dealTime());
+                }
+
+                else if(position == (nodesnum -1)) {
+
+                }
+
+                //当节点为none状态是gone掉默认审批状态和时间
+                else {
+                    viewHolder.AppFlowStatus.setText(null);
+                    viewHolder.AppFlowTime.setText(null);
+                    viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
+                }
+            } //当节点是待审批状态时
+            else if(position == nodesnum && position <=datanum && mCommonApprovalFlowBean.getData().get(position).getJP_NODENAME().equals(mCommonApprovalFlowBean.getCurrentnode().getNodename())){
                 viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
                 viewHolder.AppFlowStatus.setText("待审批");
                 viewHolder.AppFlowNode.setImageResource(R.drawable.node_wait3);
             }
 
-            //当节点为none状态是gone掉默认审批状态和时间
-            else {
-                viewHolder.AppFlowStatus.setText(null);
-                viewHolder.AppFlowTime.setText(null);
-                viewHolder.AppFlowNode.setImageResource(R.drawable.node_none3);
-            }
-        }
-
-        //TODO 从im获取头像
+            //TODO 从im获取头像
        /* try {
             if (manager == null) manager = new DBManager(mContext);
             String whichsys = CommonUtil.getSharedPreferences(mContext, "erp_master");
@@ -124,6 +138,9 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
 
 
         }*/
+            }
+
+
         return convertView;
     }
 

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

@@ -94,6 +94,27 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         initView();
+        initEvent();
+    }
+
+    private String str;
+    private void initEvent() {
+      add_summary.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) {
+
+          }
+
+          @Override
+          public void afterTextChanged(Editable s) {
+              str=s.toString();
+          }
+      });
     }
 
     @Override
@@ -236,36 +257,23 @@ public class WorkDailyAddActivity extends BaseActivity implements View.OnTouchLi
     }
 
     private void sendWorkDailyByErp(String s1, String s2, String s3) {
+        Log.i("TODO","xxxxxxxxx  str="+str);
+        Log.i("TODO","s2="+s2);
+        Log.i("TODO","s3="+s3);
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "mobile/addWorkReport.action";
         Map<String, Object> formStoreMap = new HashMap<>();
-//        formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
-//        formStoreMap.put("wd_comment", s1);
-//        formStoreMap.put("wd_plan", s2);
-//        formStoreMap.put("wd_experience", s3);
-//        String formStore = StringUtils.mapToJson(formStoreMap);
-
-
-        String formStore =
-                "{\n" +
-                        "\"wd_empcode\":" + CommonUtil.getSharedPreferences(ct, "erp_username") + ",\n" +
-                        "\"wd_comment\":\"" + s1
-                        + "\",\n" +
-                        "\"wd_plan\":\""
-                        + s2 + //开始时间
-                        "\",\n" +
-                        "\"wd_experience\":\"" +
-                        s3 +
-                        "\"\n" +
-                        "}";
-        Log.i("TODO", "formStore=" + formStore);
+        formStoreMap.put("wd_empcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
+        formStoreMap.put("wd_comment", s1);
+        formStoreMap.put("wd_plan", s2);
+        formStoreMap.put("wd_experience", s3);
+        String formStore = StringUtils.mapToJson(formStoreMap);
         HashMap<String, Object> params = new HashMap<>();
         params.put("caller", "WorkDaily");
         params.put("formStore", formStore);
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(this, url, params, handler, headers, 0x12, null, null, "get");
-
-        Log.i("handleMessage: ", formStore);
+        Log.i("TODO: ", formStore);
     }
 
     @Override

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

@@ -110,23 +110,23 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/ly_bottom_submit"
+                style="@style/form_linear_customer">
 
+                <ImageView
+                    android:id="@+id/add_work_daily_submit_iv"
+                    android:layout_gravity="center_vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/submit3"
+                    />
+            </LinearLayout>
         </LinearLayout>
+
     </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
-    <LinearLayout
-        android:id="@+id/ly_bottom_submit"
-        style="@style/form_linear_customer">
 
-        <ImageView
-            android:id="@+id/add_work_daily_submit_iv"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/submit3"
-            android:layout_marginTop="10dp"
-            android:textSize="20sp"
-            android:text="提    交"/>
-    </LinearLayout>
 
 </LinearLayout>

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

@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ebe9e9"
+    android:orientation="vertical"
+   >
+
+    <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical"
+            android:layout_marginTop="5dp"
+            >
+
+            <LinearLayout
+                android:id="@+id/ly_head_display"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="10dp"
+                android:visibility="visible"
+                >
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:layout_marginTop="3dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="@color/item_line" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:visibility="visible"
+                    >
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    >
+
+                    <TextView
+                        android:id="@+id/work_daily_detail_time_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="left|top"
+                        android:text="2016-11-02"
+                        android:textColor="#000000"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="0dp"
+                        android:textSize="@dimen/text_main"
+                        android:visibility="gone"/>
+
+                    <ImageView
+                        android:id="@+id/item_daily_details_approval_flow_photo_img"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="@drawable/avatar_normal"
+                        android:contentDescription="@string/app_name"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp" />
+
+                    <TextView
+                        android:id="@+id/item_daily_details_approval_flow_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
+                        android:text="方龙海"
+                        android:textColor="#575757"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="10dp"
+
+                        />
+                    <TextView
+                        android:id="@+id/item_daily_details_approval_flow_status_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
+                        android:layout_below="@id/item_daily_details_approval_flow_name_tv"
+                        android:text="移动终端部>xx"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="4dp"/>
+                    <TextView
+                        android:id="@+id/work_daily_detail_status_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="待审批"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="0dp"
+                        android:textSize="@dimen/text_hine"/>
+                </RelativeLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="18sp"
+                    android:text="工作总结"
+                    android:textColor="#575757"
+                    android:layout_marginTop="5dp"
+                    />
+                <TextView
+                    android:id="@+id/work_daily_detail_summary_et"
+                    style="@style/form_relative_right_text1"
+                    android:text="总结啦"
+                    android:textColor="#575757"
+                    />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"/>
+                <LinearLayout
+                    android:id="@+id/work_daily_detail_plan_ll"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="visible">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="18sp"
+                    android:text="工作计划"
+                    android:layout_marginTop="5dp"
+                    android:textColor="#575757"
+                    />
+                <TextView
+                    android:id="@+id/work_daily_detail_plan_tv"
+                    style="@style/form_relative_right_text1"
+                    android:textColor="#575757"
+                    android:text="计划啦"/>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"/>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/work_daily_detail_experience_ll"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="visible">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="工作心得"
+                        android:layout_marginTop="5dp"
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        />
+
+                <TextView
+                    android:id="@+id/work_daily_detail_experience_tv"
+                    style="@style/form_relative_right_text1"
+                    android:textColor="#575757"
+                    android:text="心得啦"
+                    />
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/line"
+                            android:background="@color/item_line"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"/>
+                 </LinearLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="visible">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:background="#f6f5f5"
+                        android:visibility="visible">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="已完成任务"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="5dp"
+                    android:textSize="18sp"
+                    android:textColor="#575757"
+                    android:visibility="visible"
+                    />
+                <TextView
+                    android:id="@+id/work_daily_detail_no_task"
+                    style="@style/form_relative_right_text1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="今天暂无分配工作任务"
+                    android:layout_marginLeft="10dp"
+                    android:textColor="#575757"
+                    android:visibility="visible"
+                    />
+
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/work_daily_detail_completedtask_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#f6f5f5"
+                    android:visibility="visible">
+                </com.xzjmyk.pm.activity.view.MyListView>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="未完成任务"
+                        android:layout_marginLeft="10dp"
+                        android:layout_marginTop="5dp"
+                        android:textSize="18sp"
+                        android:textColor="#575757"
+                        android:visibility="visible"
+                        />
+
+                    <com.xzjmyk.pm.activity.view.MyListView
+                        android:id="@+id/work_daily_detail_uncompletedtask_lv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="#f6f5f5"
+                        android:visibility="visible">
+                    </com.xzjmyk.pm.activity.view.MyListView>
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="5dp"
+                            android:background="#EBE9E9"
+                            android:layout_marginTop="5dp"
+                            android:visibility="visible"/>
+                        </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="10dp"
+                        android:background="@color/white"
+                        android:layout_marginTop="5dp"
+                        android:visibility="visible"/>
+
+                <com.xzjmyk.pm.activity.view.MyListView
+                    android:id="@+id/work_daily_detail_approval_flow_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="visible"
+                    android:background="#ebe9e9"
+                    >
+                </com.xzjmyk.pm.activity.view.MyListView>
+
+                 </LinearLayout>
+             </LinearLayout>
+        </LinearLayout>
+    </com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView>
+
+</LinearLayout>

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

@@ -150,7 +150,8 @@
                             android:layout_height="@dimen/line"
                             android:background="@color/item_line"
                             android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"/>
+                            android:layout_marginRight="5dp"
+                            android:visibility="gone"/>
                  </LinearLayout>
                 </LinearLayout>
                 <LinearLayout

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

@@ -53,7 +53,6 @@
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
             android:layout_below="@id/item_daily_details_approval_flow_name_tv"
-            android:text="待审批"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_hine"
             android:layout_marginTop="4dp"/>
@@ -96,7 +95,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
-            android:text="2016-11-4 19:40"
             android:textColor="#9F9595"
             android:textSize="@dimen/text_hine"
             android:layout_marginTop="10dp"

WeiChat/src/main/res/values/styles.xml

@@ -346,7 +346,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">top</item>
-        <item name="android:minHeight">120dp</item>
+        <item name="android:minHeight">130dp</item>
         <item name="android:maxHeight">800dp</item>
         <item name="android:textColorHint">#969595</item>
         <item name="android:textSize">14sp</item>