1.完成一元捐基本的界面逻辑开发，接入支付宝,完成支付宝相关功能

2.移除测试数据
3.添加异常处理，提交测试

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpService.java

@@ -58,34 +58,15 @@ import static com.common.preferences.PreferenceUtils.getBoolean;
  * 自动Erp服务，开启线程
  */
 public class AutoErpService extends Service {
-	public final int STATUS_SIGNING = 0x11;//自动打卡
-	public final int STATUS_WORK_ALARM = 0x12;//上班提醒
-	public final int STATUS_OFF_ALARM = 0x13;//下班提醒
-	public final int STATUS_MISSION = 0x14;//外勤签到
-	public final int STATUS_LEAVE_ALARM = 0x15;//离开提醒
 
-	private ReckonAutoUtil reckonAutoUtil;//计算工具
 	private NotificationManage notificationManage;//通知管理器
 
 	private final long INTERVAL = 2 * 60 * 1000;//每两分钟回来一次，防止时间太久出现回不来情况 通过 iter来判断是否进入判断
-	private final int WORK_ITER = 3;//计算循环的时间
 	private final int DNOTICE_ITER = 10; //TODO 测试用1 ，之后改为10
-	private final int MISSION_ITER = 10;//外勤时间  2分钟的倍数
 
 	private AutoErpSigninUitl signinUitl;
 	private DepositNoticeUtil dnoticeUtil;
-	private int missionIter;
-	private int workIter;
-
-	private boolean isMissionRuning = false;
-	private boolean missioning = false;
-	private boolean working = false;
-	private boolean canWork = false;
-	private boolean canMission = false;
 	private boolean canDNotice = false;
-	private boolean isWorkRuning = false;
-
-	private long updateTime;
 
 	private final String[] flags = {
 			AppConstant.CHANGE_WORK_TASK,//
@@ -96,38 +77,6 @@ public class AutoErpService extends Service {
 			MsgBroadcast.ACTION_MSG_COMPANY_UPDATE//切换账套
 	};
 
-	private Handler handler = new Handler() {
-		@Override
-		public void handleMessage(Message msg) {
-			Bundle bundle = msg.getData();
-			switch (msg.what) {
-				case STATUS_SIGNING://自动打卡
-					if (bundle != null) {
-						WorkModel model = bundle.getParcelable("data");
-						signinUitl.signinWork(model);
-					}
-					break;
-				case STATUS_WORK_ALARM://上班提醒
-					getNotificationManage().sendNotification(MyApplication.getInstance(),
-							R.string.work_up_alert, WorkActivity.class);
-					break;
-				case STATUS_OFF_ALARM://下班提醒
-					getNotificationManage().sendNotification(MyApplication.getInstance(),
-							R.string.work_off_alert, WorkActivity.class);
-
-					break;
-				case STATUS_MISSION://外勤签到
-					MissionModel model = bundle.getParcelable("data");
-					signinUitl.signinMission(model);
-					break;
-				case STATUS_LEAVE_ALARM://内勤离开提醒
-					getNotificationManage().sendNotification(MyApplication.getInstance(),
-							R.string.outoff_work, WorkActivity.class);
-					MessageDao.getInstance().instartSignin(getString(R.string.outoff_work_alert), getResources().getString(R.string.outoff_work));
-					break;
-			}
-		}
-	};
 
 	private BroadcastReceiver updateReceiver = new BroadcastReceiver() {
 		@Override
@@ -136,33 +85,11 @@ public class AutoErpService extends Service {
 				if (intent == null || StringUtil.isEmpty(intent.getAction())) return;
 				else if (intent.getAction().equals(AppConstant.UPDATA_ERP_CHANGE)
 						|| intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
-					log(intent.getAction());
 					String falg = intent.getStringExtra("falg");
-					LogUtil.i("falg=" + falg);
 					if (StringUtil.isEmpty(falg) || falg.equals("home")) {
 						CommonInterface.getInstance().judgeManager(null);
 						init();
 					}
-				} else if (intent.getAction().equals(AppConstant.CHANGE_WORK_TASK)) {//自动打卡任务变更
-					log(AppConstant.CHANGE_WORK_TASK);
-					canWork = intent.getBooleanExtra(AppConstant.CHANGE_WORK_TASK, true);//获取是否开启任务
-					if (canWork) {
-						reckonWork();
-					}
-//					if (canWork && !isWorkRuning) {
-//						startWorkTask();
-//					} else if (!working)
-//						workIter = 0;
-				} else if (intent.getAction().equals(AppConstant.CHANGE_MISSION_TASK)) {//自动外勤任务开启变更
-					log(AppConstant.CHANGE_MISSION_TASK);
-					canMission = intent.getBooleanExtra(AppConstant.CHANGE_MISSION_TASK, true);
-					log("canMission=" + canMission);
-					if (canMission && !isMissionRuning) {
-						startMissionTask();
-					} else if (!missioning)
-						missionIter = 0;
-				} else if (intent.getAction().equals(AppConstant.INIT_MISSION_TASK)) {
-					initMission();
 				} else if (intent.getAction().equals(AppConstant.DEPOSIT_NOTICE_TASK)) {
 					canDNotice = intent.getBooleanExtra(AppConstant.DEPOSIT_NOTICE_TASK, true);
 					log("canDNotice=" + canDNotice);
@@ -234,156 +161,6 @@ public class AutoErpService extends Service {
 	}
 
 
-	private void reckonWorkInThread() throws Exception {
-		LogUtil.i("OAConfig.autosign=" + OAConfig.autosign);
-		if (OAConfig.autosign) {
-			//计算打卡
-			WorkModel model = getReckonAutoUtil().getNextNotSigninWork();
-			if (model != null) {
-				LogUtil.i("model=" + model.toString());
-				String newHHMM = DateFormatUtil.long2Str(DateFormatUtil.HM);
-				if (StringUtil.isEmpty(model.getWorkSignin()) && newHHMM.compareTo(model.getWorkTime()) <= 0) {
-					//当前时间小于上班时间
-					LogUtil.i("当前时间小于上班时间");
-					if (newHHMM.compareTo(model.getWorkStart()) >= 0) {
-						signinWork(model);
-					} else {
-						//计算时间
-						LogUtil.i("计算时间");
-						long startTime = getReckonAutoUtil().getTimeByHHmm(model.getWorkStart());
-						long workTime = getReckonAutoUtil().getTimeByHHmm(model.getWorkTime());
-						long nextTime = Math.max(startTime, workTime - 1000 * 30 * 60);
-						AlarmUtil.startAlarm(AlarmUtil.ID_WORK, AlarmUtil.ACTION_WORK, nextTime);
-					}
-				} else if (StringUtil.isEmpty(model.getOffSignin())) {
-					if (newHHMM.compareTo(model.getOffend()) <= 0) {
-						if (newHHMM.compareTo(model.getOffTime()) >= 0) {
-							signinWork(model);
-						} else {
-							//计算时间
-							LogUtil.i("计算时间");
-							long nextTime = getReckonAutoUtil().getTimeByHHmm(model.getOffTime());
-							AlarmUtil.startAlarm(AlarmUtil.ID_WORK, AlarmUtil.ACTION_WORK, nextTime);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void signinWork(final WorkModel model) {
-		if (isWorkRuning) return;
-		isWorkRuning = true;
-		LogUtil.i("符合打卡时间");
-		MyApplication.getInstance().getBdLocationHelper().requestLocation();
-		OAHttpHelper.getInstance().postDelayed(new Runnable() {
-			@Override
-			public void run() {
-				//判断是否符合打卡
-				if (BaiduMapUtil.getInstence().isInWorkPlce()) {
-					signinUitl.signinWork(model);
-				} else {
-					//不符合打卡情况下，去判断下一次打卡时间
-					ThreadUtil.getInstance().addTask(new Runnable() {
-						@Override
-						public void run() {
-							getReckonAutoUtil().nextNotSigninTime(model);
-						}
-					});
-					isWorkRuning = false;
-				}
-			}
-		}, 1500);
-	}
-
-	/**
-	 * 判断是否符合打卡和计算下一次打卡时间
-	 *
-	 * @throws Exception
-	 */
-	private void reckonWork() {
-		if (!BaseConfig.isDebug()) return;
-		if (System.currentTimeMillis() - updateTime < 30000) {
-			return;
-		}
-		updateTime = System.currentTimeMillis();
-		LogUtil.i("reckonWork");
-		ThreadUtil.getInstance().addTask(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					reckonWorkInThread();
-				} catch (Exception e) {
-				}
-			}
-		});
-	}
-
-
-	/**
-	 * 开启自动打卡和提醒任务
-	 * 在获取打卡列表之后，
-	 *
-	 * @throws Exception
-	 */
-	private void startWorkTask() throws Exception {
-		ThreadUtil.getInstance().addLoopTask(new Runnable() {
-			@Override
-			public void run() {
-				while (true) {
-					try {
-						if (!isCanWork()) {
-							isWorkRuning = false;
-							break;
-						}
-						working = true;
-						if (workIter == 0 || workIter == WORK_ITER) {
-							workIter = 0;
-							log("startWorkTask run");
-							//TODO 先关闭
-//                            if (getReckonAutoUtil().isOutoffWork(getReckonAutoUtil().getPlaceWork())) {
-//                                handler.sendEmptyMessage(STATUS_LEAVE_ALARM);
-//                            } else
-							if (OAConfig.autosign) {
-								//计算打卡
-								WorkModel model = getReckonAutoUtil().reckonAutoWork();
-								if (model != null) {
-									log("符合打卡");
-									Message message = handler.obtainMessage();
-									message.what = STATUS_SIGNING;
-									Bundle bundle = new Bundle();
-									bundle.putParcelable("data", model);
-									message.setData(bundle);
-									handler.sendMessage(message);
-								} else {
-//                                    CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), "距离太远或时间不符合或者已经打过卡");
-								}
-							} else if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), AppConfig.ALARMA_CLICK, false)) {//提醒  1.离开办公室 2.上班提醒   3.下班提醒
-								int type = getReckonAutoUtil().reckonAlarm(INTERVAL);
-								if (type == 1) {
-									handler.sendEmptyMessage(STATUS_LEAVE_ALARM);
-								} else if (type == 2) {
-									handler.sendEmptyMessage(STATUS_WORK_ALARM);
-								} else if (type == 3) {
-									handler.sendEmptyMessage(STATUS_OFF_ALARM);
-								}
-							}
-						}
-						workIter++;
-						working = false;
-						Thread.sleep(INTERVAL);
-					} catch (InterruptedException e) {
-						if (e != null)
-							log("startWorkTask InterruptedException=" + e.getMessage());
-					} catch (Exception e) {
-						if (e != null)
-							log("startWorkTask Exception=" + e.getMessage());
-					}
-				}
-			}
-		});
-	}
-
 	private int dnoticeIter;
 	private Boolean isDNoticeRuning = false;
 	private boolean dnotice = false;
@@ -439,86 +216,6 @@ public class AutoErpService extends Service {
 
 	}
 
-	/**
-	 * 开启自动外勤任务
-	 * 在获取外勤计划列表之后
-	 *
-	 * @throws Exception
-	 */
-	private void startMissionTask() throws Exception {
-		log("startMissionTask");
-		missionIter = 0;
-		isMissionRuning = true;
-		ThreadUtil.getInstance().addLoopTask(new Runnable() {
-			@Override
-			public void run() {
-				while (true) {
-					try {
-						if (!isCanMission()) {
-							isMissionRuning = false;
-							break;
-						}
-						missioning = true;
-						isMissionRuning = true;
-						log("startMissionTask run");
-						int i = MISSION_ITER - 1;
-						if (missionIter == i) {
-							MyApplication.getInstance().getBdLocationHelper().requestLocation();
-						}
-						if (missionIter == 0 || missionIter == MISSION_ITER) {
-							log("missionIter == 0 || missionIter == MISSION_ITER");
-							CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), getString(R.string.app_outplan_running));
-							missionIter = 0;
-							List<MissionModel> plans = MissionDao.getInstance().queryByEnCode();
-							if (ListUtils.isEmpty(plans)) {
-								CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), "未获取到外勤计划");
-								return;
-							}
-							//符合外勤判断
-							//判断是否自动外勤
-							boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
-							boolean isAuto = isB2b || getBoolean(AppConfig.AUTO_MISSION, false);
-							log("isAuto=" + isAuto);
-							if (isAuto) {
-								MissionModel mission = getReckonAutoUtil().reckonMission(plans);//判断
-								if (mission != null) {
-									log("mission != null=" + isAuto);
-									log("符合外勤签到");
-									if (mission.getStatus() == 2) {
-										missionIter = -1;
-									}
-									OAHttpHelper.getInstance().post(new Runnable() {
-										@Override
-										public void run() {
-											signinUitl.signinMission(mission);
-										}
-									});
-//									Message message = handler.obtainMessage();
-//									message.what = STATUS_MISSION;
-//									Bundle bundle = new Bundle();
-//									bundle.putParcelable("data", mission);
-//									message.setData(bundle);
-//									handler.sendMessage(message);
-								} else {
-									CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), "距离太远");
-								}
-							}
-						}
-						missionIter++;
-						missioning = false;
-						Thread.sleep(INTERVAL);
-					} catch (InterruptedException e) {
-						if (e != null)
-							log("startWorkTask InterruptedException=" + e.getMessage());
-					} catch (Exception e) {
-						if (e != null)
-							log("startWorkTask Exception=" + e.getMessage());
-					}
-				}
-			}
-		});
-	}
-
 
 	/**
 	 * 初始化数据库,1.清空昨天数据  2.缓存当天数据
@@ -545,14 +242,10 @@ public class AutoErpService extends Service {
 			dnoticeUtil = new DepositNoticeUtil();
 		if (signinUitl == null)
 			signinUitl = new AutoErpSigninUitl();
-		//TODO 这个接口没有用  先关闭
-//        signinUitl.loadIsCompany();
-//		initWork();
 		OAHttpHelper.getInstance().postDelayed(new Runnable() {
 			@Override
 			public void run() {
 				try {
-					initMission();
 					initDNotice();
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -581,77 +274,10 @@ public class AutoErpService extends Service {
 	}
 
 
-	/*初始化外勤 */
-	private void initMission() throws Exception {
-		if (!MyApplication.getInstance().isNetworkActive()) {
-			boolean isHas = MissionDao.getInstance().hasMoreMision();
-			LogUtil.i("isHas=" + isHas);
-			if (getBoolean(AppConfig.AUTO_MISSION, false) && isHas) {
-				CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), getString(R.string.common_notlinknet));
-			}
-			return;
-		}
-		CommonInterface.getInstance().getOutSetInfo(new CommonInterface.OnResultListener() {
-			@Override
-			public void result(boolean isOk, int result, String message) {
-				if (isOk) {//外勤计划为打卡
-					canMission = true;
-					signinUitl.loadMissionPlan();
-				} else {
-					try {
-						//如果不是自动外勤，清空数据库今天的数据
-						MissionDao.getInstance().clearAll(System.currentTimeMillis());
-					} catch (Exception e) {
-						if (e != null)
-							log("initNet Exception=" + e.getMessage());
-					}
-				}
-			}
-		});
-	}
-
-	private void initWork() {
-		if (!MyApplication.getInstance().isNetworkActive()) {
-			CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), getString(R.string.common_notlinknet));
-		}
-//        //判断是否是自动打卡
-//        //是否自动打卡
-//        boolean isAlarm = CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), AppConfig.ALARMA_CLICK, false);
-//        //是否提醒
-//        boolean isAuto = CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), AppConfig.AUTO_SIGNIN, true);
-//        if (isAlarm || isAuto) {
-//            canWork = true;
-//            signinUitl.loadWorkSet();
-//        } else {
-//            try {
-//                //如果不是自动打卡和提醒，清空数据库今天的数据
-//                WorkModelDao.getInstance().clearAll(System.currentTimeMillis());
-//            } catch (Exception e) {
-//                if (e != null)
-//                    log("initNet Exception=" + e.getMessage());
-//            }
-//        }
-		canWork = true;
-		signinUitl.loadWorkSet();
-	}
-
-
-	private ReckonAutoUtil getReckonAutoUtil() {
-		if (reckonAutoUtil == null) reckonAutoUtil = new ReckonAutoUtil();
-		return reckonAutoUtil;
-	}
-
-	private boolean isCanMission() {
-		return canMission;
-	}
-
 	private boolean isCanDNotice() {
 		return canDNotice;
 	}
 
-	private boolean isCanWork() {
-		return canWork;
-	}
 
 	/**
 	 * start handler date

app_core/common/src/main/java/com/core/app/Constants.java

@@ -6,372 +6,373 @@ import com.core.db.DatabaseTables;
 
 public class Constants {
 
-    //管理平台账户地址
-    public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
-    //IM正式地址
-    public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
-    //IM测试地址
-    public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
-
-    public static String IM_BASE_URL(){
-        String url="";
-        if (BaseConfig.isDebug()){
-            url=IM_BASE_URL;
-        }else{
-            url=IM_BASE_URL;
-        }
-        return url;
-    }
-
-    public static String charitBaseUrl(){
-        return "http://192.168.253.227:8084/";
-    }
-    //通讯录表
-    public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
-            "(id integer primary key autoincrement,"
-            + "tf_name varchar(50),"
-            + "tf_whichSys varchar(50),"
-            + "tf_company varchar(50),"
-            + "tf_phone varchar(50) ,"
-            + "tf_email varchar(50),"
-            + "tf_type integer,"
-            + "tf_ownerId varchar(50),"
-            + "tf_imId varchar(50) default '0')";
-
-    //组织架构 员工信息
-    public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "
-            + "(id integer primary key autoincrement,"
-            + "em_id integer,"
-            + "em_code varchar(50) NOT NULL UNIQUE,"
-            + "em_name varchar(50),"
-            + "em_position varchar(50),"
-            + "em_jobs varchar(50),"
-            + "em_defaultorname varchar(50),"
-            + "em_depart varchar(50),"
-            + "em_tel varchar(50),"
-            + "em_imid varchar(50) default '0',"
-            + "em_mobile varchar(50),"
-            + "em_email varchar(50),"
-            + "em_uu varchar(50),"
-            + "em_imageid integer,"
-            + "company varchar(100),"
-            + "whichsys varchar(50),"
-            + "em_defaultorid integer,"
-            + "em_flag varchar(50))";
-    //组织架构表
-    public static final String SQL_HRORGS_CREATETABLE = "CREATE TABLE HRORGS "
-            + "(id integer primary key autoincrement,"
-            + "or_id integer,"
-            + "or_code varchar(50) NOT NULL UNIQUE,"
-            + "or_name varchar(50),"
-            + "or_subof varchar(50),"
-            + "or_isleaf varchar(50),"
-            + "company varchar(100),"
-            + "whichsys varchar(50),"
-            + "or_flag varchar(50),"
-            + "or_headmanname varchar(50),"
-            + "or_headmancode varchar(50),"
-            + "or_remark integer" +
-            ")";
-    //组织架构 更新时间表
-    public static final String SQL_empdate_CREATETABLE = "CREATE TABLE empdate "
-            + "(id integer primary key autoincrement,"
-            + "ed_lastdate varchar(50),"
-            + "ed_kind varchar(50),"
-            + "ed_company varchar(50),"
-            + "ed_whichsys varchar(50)"
-            + ")";
-    //b2b消息通知表
-    public static final String SQL_B2B_MSG = "CREATE TABLE B2BMSG "
-            + "(id integer primary key autoincrement,"
-            + "b2b_content varchar(50),"
-            + "b2b_time varchar(50),"
-            + "b2b_hasRead integer,"
-            + "b2b_master varchar(50)"
-            + ")";
-
-    //OA内勤签到表
-    public static final String WORKTIBLE = "CREATE TABLE workdata("
-            + "id integer UNIQUE,"//id  唯一不可重复
-            + "emCode  varchar(10),"//员工编号
-            + "master  varchar(20),"//账套
-            + "date  varchar(20),"//日期  yyyy-MM-dd
-            + "workStart  varchar(6),"//上班开始时间  hh:mm
-            + "workTime  varchar(6),"//上班时间  hh:mm
-            + "workend  varchar(6),"//上班结束时间  hh:mm
-            + "workSignin  varchar(6),"//上班签到  hh:mm
-            + "workAllegedly  varchar(6),"//上班申诉时间  hh:mm
-            + "workAlarm INTEGER,"//上班提醒 0|1
-            + "offStart  varchar(6),"//下班开始时间  hh:mm
-            + "offTime  varchar(6),"//下班时间  hh:mm
-            + "offend  varchar(6),"//下班结束时间  hh:mm
-            + "offSignin  varchar(6),"//下班签到  hh:mm
-            + "offAllegedly  varchar(6),"//下班申诉时间  hh:mm
-            + "offAlarm INTEGER,"//下班提醒 0|1
-            + "isNextDay INTEGER,"//是否是跨天 0|1
-            + "leaveAlarm INTEGER"//离开提示次数  0|1
-            + ")";
-
-
-    //OA内勤签到表
-    public static final String SIGNING = "CREATE TABLE signing("
-            + "emCode  varchar(10),"//员工编号
-            + "master  varchar(20),"//账套
-
-            + "workTime  varchar(6),"//上班时间  hh:mm
-            + "offTime  varchar(6),"//下班时间   hh:mm
-
-            + "workSignin  varchar(6),"//上班签到时间 hh:mm
-            + "offSignin  varchar(6),"//下班签到时间  hh:mm
-
-            + "startTime  varchar(6),"//上班开始签到时间  hh:mm
-            + "endTime  varchar(6),"//下班开始签到时间    hh:mm
-
-            + "leave INTEGER,"//下班开始签到时间    hh:mm
-
-            + "workAlarm INTEGER,"//上班提醒
-            + "offAlarm INTEGER"//下班提醒
-
-            + ")";
-
-    /**
-     * oa签到时间表
-     */
-    @Deprecated
-    public static final String OA_SIGNIN_TIME = "CREATE TABLE Signin("
-            + "emCode  varchar(10),"//员工编号
-            + "master  varchar(20),"//账套
-
-            + "workTime  varchar(6),"//上班时间  hh:mm
-            + "offTime  varchar(6),"//下班时间   hh:mm
-
-            + "workSignin  varchar(6),"//上班签到时间  hh:mm
-            + "offSignin  varchar(6),"//下班签到时间  hh:mm
-
-            + "startTime  varchar(6),"//上班开始签到时间  hh:mm
-            + "endTime  varchar(6),"//下班开始签到时间     hh:mm
-
-            + "workAlarm ,"//上班提醒
-            + "offAlarm"//下班提醒 boolean
-
-            + ")";
-
-
-    public static final String SUB_MESSAGE = "CREATE TABLE submessage(" +
-            "isRead ," +//员工账套
-            "master  varchar(20)," +//员工账套
-            "emcode  varchar(20)," +//员工编号
-            "id integer," +//Id   连接时候使用
-            "numId integer," +//Id   连接时候使用
-            "instanceId integer," +//Id   连接时候使用
-            "title  varchar(40)," +//主标题
-            "subTitle varchar(40)," +//副标题
-            "status integer," +//状态
-            "date varchar(20)," +//yyyy-mm-dd
-            "createTime" +//创建时间  与date关联
-            ")";
-
-    //所有订阅号表
-    public static final String TABLE_ALL_SUBSCRIPTION = "CREATE TABLE AllSubs "
-            + "(id integer primary key autoincrement,"
-            + "subs_id integer,"
-            + "subs_title varchar(50),"
-            + "subs_kind varchar(50),"
-            + "subs_status integer,"
-            + "subs_type varchar(50),"
-            + "subs_master varchar(50),"
-            + "subs_username varchar(50),"
-            + "subs_removed integer,"
-            + "subs_img BLOB"
-            + ")";
-
-
-    //监控日志表
-    public static final String AUTO_LOG = "CREATE TABLE SignAutoLog ("
-            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + "aa_type TEXT, "
-            + "aa_location TEXT, "
-            + "aa_remark TEXT, "
-            + "aa_date TEXT, "
-            + "aa_telephone TEXT, "
-            + "sendstatus TEXT"
-            + ")";
-
-    // 用于存贮每天UU运动排名第一的数据表
-    public static final String STEPRANKING_FIRST = "CREATE TABLE StepRankingFirst ("
-            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + "date TEXT,"
-            + "my_userid TEXT,"
-            + "my_rank TEXT, "
-            + "my_steps TEXT, "
-            + "f_userid TEXT, "
-            + "f_name TEXT"
-            + ")";
-
-
-    //用于创建记步数统计表
-    public static final String CREATE_BANNER = "create table step ("
-            + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
-            + "curDate TEXT, "
-            + "totalSteps TEXT)";
-
-    /* //运行轨迹，实时定位点记录表
-     public static final String TRACK_POINT = "CREATE TABLE trackPoint ("
-             +"_id INTEGER PRIMARY KEY AUTOINCREMENT,"
-             +"latitude double(13,10)," //纬度
-             +"longitude double(13,10)," //经度
-             +"timestamp varchar(50)," //实时定位时的时间戳
-             +"type varchar(10)," //类型 run、walk
-             +"startTime varchar(50),"  //开始定位后全部默认为开始时间：yyyy-MM-dd HH:mm
-             +"endTime varchar(50)"  //未点击结束前都为空 点击格式：yyyy-MM-dd HH:mm
-             +")";*/
-    //已订阅号表
-    public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
-            + "(id integer primary key autoincrement,"
-            + "subs_id integer,"
-            + "subs_title varchar(50),"
-            + "subs_kind varchar(50),"
-            + "subs_type varchar(50),"
-            + "subs_applied integer,"
-            + "subs_master varchar(50),"
-            + "subs_username varchar(50),"
-            + "subs_img BLOB"
-            + ")";
-
-    //消息红点数据表
-    public static final String EM_ERPNEWS = "CREATE TABLE em_erpnews ("
-            + "id integer ,"
-            + "master  varchar(20)," //员工账套
-            + "emcode  varchar(20)," //员工编号
-            + "count integer ,"
-            + "title varchar(20),"//位置
-            + "subTitle varchar(20),"//详细信息
-            + "time varchar(20),"//时间
-            + "type varchar(20),"//类型
-            + "hierarchy integer,"//类型
-            + "readTime integer,"//阅读时间
-            + "isReaded integer"//阅读状态，1阅读
-            + ")";
-    //考勤地址表
-    public static final String WORK_LOCATION = "CREATE TABLE work_location ("
-            + "id integer primary key autoincrement,"
-
-            + "master  varchar(20)," //员工账套
-            + "emcode  varchar(20)," //员工编号
-
-            + "latitude double,"//纬度
-            + "longitude double,"//经度
-            + "shortName varchar(20),"//位置
-            + "workaddr varchar(20),"//地址
-            + "validrange integer,"//打卡距离
-            + "innerdistance integer"//办公范围
-            + ")";
-
-    //外勤计划表
-    public static final String TABLE_MISSION = "CREATE TABLE mission ("
-            + "id integer UNIQUE,"//id  唯一不可重复
-            + "status integer,"//状态  1.结束   2.进行中
-            + "master  varchar(20)," //员工账套
-            + "emcode  varchar(20)," //员工编号
-            + "company varchar(50),"//公司
-            + "companyAddr varchar(50),"//公司地址
-            + "signinNum integer,"//签到次数
-            + "latitude Double,"//纬度
-            + "longitude Double,"//经度
-            + "date varchar(50),"//日期 yyyy-MM-dd
-            + "visittime varchar(50),"//预计到达时间 yyyy-MM-dd HH:mm:ss
-            + "realvisitTime varchar(50),"//实际到达时间yyyy-MM-dd HH:mm:ss
-            + "realLeaveTime varchar(50),"//实际离开时间yyyy-MM-dd HH:mm:ss
-            //update by 2016/12/19
-            + "distance Double,"//距离  米
-            + "type integer,"//距离  米
-            + "remark varchar(50),"//距离  米
-            + "location varchar(50),"//录入位置
-            + "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
-            + ")";
-
-    //数据查询历史记录表
-    public static final String TABLE_HISTORICAL_RECORD = "create table "
-            + DatabaseTables.HistoricalRecordTable.NAME + "("
-            + "_id integer primary key autoincrement, "
-            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
-            + DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
-            + DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
-
-    //UU助手
-    public static final String TABLE_UUHELPER_RECORD = "create table "
-            + DatabaseTables.UUHelperTable.NAME + "("
-            + DatabaseTables.UUHelperTable.Cols.ID + " integer primary key autoincrement"
-            + "," + DatabaseTables.UUHelperTable.Cols.USER_ID
-            + "," + DatabaseTables.UUHelperTable.Cols.TIME_SEND
-            + "," + DatabaseTables.UUHelperTable.Cols.DATE
-            + "," + DatabaseTables.UUHelperTable.Cols.IMAGE_URL
-            + "," + DatabaseTables.UUHelperTable.Cols.ICON_URL
-            + "," + DatabaseTables.UUHelperTable.Cols.LINK_URL
-            + "," + DatabaseTables.UUHelperTable.Cols.CONTENT
-            + "," + DatabaseTables.UUHelperTable.Cols.READED
-            + "," + DatabaseTables.UUHelperTable.Cols.TITLE
-            + "," + DatabaseTables.UUHelperTable.Cols.TYPE
-            + ")";
-
-    public static String IS_NOTIFICATION = "is_notification";//是是否进行通知
-    /**
-     * @desc:常量
-     * @author：Administrator on 2016/5/13 10:21
-     */
-    public final static int TYPE_CHAT_MANAGE = 2;
-    public final static int TYPE_CHAT_All = 1;
-
-    /**
-     * @desc:http 请求状态码
-     * @author：Arison on 2016/7/18
-     */
-    public static final int HTTP_SUCCESS_INIT = 1;
-    public final static int APP_SOCKETIMEOUTEXCEPTION = 99;//网络请求超时，错误，404响应
-
-    public final static int LOAD_SUCCESS = 1;
-    public final static int SocketTimeoutException = 0;//ERP登录成功
-    public final static int APP_NOTNETWORK = 111;//网络未连接
-    public final static int SUCCESS_LOGIN = 3;//获取用户开通的平台信息
-    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 FIRST_MSG_REQUEST = 17022801;
-
-    //新功能红点
-    public final static String new_signin = "signin";
-    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_LANGUAGE = "set_sign_language";
-    public final static String SET_BOOKING_TIME = "set_booking_time";
-    public final static String SET_BOOKING = "set_booking";
-    public final static String SET_CALL = "set_call";
-
-    public final static String MESSAGE_YUYUE = "message_yuyue";
-    public final static String MESSAGE_RUN = "message_run";
-    public final static String MESSAGE_DINGYUE = "message_dingyue";
-
-    public final static String MESSAGE_FOOD = "message_food";
-    public final static String MESSAGE_HAIR = "message_hair";
-    public final static String MESSAGE_KTV = "message_ktv";
-    public final static String MESSAGE_SPORT = "message_sport";
-    public final static String MESSAGE_CLUB = "message_club";
-    public final static String MESSAGE_HOSPITAL = "message_hospital";
-    public final static String MESSAGE_REAL_TIME = "message_real_time";
-    public final static String MESSAGE_BUSINESS_STATISTICS = "MESSAGE_business_statistics";
-
-
-    public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
-    public final static String NEW_EXPENSE_REIMBURSEMENT_NOTICE = "NEWEXPENSEREIMBURSEMENTNOTICE";
-    public final static String MORE_FUNCTION = "MORE_FUNCTION";
-
-    public final static String SET_UU_NEW = "set_uu_new";
+	//管理平台账户地址
+	public static final String BASE_URL_LOGIN = "http://manage.ubtob.com/public/account";
+	//IM正式地址
+	public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
+	//IM测试地址
+	public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
+
+	public static String IM_BASE_URL() {
+		String url = "";
+		if (BaseConfig.isDebug()) {
+			url = IM_BASE_URL;
+		} else {
+			url = IM_BASE_URL;
+		}
+		return url;
+	}
+
+	public static String charitBaseUrl() {
+		return "http://192.168.253.227:8084/";
+	}
+
+	//通讯录表
+	public static final String TABLE_CONTANCTS = "CREATE TABLE  tbl_contacts " +
+			"(id integer primary key autoincrement,"
+			+ "tf_name varchar(50),"
+			+ "tf_whichSys varchar(50),"
+			+ "tf_company varchar(50),"
+			+ "tf_phone varchar(50) ,"
+			+ "tf_email varchar(50),"
+			+ "tf_type integer,"
+			+ "tf_ownerId varchar(50),"
+			+ "tf_imId varchar(50) default '0')";
+
+	//组织架构 员工信息
+	public static final String SQL_EMPLOYEES_CREATETABLE = "CREATE TABLE EMPLOYEES "
+			+ "(id integer primary key autoincrement,"
+			+ "em_id integer,"
+			+ "em_code varchar(50) NOT NULL UNIQUE,"
+			+ "em_name varchar(50),"
+			+ "em_position varchar(50),"
+			+ "em_jobs varchar(50),"
+			+ "em_defaultorname varchar(50),"
+			+ "em_depart varchar(50),"
+			+ "em_tel varchar(50),"
+			+ "em_imid varchar(50) default '0',"
+			+ "em_mobile varchar(50),"
+			+ "em_email varchar(50),"
+			+ "em_uu varchar(50),"
+			+ "em_imageid integer,"
+			+ "company varchar(100),"
+			+ "whichsys varchar(50),"
+			+ "em_defaultorid integer,"
+			+ "em_flag varchar(50))";
+	//组织架构表
+	public static final String SQL_HRORGS_CREATETABLE = "CREATE TABLE HRORGS "
+			+ "(id integer primary key autoincrement,"
+			+ "or_id integer,"
+			+ "or_code varchar(50) NOT NULL UNIQUE,"
+			+ "or_name varchar(50),"
+			+ "or_subof varchar(50),"
+			+ "or_isleaf varchar(50),"
+			+ "company varchar(100),"
+			+ "whichsys varchar(50),"
+			+ "or_flag varchar(50),"
+			+ "or_headmanname varchar(50),"
+			+ "or_headmancode varchar(50),"
+			+ "or_remark integer" +
+			")";
+	//组织架构 更新时间表
+	public static final String SQL_empdate_CREATETABLE = "CREATE TABLE empdate "
+			+ "(id integer primary key autoincrement,"
+			+ "ed_lastdate varchar(50),"
+			+ "ed_kind varchar(50),"
+			+ "ed_company varchar(50),"
+			+ "ed_whichsys varchar(50)"
+			+ ")";
+	//b2b消息通知表
+	public static final String SQL_B2B_MSG = "CREATE TABLE B2BMSG "
+			+ "(id integer primary key autoincrement,"
+			+ "b2b_content varchar(50),"
+			+ "b2b_time varchar(50),"
+			+ "b2b_hasRead integer,"
+			+ "b2b_master varchar(50)"
+			+ ")";
+
+	//OA内勤签到表
+	public static final String WORKTIBLE = "CREATE TABLE workdata("
+			+ "id integer UNIQUE,"//id  唯一不可重复
+			+ "emCode  varchar(10),"//员工编号
+			+ "master  varchar(20),"//账套
+			+ "date  varchar(20),"//日期  yyyy-MM-dd
+			+ "workStart  varchar(6),"//上班开始时间  hh:mm
+			+ "workTime  varchar(6),"//上班时间  hh:mm
+			+ "workend  varchar(6),"//上班结束时间  hh:mm
+			+ "workSignin  varchar(6),"//上班签到  hh:mm
+			+ "workAllegedly  varchar(6),"//上班申诉时间  hh:mm
+			+ "workAlarm INTEGER,"//上班提醒 0|1
+			+ "offStart  varchar(6),"//下班开始时间  hh:mm
+			+ "offTime  varchar(6),"//下班时间  hh:mm
+			+ "offend  varchar(6),"//下班结束时间  hh:mm
+			+ "offSignin  varchar(6),"//下班签到  hh:mm
+			+ "offAllegedly  varchar(6),"//下班申诉时间  hh:mm
+			+ "offAlarm INTEGER,"//下班提醒 0|1
+			+ "isNextDay INTEGER,"//是否是跨天 0|1
+			+ "leaveAlarm INTEGER"//离开提示次数  0|1
+			+ ")";
+
+
+	//OA内勤签到表
+	public static final String SIGNING = "CREATE TABLE signing("
+			+ "emCode  varchar(10),"//员工编号
+			+ "master  varchar(20),"//账套
+
+			+ "workTime  varchar(6),"//上班时间  hh:mm
+			+ "offTime  varchar(6),"//下班时间   hh:mm
+
+			+ "workSignin  varchar(6),"//上班签到时间 hh:mm
+			+ "offSignin  varchar(6),"//下班签到时间  hh:mm
+
+			+ "startTime  varchar(6),"//上班开始签到时间  hh:mm
+			+ "endTime  varchar(6),"//下班开始签到时间    hh:mm
+
+			+ "leave INTEGER,"//下班开始签到时间    hh:mm
+
+			+ "workAlarm INTEGER,"//上班提醒
+			+ "offAlarm INTEGER"//下班提醒
+
+			+ ")";
+
+	/**
+	 * oa签到时间表
+	 */
+	@Deprecated
+	public static final String OA_SIGNIN_TIME = "CREATE TABLE Signin("
+			+ "emCode  varchar(10),"//员工编号
+			+ "master  varchar(20),"//账套
+
+			+ "workTime  varchar(6),"//上班时间  hh:mm
+			+ "offTime  varchar(6),"//下班时间   hh:mm
+
+			+ "workSignin  varchar(6),"//上班签到时间  hh:mm
+			+ "offSignin  varchar(6),"//下班签到时间  hh:mm
+
+			+ "startTime  varchar(6),"//上班开始签到时间  hh:mm
+			+ "endTime  varchar(6),"//下班开始签到时间     hh:mm
+
+			+ "workAlarm ,"//上班提醒
+			+ "offAlarm"//下班提醒 boolean
+
+			+ ")";
+
+
+	public static final String SUB_MESSAGE = "CREATE TABLE submessage(" +
+			"isRead ," +//员工账套
+			"master  varchar(20)," +//员工账套
+			"emcode  varchar(20)," +//员工编号
+			"id integer," +//Id   连接时候使用
+			"numId integer," +//Id   连接时候使用
+			"instanceId integer," +//Id   连接时候使用
+			"title  varchar(40)," +//主标题
+			"subTitle varchar(40)," +//副标题
+			"status integer," +//状态
+			"date varchar(20)," +//yyyy-mm-dd
+			"createTime" +//创建时间  与date关联
+			")";
+
+	//所有订阅号表
+	public static final String TABLE_ALL_SUBSCRIPTION = "CREATE TABLE AllSubs "
+			+ "(id integer primary key autoincrement,"
+			+ "subs_id integer,"
+			+ "subs_title varchar(50),"
+			+ "subs_kind varchar(50),"
+			+ "subs_status integer,"
+			+ "subs_type varchar(50),"
+			+ "subs_master varchar(50),"
+			+ "subs_username varchar(50),"
+			+ "subs_removed integer,"
+			+ "subs_img BLOB"
+			+ ")";
+
+
+	//监控日志表
+	public static final String AUTO_LOG = "CREATE TABLE SignAutoLog ("
+			+ "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+			+ "aa_type TEXT, "
+			+ "aa_location TEXT, "
+			+ "aa_remark TEXT, "
+			+ "aa_date TEXT, "
+			+ "aa_telephone TEXT, "
+			+ "sendstatus TEXT"
+			+ ")";
+
+	// 用于存贮每天UU运动排名第一的数据表
+	public static final String STEPRANKING_FIRST = "CREATE TABLE StepRankingFirst ("
+			+ "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+			+ "date TEXT,"
+			+ "my_userid TEXT,"
+			+ "my_rank TEXT, "
+			+ "my_steps TEXT, "
+			+ "f_userid TEXT, "
+			+ "f_name TEXT"
+			+ ")";
+
+
+	//用于创建记步数统计表
+	public static final String CREATE_BANNER = "create table step ("
+			+ "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
+			+ "curDate TEXT, "
+			+ "totalSteps TEXT)";
+
+	/* //运行轨迹，实时定位点记录表
+	 public static final String TRACK_POINT = "CREATE TABLE trackPoint ("
+			 +"_id INTEGER PRIMARY KEY AUTOINCREMENT,"
+			 +"latitude double(13,10)," //纬度
+			 +"longitude double(13,10)," //经度
+			 +"timestamp varchar(50)," //实时定位时的时间戳
+			 +"type varchar(10)," //类型 run、walk
+			 +"startTime varchar(50),"  //开始定位后全部默认为开始时间：yyyy-MM-dd HH:mm
+			 +"endTime varchar(50)"  //未点击结束前都为空 点击格式：yyyy-MM-dd HH:mm
+			 +")";*/
+	//已订阅号表
+	public static final String TABLE_MY_SUBSCRIPTION = "CREATE TABLE MySubs "
+			+ "(id integer primary key autoincrement,"
+			+ "subs_id integer,"
+			+ "subs_title varchar(50),"
+			+ "subs_kind varchar(50),"
+			+ "subs_type varchar(50),"
+			+ "subs_applied integer,"
+			+ "subs_master varchar(50),"
+			+ "subs_username varchar(50),"
+			+ "subs_img BLOB"
+			+ ")";
+
+	//消息红点数据表
+	public static final String EM_ERPNEWS = "CREATE TABLE em_erpnews ("
+			+ "id integer ,"
+			+ "master  varchar(20)," //员工账套
+			+ "emcode  varchar(20)," //员工编号
+			+ "count integer ,"
+			+ "title varchar(20),"//位置
+			+ "subTitle varchar(20),"//详细信息
+			+ "time varchar(20),"//时间
+			+ "type varchar(20),"//类型
+			+ "hierarchy integer,"//类型
+			+ "readTime integer,"//阅读时间
+			+ "isReaded integer"//阅读状态，1阅读
+			+ ")";
+	//考勤地址表
+	public static final String WORK_LOCATION = "CREATE TABLE work_location ("
+			+ "id integer primary key autoincrement,"
+
+			+ "master  varchar(20)," //员工账套
+			+ "emcode  varchar(20)," //员工编号
+
+			+ "latitude double,"//纬度
+			+ "longitude double,"//经度
+			+ "shortName varchar(20),"//位置
+			+ "workaddr varchar(20),"//地址
+			+ "validrange integer,"//打卡距离
+			+ "innerdistance integer"//办公范围
+			+ ")";
+
+	//外勤计划表
+	public static final String TABLE_MISSION = "CREATE TABLE mission ("
+			+ "id integer UNIQUE,"//id  唯一不可重复
+			+ "status integer,"//状态  1.结束   2.进行中
+			+ "master  varchar(20)," //员工账套
+			+ "emcode  varchar(20)," //员工编号
+			+ "company varchar(50),"//公司
+			+ "companyAddr varchar(50),"//公司地址
+			+ "signinNum integer,"//签到次数
+			+ "latitude Double,"//纬度
+			+ "longitude Double,"//经度
+			+ "date varchar(50),"//日期 yyyy-MM-dd
+			+ "visittime varchar(50),"//预计到达时间 yyyy-MM-dd HH:mm:ss
+			+ "realvisitTime varchar(50),"//实际到达时间yyyy-MM-dd HH:mm:ss
+			+ "realLeaveTime varchar(50),"//实际离开时间yyyy-MM-dd HH:mm:ss
+			//update by 2016/12/19
+			+ "distance Double,"//距离  米
+			+ "type integer,"//距离  米
+			+ "remark varchar(50),"//距离  米
+			+ "location varchar(50),"//录入位置
+			+ "recorddate varchar(50)"//录入时间yyyy-MM-dd HH:mm:ss
+			+ ")";
+
+	//数据查询历史记录表
+	public static final String TABLE_HISTORICAL_RECORD = "create table "
+			+ DatabaseTables.HistoricalRecordTable.NAME + "("
+			+ "_id integer primary key autoincrement, "
+			+ DatabaseTables.HistoricalRecordTable.Cols.SCHEME_ID + ", "
+			+ DatabaseTables.HistoricalRecordTable.Cols.SCHEME_NAME + ", "
+			+ DatabaseTables.HistoricalRecordTable.Cols.SEARCH_FIELD + ")";
+
+	//UU助手
+	public static final String TABLE_UUHELPER_RECORD = "create table "
+			+ DatabaseTables.UUHelperTable.NAME + "("
+			+ DatabaseTables.UUHelperTable.Cols.ID + " integer primary key autoincrement"
+			+ "," + DatabaseTables.UUHelperTable.Cols.USER_ID
+			+ "," + DatabaseTables.UUHelperTable.Cols.TIME_SEND
+			+ "," + DatabaseTables.UUHelperTable.Cols.DATE
+			+ "," + DatabaseTables.UUHelperTable.Cols.IMAGE_URL
+			+ "," + DatabaseTables.UUHelperTable.Cols.ICON_URL
+			+ "," + DatabaseTables.UUHelperTable.Cols.LINK_URL
+			+ "," + DatabaseTables.UUHelperTable.Cols.CONTENT
+			+ "," + DatabaseTables.UUHelperTable.Cols.READED
+			+ "," + DatabaseTables.UUHelperTable.Cols.TITLE
+			+ "," + DatabaseTables.UUHelperTable.Cols.TYPE
+			+ ")";
+
+	public static String IS_NOTIFICATION = "is_notification";//是是否进行通知
+	/**
+	 * @desc:常量
+	 * @author：Administrator on 2016/5/13 10:21
+	 */
+	public final static int TYPE_CHAT_MANAGE = 2;
+	public final static int TYPE_CHAT_All = 1;
+
+	/**
+	 * @desc:http 请求状态码
+	 * @author：Arison on 2016/7/18
+	 */
+	public static final int HTTP_SUCCESS_INIT = 1;
+	public final static int APP_SOCKETIMEOUTEXCEPTION = 99;//网络请求超时，错误，404响应
+
+	public final static int LOAD_SUCCESS = 1;
+	public final static int SocketTimeoutException = 0;//ERP登录成功
+	public final static int APP_NOTNETWORK = 111;//网络未连接
+	public final static int SUCCESS_LOGIN = 3;//获取用户开通的平台信息
+	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 FIRST_MSG_REQUEST = 17022801;
+
+	//新功能红点
+	public final static String new_signin = "signin";
+	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_LANGUAGE = "set_sign_language";
+	public final static String SET_BOOKING_TIME = "set_booking_time";
+	public final static String SET_BOOKING = "set_booking";
+	public final static String SET_CALL = "set_call";
+
+	public final static String MESSAGE_YUYUE = "message_yuyue";
+	public final static String MESSAGE_RUN = "message_run";
+	public final static String MESSAGE_DINGYUE = "message_dingyue";
+
+	public final static String MESSAGE_FOOD = "message_food";
+	public final static String MESSAGE_HAIR = "message_hair";
+	public final static String MESSAGE_KTV = "message_ktv";
+	public final static String MESSAGE_SPORT = "message_sport";
+	public final static String MESSAGE_CLUB = "message_club";
+	public final static String MESSAGE_HOSPITAL = "message_hospital";
+	public final static String MESSAGE_REAL_TIME = "message_real_time";
+	public final static String MESSAGE_BUSINESS_STATISTICS = "MESSAGE_business_statistics";
+
+
+	public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
+	public final static String NEW_EXPENSE_REIMBURSEMENT_NOTICE = "NEWEXPENSEREIMBURSEMENTNOTICE";
+	public final static String MORE_FUNCTION = "MORE_FUNCTION";
+
+	public final static String SET_UU_NEW = "set_uu_new";
 
 //    public static void cleanRed(Context ct) throws PackageManager.NameNotFoundException {
 //        int versionCode = PreferenceUtils.getInt("versionCode", 0);
@@ -385,53 +386,53 @@ public class Constants {
 //        }
 //    }
 
-    public static String INSTANT_MESSAGE = "instant_message";//转发消息的标记
-    public static String INSTANT_MESSAGE_FILE = "instant_message_file";//转发文件稍有不同
-    public static String INSTANT_SEND = "instant_send";//转发
-    public static String CHAT_MESSAGE_DELETE_ACTION = "chat_message_delete";
-    public static String CHAT_MESSAGE_DELETE_FRIENDID = "chat_message_delete_friendid";//删除消息要带过去的朋友id
-    public static String CHAT_REMOVE_MESSAGE_FALG = "CHAT_REMOVE_MESSAGE_FALG";
-    public static String CHAT_REMOVE_MESSAGE_POSITION = "CHAT_REMOVE_MESSAGE_POSITION";
-    public static String ONRECORDSTART = "onrecordstart";
-    public static String GROUP_JOIN_NOTICE = "group_join_notice";//加入新群的通知
+	public static String INSTANT_MESSAGE = "instant_message";//转发消息的标记
+	public static String INSTANT_MESSAGE_FILE = "instant_message_file";//转发文件稍有不同
+	public static String INSTANT_SEND = "instant_send";//转发
+	public static String CHAT_MESSAGE_DELETE_ACTION = "chat_message_delete";
+	public static String CHAT_MESSAGE_DELETE_FRIENDID = "chat_message_delete_friendid";//删除消息要带过去的朋友id
+	public static String CHAT_REMOVE_MESSAGE_FALG = "CHAT_REMOVE_MESSAGE_FALG";
+	public static String CHAT_REMOVE_MESSAGE_POSITION = "CHAT_REMOVE_MESSAGE_POSITION";
+	public static String ONRECORDSTART = "onrecordstart";
+	public static String GROUP_JOIN_NOTICE = "group_join_notice";//加入新群的通知
 
 
-    public static String GROUP_JOIN_NOTICE_ACTION = "group_join_notice_action";//加入新群的通知
-    public static String GROUP_JOIN_NOTICE_FRIEND_ID = "group_join_notice_friend_id";//加入新群发送朋友的id
+	public static String GROUP_JOIN_NOTICE_ACTION = "group_join_notice_action";//加入新群的通知
+	public static String GROUP_JOIN_NOTICE_FRIEND_ID = "group_join_notice_friend_id";//加入新群发送朋友的id
 
-    public static String OFFLINE_TIME = "offline_time";//离线时间
-    public static String LAST_OFFLINE_TIME = "last_offline_time";
+	public static String OFFLINE_TIME = "offline_time";//离线时间
+	public static String LAST_OFFLINE_TIME = "last_offline_time";
 
 
-    public static String AUDIO_PHONENUMBER = "audio_phonenumber";//语音
-    public static String IS_AUDIO_OR_VIDEO = "is_audio_or_video";//是语音还是视频
+	public static String AUDIO_PHONENUMBER = "audio_phonenumber";//语音
+	public static String IS_AUDIO_OR_VIDEO = "is_audio_or_video";//是语音还是视频
 
 
-    public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
-    public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
+	public final static int REQUEST_MANAGE_ALL_SUBSCRIPTON = 101;
+	public final static int RESULT_MANAGE_ALL_SUBSCRIPTION = 102;
 
 
-    public static final String ACTION_LOCATION_CHANGE = "action_location_Change";//位置改变发送广播
-    public static final String ACTION_WORK_SIGNIN = "action_work_signin";//当时间合理的时候回调计算内勤打卡
+	public static final String ACTION_LOCATION_CHANGE = "action_location_Change";//位置改变发送广播
+	public static final String ACTION_WORK_SIGNIN = "action_work_signin";//当时间合理的时候回调计算内勤打卡
 
-    public static final String ENTERPRISE_REGISTER_CODE = "enterprise_register_code";
-    public static int WORK_REPORT_DAY = 111;
-    public static int WORK_REPORT_WEEK = 112;
-    public static int WORK_REPORT_MONTH = 113;
-    public static String REAL_TIME_CACHE = "real_time_cache";
+	public static final String ENTERPRISE_REGISTER_CODE = "enterprise_register_code";
+	public static int WORK_REPORT_DAY = 111;
+	public static int WORK_REPORT_WEEK = 112;
+	public static int WORK_REPORT_MONTH = 113;
+	public static String REAL_TIME_CACHE = "real_time_cache";
 
-    //设置计步相关迁移
-    public static String BAIDU_PUSH = "BAIDUPUSH";
-    public static String UU_STEP = "UUSTEP";
-    public static String B_SETTINGRED = "B_SETTINGRED";
-    public static String UU_STEP_RED = "UU_STEP_RED";
-    public static final int MSG_FROM_CLIENT = 0;
-    public static final int MSG_FROM_SERVER = 1;
-    public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
-    public static final String START = "start-image/1080*1776";
-    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
+	//设置计步相关迁移
+	public static String BAIDU_PUSH = "BAIDUPUSH";
+	public static String UU_STEP = "UUSTEP";
+	public static String B_SETTINGRED = "B_SETTINGRED";
+	public static String UU_STEP_RED = "UU_STEP_RED";
+	public static final int MSG_FROM_CLIENT = 0;
+	public static final int MSG_FROM_SERVER = 1;
+	public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
+	public static final String START = "start-image/1080*1776";
+	public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
 
 
-	public static String BASE_CHARIT_ACTIVITY_URL = "http://192.168.253.118:8082/mobile/activeDetail";
-	public static String BASE_CHARIT_PROJECT_URL = "http://192.168.253.118:8082/mobile/projectDetail";
+	public static String BASE_CHARIT_ACTIVITY_URL = "http://lj.ubtob.com/mobile/activeDetail";
+	public static String BASE_CHARIT_PROJECT_URL = "http://lj.ubtob.com/mobile/projectDetail";
 }

app_modular/appbooking/src/main/java/com/modular/booking/adapter/BookAdapter.java

@@ -21,11 +21,11 @@ import java.util.Date;
  */
 
 public class BookAdapter extends BaseAdapter {
-    
+
     private Context ct;
     private int type=1;
     private Date currentDate;
-    
+
     private boolean isTime=false;
 
     public boolean isTime() {
@@ -45,7 +45,7 @@ public class BookAdapter extends BaseAdapter {
     }
 
     private ArrayList<BookingModel> datas=new ArrayList<>();
-    
+
     public BookAdapter(Context ct, ArrayList<BookingModel> data){
         this.ct=ct;
         this.datas=data;
@@ -100,11 +100,11 @@ public class BookAdapter extends BaseAdapter {
                     holder.title_tv.setText(model.getAb_endtime().substring(11,16));
                 }else{
                     holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
-                            model.getAb_endtime().substring(11,16)); 
+                            model.getAb_endtime().substring(11,16));
                 }
             }else{
-             
-               
+
+
             }
             if (isTime){
                 //显示具体天
@@ -119,9 +119,9 @@ public class BookAdapter extends BaseAdapter {
                            model.getAb_endtime().substring(11,16));
                }
             }
-           
+
             holder.status_tv.setText(model.getAb_confirmstatus());
-           
+
             if(model.getAb_sharestatus().equals("已共享")){
                 holder.share_img.setVisibility(View.VISIBLE);
             }else{
@@ -132,10 +132,10 @@ public class BookAdapter extends BaseAdapter {
             }else{
                 holder.handler_tv.setText(model.getAb_recordman()+"—>"+model.getAb_bman());
             }
-            
+
             holder.topic_tv.setText(model.getAb_type());
             holder.model.setAb_type(model.getAb_type());
-         
+
         } catch (Exception e) {
             e.printStackTrace();
         }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -46,6 +46,9 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.dao.work.VideoFileDao;
+import com.core.dao.work.WorkModelDao;
+import com.core.model.OAConfig;
+import com.core.model.WorkModel;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -66,6 +69,8 @@ import com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity;
 import com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -186,9 +191,9 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         findViewById(R.id.clear_cache_rl).setOnClickListener(this);
         findViewById(R.id.use_help_rl).setOnClickListener(this);
         findViewById(R.id.about_us_rl).setOnClickListener(this);
-        String path= MyApplication.getInstance().mAppDir;
-        if (StringUtil.isEmpty(path)){
-            path=getCacheDir().getPath();
+        String path = MyApplication.getInstance().mAppDir;
+        if (StringUtil.isEmpty(path)) {
+            path = getCacheDir().getPath();
         }
         long cacheSize = FileUtils.getFileSize(new File(path));
         mCacheTv.setText(FileUtils.formatFileSize(cacheSize));
@@ -278,16 +283,16 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 //                .add("companyid",201)
 //                .add("userid",100254)
 //                .add("token",1)
-                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_uu"))
                 .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
-                .add("token",MyApplication.getInstance().mAccessToken)
+                .add("token", MyApplication.getInstance().mAccessToken)
 
 
                 .method(Method.GET)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString()+"");
+                LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString() + "");
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 try {
                     //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
@@ -295,9 +300,9 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 //                        if (!CommonUtil.isReleaseVersion()) {
 //                            businessmen_setting_rl.setVisibility(View.VISIBLE);
 //                        }else
-                            if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
+                        if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        }else{
+                        } else {
                             businessmen_setting_rl.setVisibility(View.GONE);
                         }
                     }
@@ -356,88 +361,92 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     @Override
     public void onClick(View v) {
         Intent intent = null;
-       if (v.getId() == R.id.booking_set_rl){
-           startActivity(new Intent(this, BookingSetActivity.class));
-           CommonUtil.setSharedPreferences(this, Constants.SET_BOOKING_TIME, true);
-           tv_booking_new.setVisibility(View.GONE);
-       }else if (v.getId() == R.id.language_us_rl){
-           startActivity(new Intent(this, SelectLanguageActivity.class));
-           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
-           tv_language_new.setVisibility(View.GONE);
-       }else if (v.getId() == R.id.sign_in_rl){
-           showPopupWindow();
-           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
-           tv_sign_new.setVisibility(View.GONE);
-       }else if (v.getId() == R.id.sign_out_rl){
-          intent = new Intent(mContext, MissionSetActivity.class);
-           intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
-           startActivity(intent);
-           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO, true);
-           tv_signauto_new.setVisibility(View.GONE);
-       }else if (v.getId() == R.id.clear_cache_rl){
-           showclearDialog();
-       }else if (v.getId() == R.id.use_help_rl){
-           CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
-           tv_help_new.setVisibility(View.GONE);
-           intent = new Intent(mContext, FeedbackActivity.class);
-           intent.putExtra("type", 1);
-           intent.putExtra(AppConstant.EXTRA_URL, mConfig.help_url);
-           intent.putExtra(AppConstant.EXTRA_TITLE, getString(R.string.use_help));
-           startActivity(intent);
-       }else if (v.getId() == R.id.about_us_rl){
-           startActivity(new Intent(mContext, AboutActivity.class));
-       }else if (v.getId() == R.id.share_rl){
-           share();
-       }else if (v.getId() == R.id.rl_app_update){
-           dialog.setMessage(getString(R.string.set_check_update_wait));
-           dialog.show();
-           BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
-               @Override
-               public void onCheckComplete() {
-                   BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
-                           new CPCheckUpdateCallback() {
-
-                               @Override
-                               public void onCheckUpdateCallback(
-                                       AppUpdateInfo info,
-                                       AppUpdateInfoForInstall infoForInstall) {
-                                   if (infoForInstall != null
-                                           && !TextUtils
-                                           .isEmpty(infoForInstall
-                                                   .getInstallPath())) {
-                                   } else if (info != null) {
-                                   } else {
-                                       ViewUtil.ShowMessageTitle(
-                                               SettingActivity.this,
-                                               getString(R.string.set_isnewVersion));
-                                   }
-                                   dialog.dismiss();
-                               }
-                           });
-               }
-           });
-       }else if (v.getId() == R.id.super_setting_tv){
-           startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
-           closePopupWindow();
-       }else if (v.getId() == R.id.work_setting_tv){
-           intent = new Intent(mContext, FlightsActivity.class);
-           startActivityForResult(intent, 0x12);
-           closePopupWindow();
-       }else if (v.getId() == R.id.office_addr_setting_tv){
-           startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
-           closePopupWindow();
-       }else if (v.getId() == R.id.my_rule_setting_tv){
-           intent = new Intent(mContext, MyRuleSetActivity.class);
-//                presenter.showMyRele(intent, adapter.getModels());
-           startActivity(intent);
-           closePopupWindow();
-       }else if (v.getId() == R.id.cancel_tv){
-           closePopupWindow();
-       }else if (v.getId() == R.id.businessmen_setting_rl){
-           startActivity(new Intent(this,BSettingActivity.class));
-           PreferenceUtils.putBoolean(Constants.B_SETTINGRED, true);
-           bsettingRed.setVisibility(View.GONE);
-       }
+        if (v.getId() == R.id.booking_set_rl) {
+            startActivity(new Intent(this, BookingSetActivity.class));
+            CommonUtil.setSharedPreferences(this, Constants.SET_BOOKING_TIME, true);
+            tv_booking_new.setVisibility(View.GONE);
+        } else if (v.getId() == R.id.language_us_rl) {
+            startActivity(new Intent(this, SelectLanguageActivity.class));
+            CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
+            tv_language_new.setVisibility(View.GONE);
+        } else if (v.getId() == R.id.sign_in_rl) {
+            showPopupWindow();
+            CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
+            tv_sign_new.setVisibility(View.GONE);
+        } else if (v.getId() == R.id.sign_out_rl) {
+            intent = new Intent(mContext, MissionSetActivity.class);
+            intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
+            startActivity(intent);
+            CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO, true);
+            tv_signauto_new.setVisibility(View.GONE);
+        } else if (v.getId() == R.id.clear_cache_rl) {
+            showclearDialog();
+        } else if (v.getId() == R.id.use_help_rl) {
+            CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
+            tv_help_new.setVisibility(View.GONE);
+            intent = new Intent(mContext, FeedbackActivity.class);
+            intent.putExtra("type", 1);
+            intent.putExtra(AppConstant.EXTRA_URL, mConfig.help_url);
+            intent.putExtra(AppConstant.EXTRA_TITLE, getString(R.string.use_help));
+            startActivity(intent);
+        } else if (v.getId() == R.id.about_us_rl) {
+            startActivity(new Intent(mContext, AboutActivity.class));
+        } else if (v.getId() == R.id.share_rl) {
+            share();
+        } else if (v.getId() == R.id.rl_app_update) {
+            dialog.setMessage(getString(R.string.set_check_update_wait));
+            dialog.show();
+            BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+                @Override
+                public void onCheckComplete() {
+                    BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
+                            new CPCheckUpdateCallback() {
+
+                                @Override
+                                public void onCheckUpdateCallback(
+                                        AppUpdateInfo info,
+                                        AppUpdateInfoForInstall infoForInstall) {
+                                    if (infoForInstall != null
+                                            && !TextUtils
+                                            .isEmpty(infoForInstall
+                                                    .getInstallPath())) {
+                                    } else if (info != null) {
+                                    } else {
+                                        ViewUtil.ShowMessageTitle(
+                                                SettingActivity.this,
+                                                getString(R.string.set_isnewVersion));
+                                    }
+                                    dialog.dismiss();
+                                }
+                            });
+                }
+            });
+        } else if (v.getId() == R.id.super_setting_tv) {
+            startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
+            closePopupWindow();
+        } else if (v.getId() == R.id.work_setting_tv) {
+            intent = new Intent(mContext, FlightsActivity.class);
+            startActivityForResult(intent, 0x12);
+            closePopupWindow();
+        } else if (v.getId() == R.id.office_addr_setting_tv) {
+            startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
+            closePopupWindow();
+        } else if (v.getId() == R.id.my_rule_setting_tv) {
+            intent = new Intent(mContext, MyRuleSetActivity.class);
+            List<WorkModel> models = WorkModelDao.getInstance().queryAuto();
+            intent.putParcelableArrayListExtra("data", (ArrayList<WorkModel>) models);
+            intent.putExtra("isFree", false);
+            intent.putExtra("day", OAConfig.days);
+            intent.putExtra("name", OAConfig.name);
+            startActivity(intent);
+            closePopupWindow();
+        } else if (v.getId() == R.id.cancel_tv) {
+            closePopupWindow();
+        } else if (v.getId() == R.id.businessmen_setting_rl) {
+            startActivity(new Intent(this, BSettingActivity.class));
+            PreferenceUtils.putBoolean(Constants.B_SETTINGRED, true);
+            bsettingRed.setVisibility(View.GONE);
+        }
     }
 
     private void share() {

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1066,7 +1066,7 @@ public class MessagePresenter implements OnHttpResultListener {
 			models.add(model);
 		}
 
-		if (BaseConfig.isDebug()) {
+
 			model = new MessageHeader("一元捐");
 			model.setIcon(R.drawable.uu_run);
 			model.setSubDoc("");
@@ -1074,7 +1074,6 @@ public class MessagePresenter implements OnHttpResultListener {
 			model.setType(9);
 			model.setTag("");
 			models.add(model);
-		}
 
 		iMessageView.updateHeader(models);
 	}

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -13,6 +13,7 @@ import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.utils.NetUtils;
@@ -35,6 +36,7 @@ import com.uas.appworks.OA.platform.model.CharitModel;
 import com.uas.appworks.R;
 import com.uas.appworks.widget.SelectPlayPop;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -98,11 +100,11 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 				loadData(editable == null ? "" : editable.toString());
 			}
 		});
+		progressDialog.show();
 		loadData("");
 	}
 
 	private void loadData(String keyWork) {
-		progressDialog.show();
 		lastKeyWork = keyWork;
 		if (type == 2) {
 			loadActivity(keyWork);
@@ -141,12 +143,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 		}));
 	}
 
-
 	private void loadProjects(final String keyWork) {
-		if (!NetUtils.isNetWorkConnected(ct)) {
-			ToastUtil.showToast(ct, R.string.networks_out);
-			return;
-		}
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("projects")
 				.add("area", "全部")
@@ -175,7 +172,20 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 			JSONObject object = JSON.parseObject(message);
 			JSONArray array = JSONUtil.getJSONArray(object, "activityList");
 			List<CharitActModel> allModels = JSON.parseArray(array.toString(), CharitActModel.class);
-			setAdapter(allModels);
+
+			List<CharitActModel> showModels = null;
+			if (StringUtil.isEmpty(lastKeyWork)) {
+				showModels = allModels;
+			} else {
+				showModels = new ArrayList<>();
+				for (CharitActModel e : allModels) {
+					if (e.getStage().toLowerCase().contains(lastKeyWork) ||
+							e.getName().toLowerCase().contains(lastKeyWork) ) {
+						showModels.add(e);
+					}
+				}
+			}
+			setAdapter(showModels);
 		} else {
 			setAdapter(null);
 		}
@@ -200,7 +210,20 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 		JSONObject object = JSON.parseObject(message);
 		JSONArray projectList = JSONUtil.getJSONArray(object, "projectList");
 		List<CharitModel> models = JSON.parseArray(projectList.toJSONString(), CharitModel.class);
-		setProjectsAdapter(models);
+		List<CharitModel> showModels;
+		if (StringUtil.isEmpty(lastKeyWork)) {
+			showModels = models;
+		} else {
+			showModels = new ArrayList<>();
+			for (CharitModel e : models) {
+				if (e.getArea().toLowerCase().contains(lastKeyWork) ||
+						e.getName().toLowerCase().contains(lastKeyWork) ||
+						e.getSummary().toLowerCase().contains(lastKeyWork)) {
+					showModels.add(e);
+				}
+			}
+		}
+		setProjectsAdapter(showModels);
 	}
 
 	private CharitableAdapter charitableAdapter = null;

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -205,12 +205,12 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 		View windowView = LayoutInflater.from(ct).inflate(R.layout.item_list_pop, null);
 		window.setContentView(windowView);
 		ListView contentLV = (ListView) windowView.findViewById(R.id.contentLV);
-		final String[] messages = {"全部", "未开始", "进行中", "已结束"};
+		final String[] messages = {"全部", "进行中", "已结束"};
 		contentLV.setAdapter(new PopListAdapter(ct, messages));
 		window.setTouchable(true);
 		window.setBackgroundDrawable(ct.getResources().getDrawable(R.drawable.pop_round_bg));
 		window.getContentView().measure(0, 0);
-		window.setHeight(DisplayUtil.dip2px(ct, 180));
+		window.setHeight(DisplayUtil.dip2px(ct, 150));
 		window.setWidth(DisplayUtil.dip2px(ct, 80));
 //        window.setAnimationStyle(R.style.MenuAnimationFade);
 		window.setOutsideTouchable(false);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.base.EasyFragment;
@@ -172,8 +173,9 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 		allArea.add(0, "全部");
 		for (int i = 0; i < allArea.size(); i++) {
 			String type = allArea.getString(i);
-			LogUtil.i("type=" + type);
-			areaList.add(type);
+			if (!StringUtil.isEmpty(type)) {
+				areaList.add(type);
+			}
 		}
 		LogUtil.i("areaList=" + areaList.size());
 		setTypeData(areaList);
@@ -181,7 +183,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 	}
 
 
-	private void loadProjects(String area) {
+	private void loadProjects(final String area) {
 		if (!NetUtils.isNetWorkConnected(ct)) {
 			ToastUtil.showToast(ct, R.string.networks_out);
 			return;
@@ -198,7 +200,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 			public void onResponse(Object o) {
 				try {
 					if (o != null) {
-						handlerProjects(o.toString());
+						handlerProjects(area == null ? "" : area, o.toString());
 					}
 				} catch (Exception e) {
 					if (e != null) {
@@ -210,13 +212,23 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 		}));
 	}
 
-	private void handlerProjects(String message) throws Exception {
+	private void handlerProjects(String area, String message) throws Exception {
 		LogUtil.i("message=" + message);
 		JSONObject object = JSON.parseObject(message);
 		JSONArray projectList = JSONUtil.getJSONArray(object, "projectList");
 		List<CharitModel> models = JSON.parseArray(projectList.toJSONString(), CharitModel.class);
-		LogUtil.i("models=" + models.size());
-		setContantData(models);
+		List<CharitModel> showModels = null;
+		if ("全部".equals(area) || area.length() <= 0) {
+			showModels = models;
+		} else {
+			showModels = new ArrayList<>();
+			for (CharitModel e : models) {
+				if (e.getArea().equals(area)) {
+					showModels.add(e);
+				}
+			}
+		}
+		setContantData(showModels);
 	}
 
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/CharitModel.java

@@ -46,7 +46,7 @@ public class CharitModel {
 	}
 
 	public String getArea() {
-		return area;
+		return area==null?"":area;
 	}
 
 	public void setArea(String area) {
@@ -54,7 +54,7 @@ public class CharitModel {
 	}
 
 	public String getSummary() {
-		return summary;
+		return summary==null?"":summary;
 	}
 
 	public void setSummary(String summary) {