合并代码

WeiChat/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
     android:versionCode="43"
-    android:versionName="4.3">
+    android:versionName="4.3" >
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -69,7 +69,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" >
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -80,7 +80,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -240,7 +240,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme">
+            android:theme="@style/ChooserTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -257,13 +257,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
+            android:permission="android.permission.MANAGE_DOCUMENTS" >
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +290,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +306,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +325,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1">
+            android:process=":bdservice_v1" >
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -339,7 +339,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver">
+        <receiver android:name=".ui.PushNetMessageReceiver" >
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -360,7 +360,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity">
+        <activity android:name=".ui.message.SelectCardActivity" >
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -384,7 +384,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -417,7 +417,16 @@
         <activity
             android:name=".ui.erp.activity.OAActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity
+            android:name=".ui.erp.activity.StatisticsActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name=".ui.erp.activity.TextErpActivity" >
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
 
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
     </application>
 
 </manifest>

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

@@ -18,22 +18,20 @@ import com.xzjmyk.pm.activity.ui.base.ActivityStack;
 
 /**
  * 进入到此界面的Activity只可能是4中用户状态 STATUS_USER_TOKEN_OVERDUE //本地Token过期 STATUS_USER_NO_UPDATE //数据不完整
- * 
- * 
  */
 public class UserCheckedActivity extends ActionBackActivity {
 
-	private TextView mTitleTv;
-	private TextView mDesTv;
-	private Button mLeftBtn;
-	private Button mRightBtn;
+    private TextView mTitleTv;
+    private TextView mDesTv;
+    private Button mLeftBtn;
+    private Button mRightBtn;
 
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_user_checked);
-		
-		// Api 11之后，点击外部会使得Activity结束，禁止外部点击结束
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_user_checked);
+        finish();
+        // Api 11之后，点击外部会使得Activity结束，禁止外部点击结束
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 			setFinishOnTouchOutside(false);
 		}
@@ -41,61 +39,61 @@ public class UserCheckedActivity extends ActionBackActivity {
 		initView();
 	}
 
-	private void initView() {
-		mTitleTv = (TextView) findViewById(R.id.title_tv);
-		mDesTv = (TextView) findViewById(R.id.des_tv);
-		mLeftBtn = (Button) findViewById(R.id.left_btn);
-		mRightBtn = (Button) findViewById(R.id.right_btn);
-		// init status
+    private void initView() {
+        mTitleTv = (TextView) findViewById(R.id.title_tv);
+        mDesTv = (TextView) findViewById(R.id.des_tv);
+        mLeftBtn = (Button) findViewById(R.id.left_btn);
+        mRightBtn = (Button) findViewById(R.id.right_btn);
+        // init status
 
-		// 能进入此Activity的只允许三种用户状态
-		int status = MyApplication.getInstance().mUserStatus;
-		if (status == LoginHelper.STATUS_USER_TOKEN_OVERDUE) {
-			mTitleTv.setText(R.string.overdue_title);
-			mDesTv.setText(R.string.token_overdue_des);
-		} else if (status == LoginHelper.STATUS_USER_NO_UPDATE) {
-			mTitleTv.setText(R.string.overdue_title);
-			mDesTv.setText(R.string.deficiency_data_des);
-		} else if (status == LoginHelper.STATUS_USER_TOKEN_CHANGE) {
-			//TODO 下线通知
-			mTitleTv.setText(R.string.logout_title);
-			mDesTv.setText(R.string.logout_des);
-		} else {// 其他的状态，一般不会出现，为了容错，加个判断
-			loginAgain();
-			return;
-			// throw new IllegalStateException("用户状态错误");
-		}
+        // 能进入此Activity的只允许三种用户状态
+        int status = MyApplication.getInstance().mUserStatus;
+        if (status == LoginHelper.STATUS_USER_TOKEN_OVERDUE) {
+            mTitleTv.setText(R.string.overdue_title);
+            mDesTv.setText(R.string.token_overdue_des);
+        } else if (status == LoginHelper.STATUS_USER_NO_UPDATE) {
+            mTitleTv.setText(R.string.overdue_title);
+            mDesTv.setText(R.string.deficiency_data_des);
+        } else if (status == LoginHelper.STATUS_USER_TOKEN_CHANGE) {
+            //TODO 下线通知
+            mTitleTv.setText(R.string.logout_title);
+            mDesTv.setText(R.string.logout_des);
+        } else {// 其他的状态，一般不会出现，为了容错，加个判断
+            loginAgain();
+            return;
+            // throw new IllegalStateException("用户状态错误");
+        }
 
-		mLeftBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				ActivityStack.getInstance().exit();
-			}
-		});
+        mLeftBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ActivityStack.getInstance().exit();
+            }
+        });
 
-		mRightBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				loginAgain();
-			}
-		});
-	}
+        mRightBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                loginAgain();
+            }
+        });
+    }
 
-	private void loginAgain() {
-		boolean idIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getUserId(""));
-		boolean telephoneIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getTelephone(null));
-		if (!idIsEmpty && !telephoneIsEmpty) {//
-			startActivity(new Intent(this, LoginActivity.class));
-		} else {
-			startActivity(new Intent(this, LoginActivity.class));
-		}
-		finish();
-		overridePendingTransition(0, 0);
-	}
+    private void loginAgain() {
+        boolean idIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getUserId(""));
+        boolean telephoneIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getTelephone(null));
+        if (!idIsEmpty && !telephoneIsEmpty) {//
+            startActivity(new Intent(this, LoginActivity.class));
+        } else {
+            startActivity(new Intent(this, LoginActivity.class));
+        }
+        finish();
+        overridePendingTransition(0, 0);
+    }
 
-	@Override
-	public void onBackPressed() {
-		loginAgain();
-	}
+    @Override
+    public void onBackPressed() {
+        loginAgain();
+    }
 
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -111,7 +111,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     protected void onDestroy() {
-        Log.i("gongpengning","关闭Login");
         super.onDestroy();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/calendar/views/DatePicker.java

@@ -67,7 +67,7 @@ public class DatePicker extends LinearLayout {
         // 标题栏根布局
         RelativeLayout rlTitle = new RelativeLayout(context);
         rlTitle.setBackgroundColor(mTManager.colorTitleBG());
-        int rlTitlePadding = MeasureUtil.dp2px(context, 10);
+        int rlTitlePadding = MeasureUtil.dp2px(context, 5);
         rlTitle.setPadding(rlTitlePadding, rlTitlePadding, rlTitlePadding, rlTitlePadding);
 
         // 周视图根布局

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

@@ -14,7 +14,7 @@ import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 
-public class OAActivity extends BaseActivity implements View.OnClickListener{
+public class OAActivity extends BaseActivity implements View.OnClickListener {
     private OAActivity activity = this;
     private MyListView listview;
     private Spinner state, show_type, type;
@@ -111,6 +111,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener{
                 startActivity(new Intent(activity, MeetingActivity.class));
                 break;
             case R.id.ll_worklog://工作日志
+
                 break;
             case R.id.ll_subject://审批
                 //TODO 审批先不做
@@ -148,6 +149,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener{
                 startActivity(it_scale);
                 break;
             case R.id.ll_attendance://考勤统计
+                startActivity(new Intent(activity, StatisticsActivity.class));
                 break;
         }
     }

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

@@ -175,7 +175,7 @@ public class ScheduleActivity extends BaseActivity {
                 }
                 List<AllProcess> taskProcess = new ArrayList<AllProcess>();
                 for (int i = 0; i < allProcesses.size(); i++) {
-                    if (!allProcesses.get(i).getTypecode().contains("task") && !allProcesses.get(i).getTypecode().contains("pagingrelease")) {
+                    if (!allProcesses.get(i).getTypecode().contains("task") && !allProcesses.get(i).getTypecode().contains("pagingrelease")&&!allProcesses.get(i).getTypecode().contains("dingyue")) {
                         taskProcess.add(allProcesses.get(i));
                     }
                     ;

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

@@ -0,0 +1,41 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.xzjmyk.pm.activity.R;
+
+public class StatisticsActivity extends AppCompatActivity {
+
+    private RelativeLayout oa_statistics_date;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_statistics);
+        initView();
+    }
+
+    private int rewX, rewY, X, Y;
+
+    private void initView() {
+        oa_statistics_date = (RelativeLayout) findViewById(R.id.oa_statistics_date);
+        rewX = oa_statistics_date.getWidth();
+        rewY = oa_statistics_date.getHeight();
+
+        oa_statistics_date.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (view.getId() == R.id.oa_statistics_date) {
+                    X = (int) motionEvent.getRawX();
+                    Y = (int) motionEvent.getRawY();
+                    oa_statistics_date.layout(X, Y, rewX + X, rewY + Y);
+                }
+                return false;
+            }
+        });
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.xzjmyk.pm.activity.ui.erp.activity;
+
+import android.os.Bundle;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+
+public class TextErpActivity extends BaseActivity implements View.OnClickListener {
+    TextErpActivity ct = this;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_text_erp);
+        findViewById(R.id.btn1).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.btn1:
+                String url = Constants.getAppBaseUrl(ct);
+                  url ="http://192.168.253.233:8080/ERP//";
+//                http://218.17.158.219:8090/ERP//+"mobile/login.action";
+//                UAS
+                ViewUtil.ct = ct;
+                ViewUtil.LoginERPTask(ct, url, "UAS", "15972129063", 1 + "");
+                break;
+
+        }
+    }
+}

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

@@ -20,7 +20,6 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 
 import org.apache.http.cookie.Cookie;
@@ -93,7 +92,7 @@ public class WebViewCommActivity extends BaseActivity {
                     }
                 } else {
                     if (isCookie) {
-                        synCookies(WebViewCommActivity.this, "http://www.ubtob.com/#");
+                        synCookies(WebViewCommActivity.this, url);
                         view.loadUrl(url);
                     } else {
                         view.loadUrl(url);
@@ -132,16 +131,16 @@ public class WebViewCommActivity extends BaseActivity {
      */
     public void synCookies(Context context, String url) {
         if (MyApplication.cookieERP == null) return;
+        Log.i("gongpengming", "没有retuen");
         CookieSyncManager.createInstance(context);
         CookieManager cookieManager = CookieManager.getInstance();
         cookieManager.setAcceptCookie(true);
         cookieManager.removeSessionCookie();//移除
         Cookie sessionCookie = MyApplication.cookieERP;
-        String sessionId = CommonUtil.getSharedPreferences(this, "sessionId");
         String cookieStr = sessionCookie.getName() + "="
                 + sessionCookie.getValue() + "; domain="
                 + sessionCookie.getDomain();
-        cookieManager.setCookie(url, "JSESSIONID=" + CommonUtil.getSharedPreferences(this, "sessionId"));//cookies是在HttpClient中获得的cookie
+        cookieManager.setCookie(url, cookieStr);//cookies是在HttpClient中获得的cookie
         CookieSyncManager.getInstance().sync();
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -94,6 +94,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
+//                ct.startActivity(new Intent(ct, ErpMenActivity.class));
                 ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -22,17 +22,17 @@ import android.widget.Toast;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.afollestad.materialdialogs.MaterialDialog.ButtonCallback;
 import com.alibaba.fastjson.JSON;
+import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.account.DataDownloadActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LoginEntity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.ui.account.DataDownloadActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -304,7 +304,7 @@ public class ViewUtil {
         mdProcessDialog = new MaterialDialog.Builder(ct).title("登录")
                 .content("登录验证中，请稍等...").progress(true, 0)
                 .progressIndeterminateStyle(false).build();
-        if (((BaseActivity)ViewUtil.ct).isFinishing()){
+        if (((BaseActivity) ViewUtil.ct).isFinishing()) {
             mdProcessDialog.show();
         }
         String url = Constants.BASE_URL_LOGIN;
@@ -361,7 +361,6 @@ public class ViewUtil {
                         ChangeStatusERP(msg.getData().getString("result"));
                     } else {
                         String reason = JSON.parseObject(result).getString("reason");
-
                         ToastMessage(ct, reason);
                     }
                     break;
@@ -372,7 +371,7 @@ public class ViewUtil {
                     if (mdProcessDialog != null && mdProcessDialog.isShowing()) {
                         mdProcessDialog.dismiss();
                     }
-                    ToastMessage(MyApplication.getInstance(),"服务器拒绝访问！");
+                    ToastMessage(MyApplication.getInstance(), "服务器拒绝访问！");
                     break;
                 default:
                     break;
@@ -382,7 +381,6 @@ public class ViewUtil {
     };
 
     public static void ChangeStatusERP(String result) {
-        System.out.println("login erp:" + result);
         if (mdProcessDialog != null) {
             mdProcessDialog.setContent("UAS验证成功！");
         }
@@ -421,7 +419,7 @@ public class ViewUtil {
             }
         }, 800);
         if (ct instanceof Activity) {
-            if (((Activity) ct) instanceof MainActivity) {
+            if (ct instanceof MainActivity) {
             } else {
                 ct.startActivity(new Intent(ct, DataDownloadActivity.class));
             }
@@ -444,7 +442,7 @@ public class ViewUtil {
                 mdProcessDialog.cancel();
             }
         }, 1000);
-        if (!hasErp){
+        if (!hasErp) {
             if (ct instanceof Activity) {
                 if (((Activity) ct) instanceof MainActivity) {
                 } else {
@@ -524,7 +522,7 @@ public class ViewUtil {
                     erpEntities.add(map);//ERP账户累加到数组
                 } else if (map.getPlatform().equals("B2B")) {
                     b2b_uu = map.getAccount();
-                    erp_phone=phone;
+                    erp_phone = phone;
                 }
 
             }
@@ -542,10 +540,10 @@ public class ViewUtil {
             } else if (erpEntities.size() > 1) {
                 loginERPItemDialog(phone, password);
             }
-            if (erpEntities.size()>0) {
-               hasErp=true;
-            }else{
-               hasErp=false;
+            if (erpEntities.size() > 0) {
+                hasErp = true;
+            } else {
+                hasErp = false;
             }
             LoginB2BTask(phone, password);//登录B2B
         } else {
@@ -557,9 +555,12 @@ public class ViewUtil {
                 }
             }, 2000);
         }
-    };
+    }
+
+    ;
+
+    private static boolean hasErp = true;//是否有erp
 
-    private  static boolean hasErp=true;//是否有erp
     /**
      * @author LiuJie
      * @功能:比较两个日期大小
@@ -634,7 +635,7 @@ public class ViewUtil {
             public void run() {
                 boolean isNetHas = CommonUtil.isNetWorkConnected(ct);
                 if (isNetHas) {
-                    Log.i("result", "url="+url);
+                    Log.i("result", "url=" + url);
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     if (result != null) {
                         Log.i("result", "http 请求-----------------------------------------");
@@ -763,16 +764,17 @@ public class ViewUtil {
     public static void AutoLoginErp(Context ct) {
         Log.i("LoginErp", "自动登录...");
         if (!StringUtils.isEmpty(Constants.getAppBaseUrl(ct))) {
-            ViewUtil.ct=ct;
+            ViewUtil.ct = ct;
             String url = Constants.getAppBaseUrl(ct);
             String master = CommonUtil.getSharedPreferences(ct, "erp_master");
+
             String phone = CommonUtil.getSharedPreferences(ct, "user_phone");
             String password = CommonUtil.getSharedPreferences(ct, "user_password");
             Log.i("LoginErp", "自动登录..." + url);
             Log.i("LoginErp", "master..." + master);
             Log.i("LoginErp", "phone..." + phone);
             Log.i("LoginErp", "password..." + password);
-            LoginERPTask(ct,url, master, phone, password);
+            LoginERPTask(ct, url, master, phone, password);
         }
 
     }
@@ -791,10 +793,10 @@ public class ViewUtil {
     /**
      * @注释：跳转嵌入网页页面
      * @param: url 经过登录验证之后的URL路径跳转
-     *         text 客户端嵌入网页页面动态显示文字
+     * text 客户端嵌入网页页面动态显示文字
      */
-    public static void  WebLinks(Context ct,String  url,String text){
-        Intent intent_web =new Intent(ct, WebViewCommActivity.class);
+    public static void WebLinks(Context ct, String url, String text) {
+        Intent intent_web = new Intent(ct, WebViewCommActivity.class);
         intent_web.putExtra("url", url);
         intent_web.putExtra("p", text);
         ct.startActivity(intent_web);
@@ -803,16 +805,17 @@ public class ViewUtil {
     /**
      * @注释：跳转嵌入网页页面
      * @param: url 经过登录验证之后的URL路径跳转
-     *         text 客户端嵌入网页页面动态显示文字
+     * text 客户端嵌入网页页面动态显示文字
      */
-    public static void  WebLinks(Context ct,String  url,String text,boolean isCookie){
-        Intent intent_web =new Intent(ct, WebViewCommActivity.class);
+    public static void WebLinks(Context ct, String url, String text, boolean isCookie) {
+        Intent intent_web = new Intent(ct, WebViewCommActivity.class);
         intent_web.putExtra("url", url);
         intent_web.putExtra("p", text);
-        intent_web.putExtra("cookie",isCookie);
+        intent_web.putExtra("cookie", isCookie);
         ct.startActivity(intent_web);
     }
-    public static void clearAccount(Context ct){
+
+    public static void clearAccount(Context ct) {
         CommonUtil.clearSharedPreferences(ct, "erp_baseurl");
         CommonUtil.clearSharedPreferences(ct, "erp_master");
         CommonUtil.clearSharedPreferences(ct, "erp_commpany");

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

@@ -28,7 +28,6 @@ public class Constants {
     public final static int SUCCESS_B2B=4;//B2B登录成功
     public final static int SUCCESS_ERP=5;//ERP登录成功
     public final static int SUCCESS_INITDATA =7;
-    public final static int SUCCESS_SUBCRIPTION = 0x8;
     public final static int APP_SOCKETIMEOUTEXCEPTION=99;//网络请求超时，错误，404响应
 
 

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

@@ -10,6 +10,7 @@ import android.os.Message;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -66,10 +67,6 @@ import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -317,7 +314,6 @@ public class MessageFragment extends EasyFragment {
         loadGongGaoCount(mActivity);
         loadNoticeCount(mActivity);
         loadERPNewsNum(mActivity);
-        loadSubscriptionNum(mActivity);
     }
 
 
@@ -656,16 +652,6 @@ public class MessageFragment extends EasyFragment {
         ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.SUCCESS_INITDATA, null, null, "get");
     }
 
-    private void loadSubscriptionNum(Context ct) {
-        String url = Constants.getAppBaseUrl(ct) + "common/desktop/subs/getSubs.action";
-        final Map<String, Object> param = new HashMap<>();
-        param.put("count", 100);
-        param.put("condition", "where 1=1");
-        param.put("sessionId", CommonUtil.getSharedPreferences(ct, "sessionId"));
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
-        ViewUtil.httpSendRequest(ct, url, param, handler, headers, Constants.SUCCESS_SUBCRIPTION, null, null, "get");
-    }
 
 
     private final int load_success_erpMsgNum = 5;
@@ -676,7 +662,7 @@ public class MessageFragment extends EasyFragment {
                 case Constants.SUCCESS_LOGIN://公告
                     updateGongGao(msg);
                     break;
-                case load_success_erpMsgNum://待办
+                case load_success_erpMsgNum://待办(任务、代办、订阅)
                     getErpMsgNums(msg);
                     break;
                 case Constants.LOAD_SUCCESS://通知
@@ -685,9 +671,6 @@ public class MessageFragment extends EasyFragment {
                 case Constants.SUCCESS_INITDATA://新闻
                     updateNews(msg);
                     break;
-                case Constants.SUCCESS_SUBCRIPTION:
-                    updateSubScription(msg);
-                    break;
                 //以下为更新页面
                 case GONGGAO_MSG:
                     setNOTICE_count(GONGGAO_count + NOTICE_count + NES_count);
@@ -879,7 +862,7 @@ public class MessageFragment extends EasyFragment {
                     if (allProcesses.get(i).getTypecode().contains("task")) {
                         task_num++;
                     } else if (allProcesses.get(i).getTypecode()
-                            .contains("pagingrelease")) {
+                            .contains("dingyue")) {
                         pagin_num++;
                     } else {
                         daiban_num++;
@@ -889,35 +872,11 @@ public class MessageFragment extends EasyFragment {
                 handler.sendEmptyMessage(TASK_MSG);
                 DAIBAN_count = daiban_num;
                 handler.sendEmptyMessage(DAIBAN_MSG);
-
+                SUBRICE_count = pagin_num;
+                handler.sendEmptyMessage(SUBRICE_MSG);
             }
         }
     }
-
-    private void updateSubScription(Message msg) {
-        final String message = (String) msg.getData().get("result");
-        ThreadPool.getThreadPool().addTask(new Runnable() {
-            @Override
-            public void run() {
-                JSONObject object = null;
-                try {
-                    object = new JSONObject(message);
-                    JSONArray array = object.getJSONArray("data");
-                    SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
-                    if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) return;
-                    int count = 0;
-                    for (int i = 0; i < SubscriptionMessages.size(); i++) {
-                        if (SubscriptionMessages.get(i).getSTATUS_() == 0)
-                            count++;
-                    }
-                    SUBRICE_count = count;
-                    handler.sendEmptyMessage(SUBRICE_MSG);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
 }
 
 

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

@@ -51,6 +51,7 @@ public class SubscriptionActivity extends BaseActivity {
     private int date = -1;
     private final long daylong = 24 * 60 * 60 * 1000;//一天的毫秒数
     private long newlong;  //当前指定位置的毫秒数
+    private boolean isRef = false;
     private int[] srcs = {
             R.drawable.list_01, R.drawable.list_02, R.drawable.list_03
     };
@@ -66,37 +67,36 @@ public class SubscriptionActivity extends BaseActivity {
                     JSONObject object = new JSONObject(message);
                     JSONArray array = object.getJSONArray("data");
                     SubscriptionMessages = (ArrayList<SubscriptionMessage>) JSON.parseArray(array.toString(), SubscriptionMessage.class);
-                    Log.i("gongpengming", "级拿来");
                     setData();
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
             } else if (Constants.APP_SOCKETIMEOUTEXCEPTION == msg.what) {
                 //错误信息
+                if (listView != null)
+                    listView.onRefreshComplete();
             }
         }
     };
-    private String code;
     String mLoginUserId;
 
     @Override//设置右划退出
     public void setTouch(boolean b) {
         super.setTouch(false);
     }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscription);
+        getSupportActionBar().setTitle("订阅号");
         mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         baseUrl = CommonUtil.getSharedPreferences(this, "erp_baseurl");
-        code = CommonUtil.getSharedPreferences(this, "erp_username");
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
         listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
             public void onPullDownToRefresh(PullToRefreshBase<ListView> refreshView) {
-                cancelData();
+                isRef = true;
                 init();
             }
 
@@ -105,6 +105,7 @@ public class SubscriptionActivity extends BaseActivity {
                 //TODo 加载前一天的数据
                 newlong -= daylong;
                 date = TimeUtils.int_long_2_str(newlong);
+                isRef = false;
                 initData(date);
             }
         });
@@ -119,25 +120,34 @@ public class SubscriptionActivity extends BaseActivity {
 
     private void cancelData() {
         if (sortSubsrciprions != null) {
-            SubscriptionMessages.clear();
-        }
-        if (SubscriptionMessages != null) {
-            SubscriptionMessages.clear();
+            sortSubsrciprions.clear();
         }
+//        if (SubscriptionMessages != null) {
+//            SubscriptionMessages.clear();
+//        }
         if (adapter != null)
             adapter.notifyDataSetChanged();
     }
 
+    int pager = 0;
+
     private void setData() {
         if (SubscriptionMessages == null || SubscriptionMessages.size() <= 0) {
             ToastMessage("没有更多内容");
             listView.onRefreshComplete();
+            View emptyView = LayoutInflater.from(mContext).inflate(R.layout.layout_list_empty_view, null);
+            listView.setEmptyView(emptyView);
             return;
         }
-//        clearDataToDB(date);
-//        saveDataToDB(SubscriptionMessages);
+        if (isRef) cancelData();
         if (sortSubsrciprions == null)
             sortSubsrciprions = new ArrayList<>();
+
+        ArrayList<SortSubsrciprion> chche = new ArrayList<>();
+
+//        clearDataToDB(date);
+//        saveDataToDB(SubscriptionMessages);
+
         SortSubsrciprion sortSubsrciprion = null;
         for (int i = 0; i < SubscriptionMessages.size(); i++) {
             sortSubsrciprion = new SortSubsrciprion();
@@ -145,25 +155,29 @@ public class SubscriptionActivity extends BaseActivity {
             sortSubsrciprion.tiem = Long.parseLong(SubscriptionMessages.get(i).getCREATEDATE_());
             sortSubsrciprion.beans = new ArrayList<>();
             sortSubsrciprion.beans.add(SubscriptionMessages.get(i));
-            if (sortSubsrciprions.size() > 0) {
-                for (int j = 0; j < sortSubsrciprions.size(); j++) {
-                    if (sortSubsrciprion.num_id == sortSubsrciprions.get(j).num_id) {//如果相同
-                        sortSubsrciprions.get(j).beans.add(SubscriptionMessages.get(i));
+            if (chche.size() > 0) {
+                for (int j = 0; j < chche.size(); j++) {
+                    if (sortSubsrciprion.num_id == chche.get(j).num_id) {//如果相同
+                        chche.get(j).beans.add(SubscriptionMessages.get(i));
                         break;
-                    } else if (j == (sortSubsrciprions.size() - 1)) {//如果到最后一个都不相同
-                        sortSubsrciprions.add(sortSubsrciprion);
+                    } else if (j == (chche.size() - 1)) {//如果到最后一个都不相同
+                        chche.add(sortSubsrciprion);
                         break;
                     }
                 }
             } else {
-                sortSubsrciprions.add(sortSubsrciprion);
+                chche.add(sortSubsrciprion);
             }
         }
+        sortSubsrciprions.addAll(chche);
+
         if (adapter == null) {
             adapter = new SubscriptionAdapter();
             listView.setAdapter(adapter);
-        } else
+        } else {
+            Log.i("gongpenging", "sortSubsrciprions=" + sortSubsrciprions.size());
             adapter.notifyDataSetChanged();
+        }
         listView.onRefreshComplete();
     }
 
@@ -349,13 +363,10 @@ public class SubscriptionActivity extends BaseActivity {
                 @Override
                 public void onClick(View view) {
                     SubscriptionMessage bean = sortSubsrciprions.get(position).beans.get(i);
-//                    218.17.158.219:8090/ERP
-                    String url = "http://192.168.253.233:8080/ERP//jsps/mobile/charts.jsp?" + "numId=" + bean.getNUM_ID_() +
+//                    218.17.158.219:8090/ERP    http://192.168.253.233:8080
+                    String url = baseUrl + "common/charts/mobileCharts.action?" + "numId=" + bean.getNUM_ID_() +
                             "&mainId=" + bean.getINSTANCE_ID_() + "&insId=" + bean.getID_() +
-                            "&title=" + bean.getSON_TITLE_() + "&SESSIONID=" + CommonUtil.getSharedPreferences(SubscriptionActivity.this, "sessionId")
-                            + "&emCode=" + code;
-
-                    Log.i("gongpengming", url);
+                            "&title=" + bean.getSON_TITLE_();
                     ViewUtil.WebLinks(activity, url, "订阅", true);
                 }
             });

WeiChat/src/main/res/drawable/oa_mystatistics.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/btn_login_nomarl" />
+            <corners android:radius="360dp" />
+            <size android:width="50dp" android:height="50dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/drawable/oa_statistics_date.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/btn_login_nomarl" />
+            <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/drawable/oa_statistics_rl.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/drawable/oa_statistics_tag.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+            <corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

WeiChat/src/main/res/drawable/shape_progressbar_bg.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!--<!– 边框填充的颜色 –>-->
+    <solid android:color="#cecece" />
+    <!--<!– 设置进度条的四个角为弧形 –>-->
+    <!--<!– android:radius 弧形的半径 –>-->
+    <corners android:radius="90dp" />
+    <!--<!–    padding：边界的间隔–>-->
+    <padding
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp" />
+</shape>

WeiChat/src/main/res/drawable/shape_progressbar_mini.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<!--<!– 背景 –>-->
+<item android:id="@android:id/background">
+<shape>
+<corners android:radius="5dip" />
+<gradient
+    android:angle="270"
+android:centerY="0.75"
+android:endColor="#FFFFFF"
+android:startColor="#FFFFFF" />
+</shape>
+    </item>
+<item android:id="@android:id/secondaryProgress">
+<clip>
+<shape>
+    <corners android:radius="0dip" />
+    <gradient
+        android:angle="270"
+    android:centerY="0.75"
+    android:endColor="#df0024"
+    android:startColor="#df0024" />
+</shape>
+</clip>
+    </item>
+<item android:id="@android:id/progress">
+<clip>
+<shape>
+    <corners android:radius="5dip" />
+    <gradient
+        android:angle="270"
+    android:centerY="0.75"
+    android:endColor="#00BFFF"
+    android:startColor="#00BFFF" />
+</shape>
+</clip>
+    </item>
+    </layer-list>

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

@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.StatisticsActivity">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/text_black">
+
+        <TextView
+            android:id="@+id/oa_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:clickable="true"
+            android:drawableLeft="@drawable/back"
+            android:text="返回"
+            android:textColor="@color/white"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/oa_date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:clickable="true"
+            android:text="考勤统计"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+    </RelativeLayout>
+
+    <Spinner
+        android:id="@+id/oa_statistics_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_below="@id/top"
+        android:layout_toLeftOf="@+id/oa_statistics_rl"
+        android:padding="5dp" />
+
+    <RelativeLayout
+        android:id="@+id/oa_statistics_rl"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_below="@+id/top"
+        android:layout_centerHorizontal="true">
+
+        <ImageView
+            android:id="@+id/oa_statistics_back"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:layout_toLeftOf="@+id/oa_statistics_tv"
+            android:clickable="true"
+            android:src="@drawable/mobile_back" />
+
+        <TextView
+            android:id="@+id/oa_statistics_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerHorizontal="true"
+            android:gravity="center"
+            android:text="星期一 2016-6-13" />
+
+        <ImageView
+            android:id="@+id/oa_statistics_next"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/oa_statistics_tv"
+            android:clickable="true"
+            android:src="@drawable/next" />
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/oa_statistics_top_line"
+        android:layout_width="match_parent"
+        android:layout_height="2px"
+        android:layout_below="@+id/oa_statistics_rl"
+        android:background="@color/item_line" />
+
+    <RelativeLayout
+        android:id="@+id/oa_statistics"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/oa_statistics_top_line"
+        android:layout_margin="10dp"
+        android:background="@color/item_color2">
+
+        <LinearLayout
+            android:id="@+id/name1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="正常打卡" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="请假" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="出差" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="外出" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="休息" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="未排班" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/progress1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/name1"
+            android:minWidth="80dp"
+            android:orientation="vertical">
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/num1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/progress1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/name2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/progress2"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="还未打卡" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="外勤打卡" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="迟到" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="早退" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="却卡" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="旷工" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/progress2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/num2"
+            android:minWidth="80dp"
+            android:orientation="vertical">
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <ProgressBar
+                style="@style/StyleProgressBarMini"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/shape_progressbar_bg"
+                android:max="7"
+                android:minWidth="80dp"
+                android:progress="4" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/num2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="@dimen/oa_statistics_line" />
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/oa_statistics"
+        android:background="@color/item_color1"
+        android:padding="10dp">
+
+        <RelativeLayout
+            android:id="@+id/oa_statistics_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/oa_statistics_date"
+                android:gravity="center"
+                android:minHeight="@dimen/oa_statistics_date_minheight"
+                android:minWidth="@dimen/oa_statistics_date_minWidth"
+                android:text="日期" />
+
+            <TextView
+                android:id="@+id/oa_statistics_yeas"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/tv_date"
+                android:background="@color/white"
+                android:gravity="center"
+                android:minHeight="@dimen/oa_statistics_date_minheight"
+                android:minWidth="@dimen/oa_statistics_date_minWidth"
+                android:text="2016年" />
+
+            <TextView
+                android:id="@+id/oa_statistics_mothes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/oa_statistics_yeas"
+                android:background="@color/white"
+                android:gravity="center"
+                android:minHeight="@dimen/oa_statistics_date_minheight"
+                android:minWidth="@dimen/oa_statistics_date_minWidth"
+                android:text="6月>" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@id/oa_statistics_date"
+            android:background="@drawable/oa_statistics_rl"
+            android:minHeight="@dimen/oa_statistics_date_minheight">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:background="@drawable/oa_mystatistics"
+                android:gravity="center"
+                android:text="我的考勤" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginTop="10dp"
+                android:layout_toRightOf="@id/name"
+                android:gravity="center"
+                android:text="正常考勤" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:text="0天" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@id/rl"
+            android:layout_below="@id/rl"
+            android:layout_marginTop="3px"
+            android:background="@drawable/oa_statistics_tag"
+            android:minHeight="60dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingTop="10dp"
+                android:text="迟到\n0次" />
+
+            <View
+                android:layout_width="2px"
+                android:layout_height="60dp"
+                android:background="@color/item_color1" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="早退\n0次" />
+
+            <View
+                android:layout_width="2px"
+                android:layout_height="60dp"
+                android:background="@color/item_color1" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="缺卡\n0次" />
+        </LinearLayout>
+    </RelativeLayout>
+</RelativeLayout>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.TextErpActivity">
+
+    <Button
+        android:id="@+id/btn1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="点击1" />
+</RelativeLayout>

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

@@ -1,4 +1,11 @@
 <resources>
+    <!-- oa 考勤统计页面-->
+    <dimen name="oa_statistics_line">15dp</dimen>
+    <dimen name="oa_statistics_date_minWidth">100dp</dimen>
+    <dimen name="oa_statistics_date_minheight">30dp</dimen>
+    <!-- end oa 考勤统计页面-->
+
+
     <dimen name="next_width">10.0dip</dimen>
     <dimen name="line">1px</dimen>
     <dimen name="line_big">7.0dip</dimen>

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

@@ -5,10 +5,27 @@
     <!--listView 中对于 contentView的settag方法参数定义 -->
     <item name="position" type="id"></item>
 
-
+    <!--共有对象-->
     <style name="oa_btn_style">
         <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">40dp</item>
         <item name="android:clickable">false</item>
     </style>
+
+    <!-- 进度条-->
+    <style name="StyleProgressBarMini" parent="@android:style/Widget.ProgressBar.Horizontal">
+        <item name="android:maxHeight">50dip</item>
+        <item name="android:minHeight">14dip</item>
+
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:indeterminateDrawable">
+            @android:drawable/progress_indeterminate_horizontal
+        </item>
+        <item name="android:progressDrawable">@drawable/shape_progressbar_mini</item>
+    </style>
+
+    <!-- 考勤统计通通用属性-->
+    <style name="statistics_style">
+        <item name="android:layout_height">20dp</item>
+    </style>
 </resources>