5.7.0 14:00

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

@@ -602,7 +602,6 @@ public class DailydetailsActivity extends BaseActivity {
     }
 
     public void initData() {
-        csv_hide.setVisibility(View.VISIBLE);
         // 获取、处理、赋值从日报列表界面或者添加日报界面点击跳转传来的数据
         final Intent intent = getIntent();
         date = intent.getStringExtra("Date");
@@ -676,7 +675,7 @@ public class DailydetailsActivity extends BaseActivity {
             approval_flowlv.setVisibility(View.GONE);
             hide_above_af.setVisibility(View.GONE);
         }
-
+        csv_hide.setVisibility(View.VISIBLE);
     }
 
     @Override

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

@@ -235,37 +235,9 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         LogUtil.prinlnLongMsg("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(this, url, params, handler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
+        ViewUtil.httpSendRequest(this, url, params, mHandler, headers, DELETE_DOC_REQUEST_SUCCESSFULLY, null, null, "get");
     }
 
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            switch (msg.what) {
-                case DELETE_DOC_REQUEST_SUCCESSFULLY:
-                    if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                        String delete_result = msg.getData().getString("result");
-                        LogUtil.prinlnLongMsg("delete_result", delete_result);
-                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
-                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
-                            real_list.remove(mPosition);
-                            mWorkDailyAdapter.notifyDataSetChanged();
-                        }
-                    }
-                    break;
-                default:
-                    if (msg.getData() != null) {
-                        if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
-                            Toast.makeText(mContext, msg.getData().getString("result"), Toast.LENGTH_LONG).show();
-                        }
-                    }
-                    break;
-            }
-        }
-    };
-
     //正则
     private static boolean getResult(String text, String str) {
         Pattern p = Pattern.compile(str);
@@ -352,6 +324,18 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
                         e.printStackTrace();
                     }
                     progressDialog.dismiss();
+                    break;
+                case DELETE_DOC_REQUEST_SUCCESSFULLY:
+                    if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
+                        String delete_result = msg.getData().getString("result");
+                        LogUtil.prinlnLongMsg("delete_result", delete_result);
+                        if (JSON.parseObject(delete_result).containsKey("success") && JSON.parseObject(delete_result).getBoolean("success")) {
+                            Toast.makeText(mContext, "工作日报删除成功", Toast.LENGTH_LONG).show();
+                            real_list.remove(mPosition);
+                            mWorkDailyAdapter.notifyDataSetChanged();
+                        }
+                    }
+                    break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     if (msg.getData() != null) {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
@@ -359,6 +343,7 @@ public class WorkDailyShowActivity extends BaseActivity implements RecognizerDia
                             progressDialog.dismiss();
                         }
                     }
+
                     break;
             }
 

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

@@ -13,7 +13,7 @@
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
-        android:visibility="gone"
+        android:visibility="visible"
         android:focusableInTouchMode="true">
 
         <LinearLayout

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

@@ -13,7 +13,7 @@
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -21,7 +21,6 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
-            android:layout_marginTop="5dp"
             >
 
             <LinearLayout
@@ -31,6 +30,52 @@
                 android:orientation="vertical"
                 android:layout_marginBottom="10dp"
                 >
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    >
+
+                    <ImageView
+                        android:id="@+id/common_docui_photo_img"
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:contentDescription="@string/app_name"
+                        android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp" />
+
+                    <TextView
+                        android:id="@+id/common_docui_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:textColor="#575757"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="10dp"
+
+                        />
+                    <TextView
+                        android:id="@+id/common_docui_Section_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="8dp"
+                        android:layout_toRightOf="@+id/common_docui_photo_img"
+                        android:layout_below="@id/common_docui_name_tv"
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_hine"
+                        android:layout_marginTop="4dp"/>
+                    <TextView
+                        android:id="@+id/work1_daily_detail_status_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        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"

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

@@ -65,7 +65,7 @@
                         android:textSize="@dimen/text_hine"
                         android:layout_marginTop="4dp"/>
                     <TextView
-                        android:id="@+id/work_daily_detail_status_tv"
+                        android:id="@+id/work1_daily_detail_status_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
@@ -103,7 +103,7 @@
                         android:layout_marginBottom="0dp"
                         android:textSize="@dimen/text_main" />
                     <TextView
-                        android:id="@+id/work1_daily_detail_status_tv"
+                        android:id="@+id/work_daily_detail_status_tv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
@@ -112,7 +112,7 @@
                         android:textSize="@dimen/text_hine"/>
                     <ImageView
                         android:id="@+id/work_daily_unsubmit_iv"
-                        android:layout_toLeftOf="@id/work1_daily_detail_status_tv"
+                        android:layout_toLeftOf="@id/work_daily_detail_status_tv"
                         android:layout_width="40dp"
                         android:layout_height="30dp"
                         android:src="@drawable/unknow_info"