提交代码保存

1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity;
 
 import android.app.Application;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.os.Build;
@@ -136,7 +137,11 @@ public class MyApplication extends Application {
         // 初始化网络监听
         mNetWorkObservable = new NetWorkObservable(this);
         initErpDB();
-
+        try {
+            com.xzjmyk.pm.activity.ui.erp.util.Constants.cleanRed(this);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -323,7 +328,7 @@ public class MyApplication extends Application {
         ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).defaultDisplayImageOptions(mNormalImageOptions)
                 // .denyCacheImageMultipleSizesInMemory()
                 .discCache(new TotalSizeLimitedDiscCache(new File(mPicturesDir), 50 * 1024 * 1024))
-                        // 最多缓存50M的图片
+                // 最多缓存50M的图片
                 .discCacheFileNameGenerator(new Md5FileNameGenerator()).memoryCache(memoryCache).tasksProcessingOrder(QueueProcessingType.LIFO)
                 .threadPriority(Thread.NORM_PRIORITY - 2)
                 .threadPoolSize(4)

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -780,8 +780,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         if (platform) {
             headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
-        }
-        else {
+        } else {
             headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         }
         ViewUtil.httpSendRequest(this, url, param, mUserCheckHander, headers, LOG_SEND_REQUEST, null, null, "post");

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

@@ -208,7 +208,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
 
     @Override
     protected void onResume() {
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
             oamain_sign_statistical_notice_tv.setVisibility(View.INVISIBLE);
         } else {
@@ -430,7 +430,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         //判断是否是管理员
         CommonInterface.getInstance().judgeManager(null);
         CommonInterface.getInstance().getOutSetInfo(null);
-        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
+        int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
             oamain_sign_statistical_notice_tv.setVisibility(View.INVISIBLE);
         } else {
@@ -963,6 +963,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 break;
             case R.id.oamain_sign_statistical_tv: //考勤统计
                 startActivity(new Intent(activity, StatisticsActivity.class));
+                PreferenceUtils.putInt(Constants.NEW_FUNCTION_NOTICE, 1);
                 break;
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -1,9 +1,14 @@
 package com.xzjmyk.pm.activity.ui.erp.util;
 
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+
 /**
  * Created by Administrator on 2016/1/30.
  */
@@ -269,7 +274,7 @@ public class Constants {
      * @author：Administrator on 2016/2/18 15:12
      */
     public static String getAppBaseUrl(Context ct) {
-        if (ct==null)return "";
+        if (ct == null) return "";
         String baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         return baseUrl;
     }
@@ -303,12 +308,34 @@ public class Constants {
     public final static String new_signout = "signout";
     public final static String new_oa = "oa_menu";
     public final static String new_business = "business";
-    
+
     public final static String NEW_SETING = "seting_2";
- 
+
     public final static String NEW_UURUN = "NEW_UURUN";
     public final static String NEW_ME_TAG = "ME_TAG";
 
-    public final static String SET_SIGN_AUTO="set_sign_auto";
-    public final static String SET_SIGN_IN="set_sign_in";
+    public final static String SET_SIGN_AUTO = "set_sign_auto";
+    public final static String SET_SIGN_IN = "set_sign_in";
+    public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
+
+
+    public static void cleanRed(Context ct) throws PackageManager.NameNotFoundException {
+        int versionCode = PreferenceUtils.getInt("versionCode", 0);
+        LogUtil.i("versionCode=" + versionCode);
+        int appVersionCode = getVersionCode(ct);
+        if (appVersionCode > versionCode) {
+            LogUtil.i("getVersionCode(ct)>versionCode");
+            PreferenceUtils.putInt("versionCode", appVersionCode);
+            CommonUtil.putSharedPreferencesBoolean(ct, new_oa, false);
+            PreferenceUtils.putInt(MainActivity.NEW_FUNCTION_NOTICE, 0);
+        }
+    }
+
+    private static int getVersionCode(Context ct) throws PackageManager.NameNotFoundException {
+        PackageManager packageManager = ct.getPackageManager();
+        PackageInfo packageInfo = packageManager.getPackageInfo(ct.getPackageName(), 0);
+        LogUtil.i("packageInfo.versionCode=" + packageInfo.versionCode);
+        return packageInfo.versionCode;
+    }
+
 }

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
-<com.handmark.pulltorefresh.library.PullToRefreshScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.handmark.pulltorefresh.library.PullToRefreshScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,64 +33,70 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingBottom="10dp">
+
                     <RelativeLayout
-                        android:layout_weight="1"
                         android:layout_width="0dp"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
                         <TextView
                             android:id="@+id/tv_signin_num"
                             android:layout_width="10dp"
                             android:layout_height="10dp"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignTop="@+id/signin"
+                            android:layout_gravity="top|right"
                             android:layout_marginRight="10dp"
                             android:background="@drawable/hongdian"
-                            android:layout_gravity="top|right"
                             android:gravity="center"
                             android:text=""
                             android:textColor="@android:color/white"
-                            android:textSize="10.0dip"
-                            android:layout_alignParentRight="true"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignTop="@+id/signin" />
-                    <TextView
-                        android:id="@+id/signin"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_1"
-                        android:layout_centerInParent="true"
-                        android:text="@string/oasign_title"
-                        android:textColor="@color/white"
-                        android:layout_marginTop="2dp"/>
+                            android:textSize="10.0dip" />
+
+                        <TextView
+                            android:id="@+id/signin"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:layout_marginTop="2dp"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_1"
+                            android:text="@string/oasign_title"
+                            android:textColor="@color/white" />
                     </RelativeLayout>
+
                     <RelativeLayout
-                        android:layout_weight="1"
                         android:layout_width="0dp"
-                        android:layout_height="match_parent">
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
                         <TextView
                             android:id="@+id/tv_signout_num"
                             android:layout_width="10dp"
                             android:layout_height="10dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_gravity="top|right"
                             android:layout_marginRight="10dp"
                             android:background="@drawable/hongdian"
-                            android:layout_gravity="top|right"
-                            android:layout_alignParentRight="true"
                             android:gravity="center"
                             android:text=""
                             android:textColor="@android:color/white"
-                            android:textSize="10.0dip"
-                            />
-                    <TextView
-                        android:id="@+id/outoffice"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
-                        android:gravity="center"
-                        android:drawablePadding="@dimen/drawable_padding"
-                        android:drawableTop="@drawable/oa_2"
-                        android:layout_centerInParent="true"
-                        android:text="@string/oaoutplan_title"
-                        android:textColor="@color/white" />
-                        </RelativeLayout>
+                            android:textSize="10.0dip" />
+
+                        <TextView
+                            android:id="@+id/outoffice"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:layout_marginTop="2dp"
+                            android:drawablePadding="@dimen/drawable_padding"
+                            android:drawableTop="@drawable/oa_2"
+                            android:gravity="center"
+                            android:text="@string/oaoutplan_title"
+                            android:textColor="@color/white" />
+                    </RelativeLayout>
+
                     <TextView
                         android:id="@+id/worklog"
                         android:layout_width="0dp"
@@ -345,9 +349,9 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center|left"
+                        android:paddingLeft="12dp"
                         android:text="@string/done"
-                        android:textSize="@dimen/text_hine"
-                        android:paddingLeft="12dp"/>
+                        android:textSize="@dimen/text_hine" />
 
                     <View
                         android:layout_width="1px"
@@ -357,10 +361,10 @@
                     <TextView
                         android:id="@+id/uok_task_num"
                         android:layout_width="0dp"
-                        android:paddingLeft="12dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:gravity="center|left"
+                        android:paddingLeft="12dp"
                         android:text="@string/undone"
                         android:textSize="@dimen/text_hine" />
 
@@ -398,8 +402,7 @@
                 android:id="@+id/oa_more_menu_ll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:orientation="vertical">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -407,7 +410,8 @@
                     android:background="#6A6A6A"
                     android:orientation="horizontal"
                     android:paddingBottom="10dp"
-                    >
+                    android:visibility="gone">
+
                     <TextView
                         android:id="@+id/oamain_special_attendance_tv"
                         android:layout_width="0dp"
@@ -425,18 +429,27 @@
                         android:id="@+id/oamain_sign_statistical_tv"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
                         android:layout_weight="1"
                         android:orientation="vertical"
-                        android:layout_marginTop="2dp"
                         android:paddingLeft="5dp"
-                        android:visibility="visible"
-                        >
+                        android:visibility="visible">
+
                         <FrameLayout
                             android:id="@+id/notice_head_area"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="20dp"
-                            >
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="20dp">
+
+                            <TextView
+                                android:id="@+id/oamain_sign_statistical_notice_tv"
+                                android:layout_width="10dp"
+                                android:layout_height="10dp"
+                                android:layout_gravity="top|right"
+                                android:layout_marginRight="10dp"
+                                android:background="@drawable/hongdian"
+                                android:textColor="@android:color/white"
+                                android:textSize="10.0dip" />
 
                             <ImageView
                                 android:id="@+id/notice_avatar_img"
@@ -446,30 +459,18 @@
                                 android:contentDescription="@string/app_name"
                                 android:padding="0dp"
                                 android:src="@drawable/kaoqintongji" />
-
-                            <TextView
-                                android:id="@+id/oamain_sign_statistical_notice_tv"
-                                android:layout_width="10dp"
-                                android:layout_height="10dp"
-                                android:layout_gravity="top|right"
-                                android:background="@drawable/hongdian"
-                                android:textColor="@android:color/white"
-                                android:textSize="10.0dip"
-                                android:visibility="gone"
-                                android:layout_marginLeft="30dp"
-                                />
                         </FrameLayout>
 
                         <TextView
-                            android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
-                            android:gravity="center"
-                            android:text="@string/work_statistics"
-                            android:textColor="@color/white"
+                            android:layout_height="wrap_content"
                             android:layout_marginLeft="13dp"
                             android:layout_marginTop="5dp"
-                            />
+                            android:gravity="center"
+                            android:text="@string/work_statistics"
+                            android:textColor="@color/white" />
                     </LinearLayout>
+
                     <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -504,5 +505,4 @@
     </LinearLayout>
 
 
-</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
-<!---->
+</com.handmark.pulltorefresh.library.PullToRefreshScrollView><!---->

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

@@ -14,56 +14,58 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-           <LinearLayout
-               android:layout_width="0dp"
-               android:layout_weight="2"
-               android:layout_height="wrap_content"
-               android:background="@color/oa_bg"
-               android:layout_marginTop="10dp"
-               android:layout_marginLeft="20dp"
-               >
-
-               <TextView
-                   android:id="@+id/start_date_tv"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:text="2017-2-1"
-                   android:drawableRight="@drawable/rili"
-                   android:drawablePadding="5dp"
-                   android:paddingTop="8dp"
-                   android:paddingBottom="8dp"
-                   android:paddingLeft="20dp"
-                   android:paddingRight="20dp"/>
-           </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="10dp"
+                android:layout_weight="2"
+                android:background="@color/oa_bg">
+
+                <TextView
+                    android:id="@+id/start_date_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="5dp"
+                    android:drawableRight="@drawable/rili"
+                    android:gravity="center"
+                    android:paddingBottom="8dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="8dp"
+                    android:text="2017-2-1" />
+            </LinearLayout>
+
             <TextView
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="@string/sign_to"
                 android:layout_marginTop="15dp"
+                android:layout_weight="1"
                 android:gravity="center"
-                />
+                android:text="@string/sign_to" />
+
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="2"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:background="@color/oa_bg"
-                android:layout_marginTop="10dp"
                 android:layout_marginRight="20dp"
-                >
+                android:layout_marginTop="10dp"
+                android:layout_weight="2"
+                android:background="@color/oa_bg"
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/end_date_tv"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="2017-2-28"
-                    android:drawableRight="@drawable/rili"
                     android:drawablePadding="5dp"
-                    android:paddingTop="8dp"
+                    android:drawableRight="@drawable/rili"
+                    android:gravity="center"
                     android:paddingBottom="8dp"
                     android:paddingLeft="20dp"
-                    android:paddingRight="20dp"/>
+                    android:paddingRight="20dp"
+                    android:paddingTop="8dp"
+                    android:text="2017-2-28" />
             </LinearLayout>
 
 
@@ -72,160 +74,168 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="8dp"
-            android:background="@color/oa_bg"
             android:layout_marginTop="10dp"
-            />
+            android:background="@color/oa_bg" />
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
+
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/qinfenbang"
                 android:layout_marginLeft="10dp"
-                android:layout_marginTop="8dp"/>
+                android:layout_marginTop="8dp"
+                android:src="@drawable/qinfenbang" />
+
             <TextView
                 android:id="@+id/all_hardworking_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/sign_look_alldatas"
-                android:layout_marginTop="10dp"
-                android:drawableRight="@drawable/chakan"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="10dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/selector_me_menu_item_bg"
-                android:textColor="@color/blue"/>
+                android:drawableRight="@drawable/chakan"
+                android:text="@string/sign_look_alldatas"
+                android:textColor="@color/blue" />
         </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp">
+            android:paddingBottom="20dp"
+            android:paddingTop="20dp">
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="vertical"
                 android:gravity="center_horizontal"
-                >
-            <TextView
-                android:id="@+id/hardworking_first_tv"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:background="@drawable/garden_padding_bg"
-                android:gravity="center"
-                android:textSize="12sp"
-                />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/sign_the_first"
-                android:layout_marginTop="10dp"/>
-        </LinearLayout>
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/hardworking_first_tv"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:background="@drawable/garden_padding_bg"
+                    android:gravity="center"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/sign_the_first" />
+            </LinearLayout>
 
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="vertical"
-                android:gravity="center_horizontal">
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/hardworking_second_tv"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:background="@drawable/garden_padding_bg"
                     android:gravity="center"
-                    android:textSize="12sp"
-                    />
+                    android:textSize="12sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/sign_the_second"
-                    android:layout_marginTop="10dp"/>
+                    android:layout_marginTop="10dp"
+                    android:text="@string/sign_the_second" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:orientation="vertical"
-                android:gravity="center_horizontal">
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
                 <TextView
                     android:id="@+id/hardworking_third_tv"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:background="@drawable/garden_padding_bg"
                     android:gravity="center"
-                    android:textSize="12sp"
-                    />
+                    android:textSize="12sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/sign_the_third"
-                    android:layout_marginTop="10dp"/>
+                    android:layout_marginTop="10dp"
+                    android:text="@string/sign_the_third" />
             </LinearLayout>
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="8dp"
-            android:background="@color/oa_bg"
-            />
+            android:background="@color/oa_bg" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="8dp"
+            android:layout_marginLeft="10dp"
             android:paddingBottom="8dp"
-            android:layout_marginLeft="10dp">
+            android:paddingTop="8dp">
+
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="@string/name"/>
+                android:text="@string/name" />
+
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="@string/sign_late"/>
+                android:text="@string/sign_late" />
+
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="@string/sign_leave"/>
+                android:text="@string/sign_leave" />
+
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="@string/sign_Absenteeism"/>
+                android:text="@string/sign_Absenteeism" />
+
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
                 android:text="@string/sign_actualtime"
-                android:visibility="gone"/>
+                android:visibility="gone" />
+
             <ImageView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
 
         </LinearLayout>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/oa_bg"
-            />
+            android:background="@color/oa_bg" />
 
         <com.xzjmyk.pm.activity.view.MyListView
             android:id="@+id/attendances_mylv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp">
-        </com.xzjmyk.pm.activity.view.MyListView>
+            android:layout_marginLeft="10dp"></com.xzjmyk.pm.activity.view.MyListView>
     </LinearLayout>
 
 </ScrollView>

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

@@ -83,7 +83,7 @@
                 android:id="@+id/tv_oa_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/work_oa_sigin"
+                android:text="@string/work_statistics"
                 android:layout_below="@+id/tv_menu_oa"
                 android:layout_toLeftOf="@+id/iv_desc_oa"
                 android:layout_toStartOf="@+id/iv_desc_oa" />