打包测试发布版本

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="80"
-    android:versionName="5.6.7">
+    android:versionCode="81"
+    android:versionName="5.6.8">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -861,13 +861,14 @@
         <activity
             android:name=".ui.erp.activity.oa.SignStatisticalActivity"
             android:label="考勤统计" />
-        <activity android:name=".ui.erp.activity.oa.SearchLocationActivity"
+        <activity
+            android:name=".ui.erp.activity.oa.SearchLocationActivity"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity
             android:name=".ui.erp.activity.oa.SelectDepartmentActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing"
-            android:label="选择部门" />
+            android:label="选择部门"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity
             android:name=".ui.me.TimeStatisticsActivity"
             android:label="时间统计" />
@@ -876,9 +877,10 @@
             android:configChanges="keyboardHidden|orientation"
             android:label="选择参与人员"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
-        <activity android:name=".ui.erp.activity.oa.TeamsAttShowActivity"
-            android:label="团队勤奋榜"/>
-        <activity android:name=".ui.erp.activity.oa.WaittingWorksActivity"/>
+        <activity
+            android:name=".ui.erp.activity.oa.TeamsAttShowActivity"
+            android:label="团队勤奋榜" />
+        <activity android:name=".ui.erp.activity.oa.WaittingWorksActivity" />
     </application>
 
 </manifest>

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

@@ -12,7 +12,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.afollestad.materialdialogs.MaterialDialog;
 import com.alibaba.fastjson.JSON;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -68,8 +67,9 @@ public class CustomCrashActivity extends Activity {
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this,intent);
         if (stackTraceString != null){
             //Toast.makeText(this, stackTraceString, Toast.LENGTH_LONG).show();
-            new MaterialDialog.Builder(this).content(stackTraceString)
-                    .build().show();
+            //TODO 发布版本隐藏
+//            new MaterialDialog.Builder(this).content(stackTraceString)
+//                    .build().show();
             try {
                 getCode();
             } catch (Exception e) {

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

@@ -47,10 +47,9 @@ public class FlightsAdapter extends RecyclerView.Adapter<FlightsAdapter.FlightVi
             final FlightsModel model = models.get(position);
             setType(holder, model.getType());//设置隐藏和显示
             holder.rule_name_tv.setText(StringUtils.getNull(model.getName()));
-            holder.mumber_tv.setText(getNumber(model.getCount()));
+            holder.mumber_tv.setText(getNumber(model.getCount(), model.getDepartments()));
             if (model.getTimeModel() != null) {
-
-                String week =model.getWeek()+" "+model.getTime();
+                String week = model.getWeek() + " " + model.getTime();
                 holder.week_tv.setText(week);
             }
             holder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -89,8 +88,10 @@ public class FlightsAdapter extends RecyclerView.Adapter<FlightsAdapter.FlightVi
         }
     }
 
-    private String getNumber(int number) {
-        return number + "人";
+    private String getNumber(int count, int departments) {
+        if (departments == 0 && count == 0)
+            return "0人";
+        return (departments == 0 ? "" : (departments + "个部门 ")) + (count == 0 ? "" : (count + "个人"));
     }
 
 

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

@@ -263,7 +263,7 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.ViewHoler> {
         if (AutoMemoryUtil.nonclass == 0)
             AutoMemoryUtil.nonclass = 90;
         String time = getForAddMin(hhmm, iswork ? AutoMemoryUtil.nonclass : -AutoMemoryUtil.nonclass);
-        if (time.compareTo(hhmm) < 0)//跨天
+        if (iswork && time.compareTo(hhmm) < 0)//上跨天
             return "23:59";
         else
             return time;

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

@@ -471,37 +471,44 @@ public class DBManager {
      * @author Administrator
      * @功能:获取某员工的信息
      */
-    public List<EmployeesEntity> select_getEmployee(String[] selectionArgs, String selection) {
+    public synchronized List<EmployeesEntity> select_getEmployee(String[] selectionArgs, String selection) {
         List<EmployeesEntity> entity = new ArrayList<EmployeesEntity>();
         String table = "employees";
         String groupBy = null;
         String having = null;
         String orderBy = null;
-        if (!db.isOpen())
-            db = helper.getWritableDatabase();
-        Cursor cursor = db.query(table, null, selection, selectionArgs, groupBy, having, orderBy);
-        while (cursor.moveToNext()) {
-            EmployeesEntity model = new EmployeesEntity();
-            model.setEM_CODE(cursor.getString(cursor.getColumnIndex("em_code")));
-            model.setEm_defaultorid(cursor.getInt(cursor.getColumnIndex("em_defaultorid")));
-            model.setEM_DEFAULTORNAME(cursor.getString(cursor.getColumnIndex("em_defaultorname")));
-            model.setEM_DEPART(cursor.getString(cursor.getColumnIndex("em_depart")));
-            model.setFLAG(cursor.getString(cursor.getColumnIndex("em_flag")));
-            model.setEM_ID(cursor.getInt(cursor.getColumnIndex("em_id")));
-            model.setEM_MOBILE(cursor.getString(cursor.getColumnIndex("em_mobile")));
-            model.setEM_EMAIL(cursor.getString(cursor.getColumnIndex("em_email")));
-            model.setEM_NAME(cursor.getString(cursor.getColumnIndex("em_name")));
-            model.setEM_POSITION(cursor.getString(cursor.getColumnIndex("em_position")));
-            model.setEM_UU(cursor.getString(cursor.getColumnIndex("em_uu")));
-            model.setWHICHSYS(cursor.getString(cursor.getColumnIndex("whichsys")));
-            model.setEm_IMID(Integer.valueOf(cursor.getString(
-                    cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
-                    cursor.getColumnIndex("em_imid"))
-            ));
-            entity.add(model);
+        Cursor cursor = null;
+        try {
+            if (!db.isOpen())
+                db = helper.getWritableDatabase();
+            cursor = db.query(table, null, selection, selectionArgs, groupBy, having, orderBy);
+            while (cursor.moveToNext()) {
+                EmployeesEntity model = new EmployeesEntity();
+                model.setEM_CODE(cursor.getString(cursor.getColumnIndex("em_code")));
+                model.setEm_defaultorid(cursor.getInt(cursor.getColumnIndex("em_defaultorid")));
+                model.setEM_DEFAULTORNAME(cursor.getString(cursor.getColumnIndex("em_defaultorname")));
+                model.setEM_DEPART(cursor.getString(cursor.getColumnIndex("em_depart")));
+                model.setFLAG(cursor.getString(cursor.getColumnIndex("em_flag")));
+                model.setEM_ID(cursor.getInt(cursor.getColumnIndex("em_id")));
+                model.setEM_MOBILE(cursor.getString(cursor.getColumnIndex("em_mobile")));
+                model.setEM_EMAIL(cursor.getString(cursor.getColumnIndex("em_email")));
+                model.setEM_NAME(cursor.getString(cursor.getColumnIndex("em_name")));
+                model.setEM_POSITION(cursor.getString(cursor.getColumnIndex("em_position")));
+                model.setEM_UU(cursor.getString(cursor.getColumnIndex("em_uu")));
+                model.setWHICHSYS(cursor.getString(cursor.getColumnIndex("whichsys")));
+                model.setEm_IMID(Integer.valueOf(cursor.getString(
+                        cursor.getColumnIndex("em_imid")) == null ? "0" : cursor.getString(
+                        cursor.getColumnIndex("em_imid"))
+                ));
+                entity.add(model);
+            }
+        } catch (Exception e) {
+
+        } finally {
+            if (cursor != null)
+                cursor.close();
+            return entity;
         }
-        cursor.close();
-        return entity;
     }
 
     /**

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

@@ -21,7 +21,8 @@ public class EmployeesEntity implements Parcelable {
     private int Em_IMID;
     private boolean isClick;//by gongpengming 偷懒 不想开新类  所以在原类中添加属性，如果出现错误，即使联系修改
 
-    public EmployeesEntity(){}
+    public EmployeesEntity() {
+    }
 
     protected EmployeesEntity(Parcel in) {
         EM_ID = in.readInt();

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

@@ -414,7 +414,12 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         ThreadPool.getThreadPool().addTask(new Runnable() {
             @Override
             public void run() {
-                List<BaseSortModel<Friend>> chche = getFriendsByErpDB();//通过数据库获取数据
+                List<BaseSortModel<Friend>> chche = null;//通过数据库获取数据
+                try {
+                    chche = getFriendsByErpDB();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 if (ListUtils.isEmpty(chche))
                     //TODO 通过网络获取数据
                     handler.post(new Runnable() {
@@ -474,7 +479,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
      *
      * @return 查询到数据列表
      */
-    private List<BaseSortModel<Friend>> getFriendsByErpDB() {
+    private List<BaseSortModel<Friend>> getFriendsByErpDB() throws Exception {
         if (manager == null)
             manager = new DBManager(MyApplication.getInstance());
         String master = CommonUtil.getSharedPreferences(ct, "erp_master");

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

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.util.Log;
 
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -20,6 +19,7 @@ public class FlightsModel implements Parcelable {
     private int type;         //类型  1、正常班次（可有排版 可删除）  2.默认班次 （有排版  无删除） 3.自由排班
     private String name;     //规则名称
     private int count;         //成员个数
+    private int departments;         //成员个数
     private String day;    //日期   星期一，星期二
 
     private FlightsTimeModel timeModel;  //时间，包含最早上班 和总时间 和上班日期
@@ -36,6 +36,7 @@ public class FlightsModel implements Parcelable {
         type = in.readInt();
         name = in.readString();
         count = in.readInt();
+        departments = in.readInt();
         day = in.readString();
         timeModel = in.readParcelable(FlightsTimeModel.class.getClassLoader());
         employeesModel = in.readParcelable(EmployeesModel.class.getClassLoader());
@@ -49,6 +50,7 @@ public class FlightsModel implements Parcelable {
         dest.writeInt(type);
         dest.writeString(name);
         dest.writeInt(count);
+        dest.writeInt(departments);
         dest.writeString(day);
         dest.writeParcelable(timeModel, flags);
         dest.writeParcelable(employeesModel, flags);
@@ -72,6 +74,14 @@ public class FlightsModel implements Parcelable {
         }
     };
 
+    public int getDepartments() {
+        return departments;
+    }
+
+    public void setDepartments(int departments) {
+        this.departments = departments;
+    }
+
     public int getId() {
         return id;
     }

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

@@ -14,6 +14,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IFlightsView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.auto.HttpHandler;
 
 import java.util.ArrayList;
@@ -146,7 +147,7 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         hrorgsModel.setEmployeecode(OACheckUtil.getJson2Text(object, "wd_defaultorcode"));
         hrorgsModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "wd_defaultor"));
         model.setId(OACheckUtil.getJsonIntager(object, "id"));
-        model.setCount(OACheckUtil.getJsonIntager(object, "wd_pcount"));
+//        model.setCount(OACheckUtil.getJsonIntager(object, "wd_pcount"));
         model.setCode(OACheckUtil.getJson2Text(object, "wd_code"));
         model.setTimeModel(timeModel);
         model.setDay(OACheckUtil.getJson2Text(object, "wd_day"));//返回为1，2，3
@@ -154,6 +155,18 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         model.setHrorgsModel(hrorgsModel);
         model.setType(1);
         model.setName(OACheckUtil.getJson2Text(object, "wd_name"));
+        try {
+            String names = employeesModel.getEmployeeNames();
+            if (!StringUtils.isEmpty(names)) {
+                model.setCount(names.split(",").length);
+            }
+            String hrorgs = hrorgsModel.getEmployeeNames();
+            if (!StringUtils.isEmpty(hrorgs)) {
+                model.setDepartments(hrorgs.split(",").length);
+            }
+        } catch (Exception e) {
+
+        }
         return model;
     }
 
@@ -199,9 +212,7 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         employeesModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "defaultman"));
         hrorgsModel.setEmployeecode(OACheckUtil.getJson2Text(object, "hrorgcode"));
         hrorgsModel.setEmployeeNames(OACheckUtil.getJson2Text(object, "hrorgname"));
-
         model.setId(OACheckUtil.getJsonIntager(object, "wd_id"));
-        model.setCount(OACheckUtil.getJsonIntager(object, "wd_pcount"));
         model.setCode(OACheckUtil.getJson2Text(object, "wd_code"));
         model.setTimeModel(timeModel);
         model.setDay(OACheckUtil.getJson2Text(object, "wd_day"));//返回为1，2，3
@@ -209,6 +220,19 @@ public class FlightsPresernter implements HttpHandler.OnResultListener {
         model.setHrorgsModel(hrorgsModel);
         model.setType(2);
         model.setName(OACheckUtil.getJson2Text(object, "wd_name"));
+
+        try {
+            String names = employeesModel.getEmployeeNames();
+            if (!StringUtils.isEmpty(names)) {
+                model.setCount(names.split(",").length);
+            }
+            String hrorgs = hrorgsModel.getEmployeeNames();
+            if (!StringUtils.isEmpty(hrorgs)) {
+                model.setDepartments(hrorgs.split(",").length);
+            }
+        } catch (Exception e) {
+
+        }
         return model;
     }
 

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

@@ -16,12 +16,12 @@
         android:textSize="@dimen/text_main" />
 
     <ImageView
-        android:padding="10dp"
         android:id="@+id/delete_rule_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignTop="@id/rule_name_tv"
+        android:padding="10dp"
         android:src="@drawable/delete_rule" />
 
     <TextView
@@ -32,7 +32,7 @@
         android:layout_marginTop="10dp"
         android:drawableLeft="@drawable/munber_tag"
         android:drawablePadding="10dp"
-        android:text="成员"
+        android:text="人数"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 
@@ -43,7 +43,6 @@
         android:layout_alignTop="@id/mumber_tag_tv"
         android:layout_marginLeft="40dp"
         android:layout_toRightOf="@id/mumber_tag_tv"
-        android:text="20人"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 
@@ -64,9 +63,8 @@
         android:id="@+id/week_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/week_tag_tv"
         android:layout_alignLeft="@id/mumber_tv"
-        android:text="zhou"
+        android:layout_alignTop="@id/week_tag_tv"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 </RelativeLayout>