审批列表UIbug修复，

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

@@ -43,6 +43,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -600,11 +601,11 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     String jp_master = jsonArray.getJSONObject(position).getString("CURRENTMASTER");
                     model.name.setText(jp_launchername + "的" + jp_name);
                     if (jp_launchtime != null) {
-                        model.date.setText(DateFormatUtil.getStrDate4Date(new Date(jp_launchtime), "yyyy-MM-dd HH:mm"));
+                        model.date.setText(DateFormatUtil.getStrDate4Date(new Date(jp_launchtime), "MM-dd HH:mm"));
                     } else {
                         model.date.setText("");
                     }
-                    ;
+
 //                    model.status.setText(jp_status);
                     model.status.setTextColor(getResources().getColor(R.color.approvaling));
                     model.status.setText("等待我审批");
@@ -634,7 +635,9 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     String jn_dealresult = jsonArray.getJSONObject(position).getString("JN_DEALRESULT");
 
                     model.name.setText(jn_dealmanname + "的" + jp_name);
-                    model.date.setText(jn_dealtime);
+                    Long L = TimeUtils.s_str_2_long(jn_dealtime);
+                    model.date.setText(DateFormatUtil.getStrDate4Date(new Date(L), "MM-dd HH:mm"));
+//                    model.date.setText(jn_dealtime);
                     if (!StringUtils.isEmpty(jn_dealresult)) {
                         if ("不同意".equals(jn_dealresult)) {
 //                            CommonUtil.textSpanForStyle(model.status, getString(R.string.status_approved) + "(" + jn_dealresult + ")",
@@ -706,7 +709,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 //                        model.name.setText(name + "-" + code);
                         model.name.setText(name);
                         if (time != null) {
-                            model.date.setText(DateFormatUtil.getStrDate4Date(new Date(time), "yyyy-MM-dd HH:mm"));
+                            model.date.setText(DateFormatUtil.getStrDate4Date(new Date(time), "MM-dd HH:mm"));
                         } else {
                             model.date.setText("");
                         }

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

@@ -12,8 +12,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -40,7 +38,6 @@ import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.PropertyFilter;
 import com.andreabaccega.widget.FormEditText;
-import com.iflytek.cloud.thirdparty.V;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -162,6 +159,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
     private AddCostBean mAddCostBean;
     private List<AddCostBean> mAddCost_list; // popwindow要展示的消费明细类型
+    private String[] default_Cost =  {"交通费","通讯费","招待费","差旅费","办公费","税费","物业费","其他"};
 
     //点击新增需要展示的消费明数据细主表
     private List<CostTypeSingleBean> costtypesinglebeanList;
@@ -280,7 +278,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
 
                         if ("S".equals(dg_type)){
                             if (cd_table_position < costFormModel_list.size())
-                            costFormModel_list.remove(cd_table_position);
+                                costFormModel_list.remove(cd_table_position);
                         }
                         if (costFormModel_list.size() == 0){
                             detail_table_ll.setVisibility(View.GONE);
@@ -860,9 +858,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 doSingleSelect(money_combdatas,2,getString(R.string.currency),SELECT_CURRENCY);
                 break;
             case R.id.add_details_tv:
-                if ("S".equals(dg_type)){
-                  showEditWindow();
-                }else if ("DF".equals(dg_type)){
+                if ("S".equals(dg_type)) {
+                    showEditWindow();
+//                }else if ("DF".equals(dg_type)){
+                }else {
                     showPopupWindow();
                 }
                 putDownInput();
@@ -891,12 +890,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             case R.id.c_point:
                 if (StringUtils.isEmpty(c_edit.getText().toString())) break;
                 if (!StringUtils.isEmpty(c_edit.getText().toString()) && c_edit.getText().toString().contains(".")){
-                break;
-            }
+                    break;
+                }
 
-            if (StringUtils.isEmpty(c_edit.getText().toString()) && StringUtils.isEmpty(c_result.getText().toString())){
+                if (StringUtils.isEmpty(c_edit.getText().toString()) && StringUtils.isEmpty(c_result.getText().toString())){
                     break;
-            }
+                }
                 c_onclick("."); break;
             case R.id.c_c:
                 num1=0;num2=0;
@@ -1214,14 +1213,10 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         if (setWindow == null) initPopupWindow();
         setWindow.showAtLocation(getWindow().getDecorView().
                 findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
-//        if (VERSION_CODES  < 24) // API版本太高不断刷新View亮度，会有黑缝隙bug
-//            DisplayUtil.backgroundAlpha(this, 0.4f);
     }
     private void closePopupWindow() {
         if (setWindow != null)
             setWindow.dismiss();
-//        if (VERSION_CODES  < 24)
-//            DisplayUtil.backgroundAlpha(this, 1f);
 
         btn_save.setVisibility(View.VISIBLE);
     }
@@ -1248,7 +1243,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     }
 
     private void initAddEvent() {
-       // 明细过长时长按，toast出明细内容
+        // 明细过长时长按，toast出明细内容
         gv_details_list.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
@@ -1304,7 +1299,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     }
                 }else {
 //                    for (int i = 0; i < 3; i++) {
-                        doDetailsHandle();
+                    doDetailsHandle();
 //                    }
                 }
 
@@ -1345,7 +1340,13 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
     }
     private void initAddDatas() {
-        if (ListUtils.isEmpty(mAddCost_list)) return;
+        if (ListUtils.isEmpty(mAddCost_list)) {
+            for (int i = 0; i < default_Cost.length; i++) {
+                AddCostBean m = new AddCostBean();
+                m.setFcs_itemname(default_Cost[i]);
+                mAddCost_list.add(m);
+            }
+        }
         if (!ListUtils.isEmpty(costFormModel_list) && ListUtils.isEmpty(selected_detailsData)){
             for (int i = 0; i < costFormModel_list.size(); i++) {
                 selected_detailsData.add(costFormModel_list.get(i).getCost_type());
@@ -1879,8 +1880,8 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
             doDeletePAttach(position);
             LogUtil.prinlnLongMsg("dfb_attach",fb_attach);
         }
-            mPhotoList.remove(position);
-            mAdapter.notifyDataSetInvalidated();
+        mPhotoList.remove(position);
+        mAdapter.notifyDataSetInvalidated();
     }
 
     /**
@@ -1892,28 +1893,28 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     private void doDeletePAttach(int posi) {
         fb_attach_list = new ArrayList<>();
         String[] split = fb_attach.split(";");
-            if (posi < split.length) {
-                for (int i = 0; i < split.length; i++) {
-                    if (i != posi){
-                        fb_attach_list.add(split[i]);
-                    }
+        if (posi < split.length) {
+            for (int i = 0; i < split.length; i++) {
+                if (i != posi){
+                    fb_attach_list.add(split[i]);
+                }
 
-                    if (i == split.length-1){
-                        fb_attach = "";
-                        for (int j = 0; j < fb_attach_list.size(); j++) {
-                            fb_attach = fb_attach +fb_attach_list.get(j)+";";
+                if (i == split.length-1){
+                    fb_attach = "";
+                    for (int j = 0; j < fb_attach_list.size(); j++) {
+                        fb_attach = fb_attach +fb_attach_list.get(j)+";";
 
-                            if (j == fb_attach_list.size()-1){
-                                Log.i("now_fb_attach", fb_attach.toString());
-                                mCostUpdatePModel.getFiles().remove(posi);
-                                mAdapter.notifyDataSetInvalidated();
-                            }
+                        if (j == fb_attach_list.size()-1){
+                            Log.i("now_fb_attach", fb_attach.toString());
+                            mCostUpdatePModel.getFiles().remove(posi);
+                            mAdapter.notifyDataSetInvalidated();
                         }
                     }
                 }
-            }else {
-                return;
             }
+        }else {
+            return;
+        }
     }
 
     private void takePhoto() {
@@ -1958,7 +1959,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
         if (item.getItemId() == android.R.id.home){
 //            if (formid != 0){
-               finish();
+            finish();
 //            }else{
 //                startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
 //                        .putExtra("WorkDailyAdd", "WorkDailyAdd"));
@@ -1971,7 +1972,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
     @Override
     public void onBackPressed() {
 //        if (formid != 0){
-            finish();
+        finish();
 //        }else {
 //            startActivity(new Intent(ExpenseReimbursementActivity.this, OAActivity.class)
 //                    .putExtra("WorkDailyAdd", "WorkDailyAdd"));
@@ -2174,7 +2175,7 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 selectApprovers(name);
             } else {
                 progressDialog.dismiss();
-               commitSuccess(keyValue);
+                commitSuccess(keyValue);
             }
         } else {
             progressDialog.dismiss();

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

@@ -1,66 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_me_menu_item_bg">
+    android:background="@drawable/selector_me_menu_item_bg"
+    android:orientation="horizontal">
+
     <ImageView
-        android:visibility="visible"
         android:id="@+id/photo_img"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/app_name"
         android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@id/node_ll"
         android:layout_marginTop="12dp"
-        android:src="@drawable/common_header_boy"/>
+        android:layout_toRightOf="@id/node_ll"
+        android:contentDescription="@string/app_name"
+        android:src="@drawable/common_header_boy"
+        android:visibility="visible" />
+
     <de.hdodenhof.circleimageview.CircleImageView
-        android:visibility="visible"
         android:id="@+id/photo_me"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:contentDescription="@string/app_name"
         android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@id/node_ll"
         android:layout_marginTop="12dp"
-        android:src="@drawable/common_header_boy"/>
+        android:layout_toRightOf="@id/node_ll"
+        android:contentDescription="@string/app_name"
+        android:src="@drawable/common_header_boy"
+        android:visibility="visible" />
+
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/selector_me_menu_item_bg">
+        android:background="@drawable/selector_me_menu_item_bg"
+        android:orientation="vertical">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
+
             <TextView
-                android:id="@+id/tv_name"
+                android:id="@+id/tv_date"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_margin="10dp"
-                android:textSize="15sp"
-                android:text="采购单-2013212"
-                android:maxLength="12"
-                android:singleLine="true"
-                android:ellipsize="end"/>
+                android:text="2016-10-09 09:11" />
 
             <TextView
-                android:id="@+id/tv_date"
+                android:id="@+id/tv_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
                 android:layout_margin="10dp"
-                android:layout_alignParentRight="true"
-                android:text="2016-10-09 09:11"/>
+                android:layout_toLeftOf="@id/tv_date"
+                android:ellipsize="end"
+                android:maxLength="12"
+                android:singleLine="true"
+                android:text="采购单-2013212"
+                android:textSize="15sp" />
+
+
         </RelativeLayout>
 
         <TextView
             android:id="@+id/tv_status"
-            android:layout_marginLeft="10dp"
-            android:layout_marginBottom="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="状态"
-            android:textColor="@color/light_gray"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="10dp"
             android:autoText="false"
-            />
+            android:text="状态"
+            android:textColor="@color/light_gray" />
     </LinearLayout>
 </LinearLayout>

app_core/common/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion "25.0.0"
 
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 25
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"