Browse Source

审批流显示优化

FANGLH 9 years ago
parent
commit
9e2437b990

+ 1 - 1
WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('C:/Users/FANGlh/Desktop/UUAPP/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/CommonDocApprovalFlowAdapter.java

@@ -77,9 +77,9 @@ public class CommonDocApprovalFlowAdapter extends BaseAdapter {
         int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        if(nodesnum >0 && datanum >0 &&processnum >0){
+        if(datanum >0){
             viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-            if(position < nodesnum){
+            if(nodesnum >0 && position < nodesnum){
                 String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
                 if (!approval_status.isEmpty() && approval_status.equals("同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));

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

@@ -81,9 +81,9 @@ public class DailyDetailsApprovalFlowAdapter extends BaseAdapter {
         int nodesnum = mCommonApprovalFlowBean.getNodes().size();
         int datanum = mCommonApprovalFlowBean.getData().size();
         int processnum = mCommonApprovalFlowBean.getProcesss().size();
-        if(nodesnum >0 && datanum >0 &&processnum >0){
+        if(datanum >0){
             viewHolder.AppFlowName.setText(mCommonApprovalFlowBean.getData().get(position).getJP_NODEDEALMANNAME());
-            if(position < nodesnum){
+            if(nodesnum >0 && position < nodesnum){
                 String approval_status = mCommonApprovalFlowBean.getNodes().get(position).getJn_dealResult();
                 if (!approval_status.isEmpty() && approval_status.equals("同意")) {
                     viewHolder.AppFlowStatus.setTextColor(mContext.getResources().getColor(R.color.done_approval));

+ 0 - 1
WeiChat/src/main/res/layout/item_daily_details_approval_flow.xml

@@ -40,7 +40,6 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@+id/item_daily_details_approval_flow_photo_img"
-            android:text="方龙海,方龙海,方龙海,方龙海,方龙海,方龙海,方龙海,方龙海方龙海"
             android:singleLine="true"
             android:ellipsize="end"
             android:textColor="#575757"