备份

WeiChat/src/main/AndroidManifest.xml

@@ -257,9 +257,9 @@
         <activity android:name=".ui.erp.activity.NewsTwoActivity" />
         <activity android:name=".ui.erp.activity.NoticesActivity" />
         <activity android:name=".ui.erp.activity.InformActivity" />
-        <activity android:name=".ui.erp.activity.TaskActivity" />
+        <activity android:name=".ui.platform.task.TaskActivity" />
         <activity android:name=".ui.erp.activity.ScheduleActivity" />
-        <activity android:name=".ui.erp.activity.SubscribeDetailActivity" />
+        <activity android:name="com.modular.appmessages.activity.SubscribeDetailActivity" />
         <!-- 通用的activity 加载fragment -->
         <activity android:name=".ui.erp.activity.UUFriendActivity" />
         <activity android:name="com.uas.appcontact.ui.activity.CommonFragmentActivity" />
@@ -310,10 +310,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.SubcribeManageActivity"
-            android:theme="@style/StyledIndicators" />
-        <activity android:name=".ui.erp.activity.ManageAllSubscriptionActivity" />
+
+        <activity android:name="com.modular.appmessages.activity.ManageAllSubscriptionActivity" />
         <!-- 群聊 -->
         <activity android:name=".ui.groupchat.SelectContactsActivity">
             <intent-filter>
@@ -876,9 +874,7 @@
             android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
         <!-- 百度推送相关结束 -->
 
-        <activity
-            android:name=".ui.message.Subscription2Activity"
-            android:label="@string/subscribe_title" />
+
         <activity
             android:name="com.uas.appworks.OA.erp.activity.MissionSetActivity"
             android:label="@string/activity_mission_set" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/SubscriptionAdapter.java

@@ -1,32 +0,0 @@
-package com.xzjmyk.pm.activity.adapter;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-/**
- * Created by Bitliker on 2017/3/18.
- */
-
-public class SubscriptionAdapter extends BaseAdapter {
-    @Override
-    public int getCount() {
-        return 0;
-
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return null;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        return null;
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/WorkModelDao.java

@@ -5,11 +5,12 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.db.DatabaseManager;
 import com.core.model.WorkModel;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.TimeUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -14,6 +14,7 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.common.data.Blowfish;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.Friend;
@@ -24,11 +25,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.appmessages.adapter.SchedultAdapter;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.adapter.SchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.common.data.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.apache.http.client.ClientProtocolException;

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

@@ -15,6 +15,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import com.common.data.Blowfish;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.Friend;
@@ -25,11 +26,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.appmessages.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.common.data.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
@@ -69,6 +69,7 @@ public class ScheduleActivity extends BaseActivity {
                     adapter = new NewSchedultAdapter(ScheduleActivity.this, allList);
                     listview_main.setAdapter(adapter);
                 }
+
                 listview_main.onRefreshComplete();
             } else if (msg.what == 0) {
                 mEmptyLayout.setErrorMessage("服务器异常！请刷新重试！");

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

@@ -38,7 +38,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.SubMessage;
+import com.modular.appmessages.model.SubMessage;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;

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

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.model.LatLng;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -22,18 +23,18 @@ import com.core.net.http.http.Request;
 import com.core.utils.CommonInterface;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
+import com.core.utils.helper.PopupWindowHelper;
+import com.core.widget.MyListView;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.model.SelectAimModel;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity;
-import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.AddBusinessAdapter;
-import com.core.widget.view.model.SelectAimModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.helper.PopupWindowHelper;
-import com.core.widget.MyListView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -12,6 +12,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;

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

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;

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

@@ -5,20 +5,20 @@ import android.os.Bundle;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
-import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
-import com.core.widget.view.model.SelectAimModel;
-import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
-import com.core.utils.CommonInterface;
+import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
-import com.core.utils.TimeUtils;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
+import com.core.utils.CommonInterface;
+import com.core.widget.view.model.SelectAimModel;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -25,6 +25,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.model.Friend;
+import com.core.model.OAConfig;
 import com.core.model.XmppMessage;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
@@ -35,19 +36,19 @@ import com.core.utils.sortlist.PingYinUtil;
 import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
+import com.modular.appmessages.activity.MsgsSecondCommonActivity;
+import com.core.dao.MessageDao;
+import com.modular.appmessages.db.SubsDao;
+import com.core.model.MessageModel;
+import com.modular.appmessages.model.SubMessage;
+import com.modular.appmessages.model.SubscriptionMessage;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
-import com.xzjmyk.pm.activity.bean.message.SubMessage;
-import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
-import com.modular.appmessages.db.MessageDao;
-import com.xzjmyk.pm.activity.db.dao.SubsDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.modular.appmessages.activity.MsgsSecondCommonActivity;
-import com.modular.appmessages.model.MessageModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMessageView;
+import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -68,6 +69,7 @@ public class MessagePresenter implements OnHttpResultListener {
     private final int LOAD_EMNEWS_DETAILS = 0x15;
     private final int LOAD_B2B_COUNT = 0x16;//获取b2b的审批和任务数量
     private final int LOAD_BOOKING = 0x17;//小秘书红点
+    @Deprecated
     public static final String AUTO_SIGIN_ALART = "AUTO_SIGIN_ALART";
 
     private String SUB_READ_TIME;//订阅好点击阅读时间
@@ -81,7 +83,7 @@ public class MessagePresenter implements OnHttpResultListener {
 
     private String filter;//搜索数据
     private int emnewsNum, subsNum, processNum, taskNum, bookingNum;//红点消息分类数量
-    private String[] RECEIVER_LIST = {ConnectivityManager.CONNECTIVITY_ACTION, AUTO_SIGIN_ALART, MsgBroadcast.ACTION_MSG_COMPANY_UPDATE, "com.app.home.update"
+    private String[] RECEIVER_LIST = {ConnectivityManager.CONNECTIVITY_ACTION, OAConfig.AUTO_SIGIN_ALART, MsgBroadcast.ACTION_MSG_COMPANY_UPDATE, "com.app.home.update"
     ,MsgBroadcast.ACTION_MSG_UI_UPDATE};
     private BroadcastReceiver dataChangeReceiver = new BroadcastReceiver() {
         @Override
@@ -90,7 +92,7 @@ public class MessagePresenter implements OnHttpResultListener {
             if (StringUtil.isEmpty(action)) return;
             if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
                 iMessageView.changeNet(CommonUtil.isNetWorkConnected(MyApplication.getInstance()));
-            } else if (AUTO_SIGIN_ALART.equals(action)) {
+            } else if (OAConfig.AUTO_SIGIN_ALART.equals(action)) {
                 loadNews(isB2b);//获取消息
             } else if (action.equals("com.app.home.update") || action.equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)
         ||action.equals(MsgBroadcast.ACTION_MSG_UI_UPDATE)) {

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

@@ -9,7 +9,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.SubscriptionMessage;
+import com.modular.appmessages.model.SubscriptionMessage;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISubscriptionView;
 import com.common.data.ListUtils;

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

@@ -32,11 +32,12 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.appmessages.activity.ProcessB2BActivity;
 import com.modular.appmessages.activity.ProcessMsgActivity;
+import com.modular.appmessages.activity.Subscription2Activity;
 import com.roamer.slidelistview.SlideListView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
+import com.xzjmyk.pm.activity.ui.platform.task.TaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MessageAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MessagePresenter;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/TaskActivity.java → WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.platform.task;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -31,12 +31,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.data.Blowfish;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.net.http.HttpClient;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
@@ -44,13 +47,11 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
+import com.modular.appmessages.R;
+import com.modular.appmessages.adapter.NewSchedultAdapter;
+import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
-import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
-import com.common.data.Blowfish;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.Date;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskB2BActivity.java

@@ -27,6 +27,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.data.Blowfish;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -44,11 +45,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.appmessages.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.NewSchedultAdapter;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
-import com.common.data.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -31,7 +31,7 @@ import com.core.utils.CommonInterface;
 import com.core.utils.TimeUtils;
 import com.uas.appme.pedometer.service.StepService;
 import com.xzjmyk.pm.activity.R;
-import com.modular.appmessages.db.MessageDao;
+import com.core.dao.MessageDao;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;

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

@@ -28,7 +28,7 @@ import com.core.utils.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.User;
 import com.core.broadcast.MsgBroadcast;
-import com.modular.appmessages.db.MessageDao;
+import com.core.dao.MessageDao;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
 import com.core.dao.UserDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;

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

@@ -2,16 +2,17 @@ package com.xzjmyk.pm.activity.util.oa;
 
 import android.util.Log;
 
+import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.core.model.MissionModel;
 import com.core.model.WorkModel;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.core.utils.TimeUtils;
+import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
+import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 
 import java.util.List;
 

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

@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="3dp"/>
 
-    <com.xzjmyk.pm.activity.view.NoSlideViewpager
+    <com.modular.appmessages.ui.NoSlideViewpager
         android:id="@+id/subscribe_manage_vp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/item_line"
-    tools:context="com.xzjmyk.pm.activity.ui.message.Subscription2Activity">
+    tools:context="com.xzjmyk.pm.activity.com.modular.appmessages.activity.Subscription2Activity">
 
     <TextView
         android:id="@+id/loading_tv"

WeiChat/src/main/res/menu/menu_button.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity">
+    tools:context="com.xzjmyk.pm.activity.com.modular.appmessages.activity.TaskActivity">
     <item
         android:id="@+id/button_find"
         android:title="查询"

WeiChat/src/main/res/menu/menu_state.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity">
+    tools:context="com.xzjmyk.pm.activity.com.modular.appmessages.activity.TaskActivity">
     <item
         android:id="@+id/reset"
         android:title="筛选"

app_core/common/src/main/java/com/common/data/ListUtils.java

@@ -3,6 +3,7 @@ package com.common.data;
 import android.text.TextUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -251,5 +252,15 @@ public class ListUtils {
         return invertList;
     }
 
-
+    public static List<Object> getSingleElement(List<Object> datas) {
+        List<Object> resultList = new ArrayList<>();
+        Iterator<Object> iterator = datas.iterator();
+        while (iterator.hasNext()) {
+            Object next = iterator.next();
+            if (!resultList.contains(next)) {
+                resultList.add(next);
+            }
+        }
+        return resultList;
+    }
 }

app_modular/appmessages/src/main/java/com/modular/appmessages/db/MessageDao.java → app_core/common/src/main/java/com/core/dao/MessageDao.java

@@ -1,4 +1,4 @@
-package com.modular.appmessages.db;
+package com.core.dao;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -12,9 +12,9 @@ import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.db.DatabaseManager;
+import com.core.model.MessageModel;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
-import com.modular.appmessages.model.MessageModel;
 
 import java.util.ArrayList;
 import java.util.List;

app_core/common/src/main/java/com/core/dao/work/WorkModelDao.java

@@ -5,6 +5,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.db.DatabaseManager;
 import com.core.model.WorkModel;

app_modular/appmessages/src/main/java/com/modular/appmessages/model/MessageModel.java → app_core/common/src/main/java/com/core/model/MessageModel.java

@@ -1,4 +1,4 @@
-package com.modular.appmessages.model;
+package com.core.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app_core/common/src/main/java/com/core/model/OAConfig.java

@@ -19,6 +19,15 @@ public class OAConfig {
     public static final String MODEL_DATA = "MODEL_DATA";//oa模块中通用调转页面专递的ParcelableExtra
     public static final String STRING_DATA = "STRING_DATA";//oa模块中通用调转页面专递的String
 
+    public static final String AUTO_SIGIN_ALART = "AUTO_SIGIN_ALART";//oa模块中通用调转页面专递的String
+
+
+
+
+
+
+
+
 
     //关于自动内勤的相关变量
     public static boolean loadWorkSeted = false;//是否下拉过高级考勤数据

app_core/common/src/main/res/drawable-xxhdpi/edit_hint_right_angle.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <solid android:color="@color/base_bg"/>
+            <stroke android:width="0.6dp" android:color="@color/item_line"/>
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp"/>
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/base_bg"/>
+            <stroke android:width="0.6dp" android:color="@color/item_line"/>
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/base_bg"/>
+            <stroke android:width="0.6dp" android:color="@color/item_line"/>
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp"/>
+        </shape>
+    </item>
+</selector>

app_modular/appmessages/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
     }
+    useLibrary 'org.apache.http.legacy'
     buildTypes {
         release {
             minifyEnabled false

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -16,6 +16,12 @@
             android:label="@string/title_activity_process_msg" />
         <activity android:name="com.modular.appmessages.activity.AppWebViewActivity" />
         <activity android:name="com.modular.appmessages.activity.ApprovalActivity" />
+        <activity
+            android:name="com.modular.appmessages.activity.Subscription2Activity"
+            android:label="@string/subscribe_title" />
+        <activity
+            android:name=".activity.SubcribeManageActivity"
+            android:theme="@style/StyledIndicators" />
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ManageAllSubscriptionActivity.java → app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ManageAllSubscriptionActivity.java

@@ -1,18 +1,19 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.modular.appmessages.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ListView;
 
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SubscriptionNumber;
-import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
+import com.common.data.ListUtils;
+import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.AllRemovedSubsAdapter;
 import com.core.dao.DBManager;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.model.SubscriptionNumber;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
-import com.xzjmyk.pm.activity.util.im.Constants;
+import com.modular.appmessages.R;
+import com.modular.appmessages.adapter.AllRemovedSubsAdapter;
+import com.modular.appmessages.model.AllSubscriptonKindMessage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -65,7 +66,7 @@ public class ManageAllSubscriptionActivity extends BaseActivity {
                 for (int i = 0; i < mSubscriptionNumbers.size(); i++) {
                     removedKeyStrings.add(mSubscriptionNumbers.get(i).getType());
                 }
-                keyStrings = CommonUtil.getSingleElement(removedKeyStrings);
+                keyStrings = ListUtils.getSingleElement(removedKeyStrings);
 
                 for (int i = 0; i < keyStrings.size(); i++) {
                     List<SubscriptionNumber> tempSubscriptionNumbers = null;

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MsgsSecondCommonActivity.java

@@ -43,8 +43,8 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.appmessages.R;
-import com.modular.appmessages.db.MessageDao;
-import com.modular.appmessages.model.MessageModel;
+import com.core.dao.MessageDao;
+import com.core.model.MessageModel;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.java

@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
@@ -621,7 +622,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     String jp_status = jsonArray.getJSONObject(position).getString("JP_STATUS");
                     String jp_typecode = jsonArray.getJSONObject(position).getString("TYPECODE");
                     String jp_master = jsonArray.getJSONObject(position).getString("CURRENTMASTER");
-                    int tdem_imid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
+                    int tdem_imid = JSONUtil.getInt(jsonArray.getJSONObject(position), "EM_IMID");
                     model.name.setText(jp_launchername + "的" + jp_name);
                     if (jp_launchtime != null) {
                         model.date.setText(DateFormatUtil.getStrDate4Date(new Date(jp_launchtime), "MM-dd HH:mm") + "");
@@ -656,7 +657,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                     if (!StringUtil.isEmpty(jp_name)) jp_name = jp_name.replace("流程", "");
                     String jn_dealtime = jsonArray.getJSONObject(position).getString("JN_DEALTIME");//JP_LAUNCHTIME
                     String jn_dealresult = jsonArray.getJSONObject(position).getString("JN_DEALRESULT");
-                    int done_emid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
+                    int done_emid = JSONUtil.getInt(jsonArray.getJSONObject(position), "EM_IMID");
                     model.name.setText(jn_dealmanname + "的" + jp_name);
                     if (!StringUtil.isEmpty(jn_dealtime)) {
                         String ttt = DateFormatUtil.getStrDate4Date(new Date(TimeUtils.f_str_2_long(jn_dealtime)), "MM-dd HH:mm");
@@ -710,7 +711,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                         String nodename = jsonArray.getJSONObject(position).getString("JP_NODEDEALMANNAME");
                         JP_NODEID = jsonArray.getJSONObject(position).getString("JP_NODEID");
                         String codename = jsonArray.getJSONObject(position).getString("JP_NODENAME");
-                        int me_emid = jsonArray.getJSONObject(position).getInteger("EM_IMID");
+                        int me_emid = JSONUtil.getInt(jsonArray.getJSONObject(position), "EM_IMID");
                         if (!StringUtil.isEmpty(status)) {
                             if (status.equals("待审批")) {
                                 model.status.setTextColor(getResources().getColor(R.color.approvaling));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubcribeManageActivity.java → app_modular/appmessages/src/main/java/com/modular/appmessages/activity/SubcribeManageActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.modular.appmessages.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,16 +6,16 @@ import android.support.v4.app.Fragment;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.modular.appmessages.R;
+import com.modular.appmessages.adapter.SubscribeManegeVpAdapter;
+import com.modular.appmessages.fragment.BaseFragment;
+import com.modular.appmessages.fragment.SubscriptionAllFragment;
+import com.modular.appmessages.fragment.SubscriptionMyFragment;
+import com.modular.appmessages.ui.NoSlideViewpager;
 import com.viewpagerindicator.TabPageIndicator;
 import com.viewpagerindicator.UnderlinePageIndicator;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.SubscribeManegeVpAdapter;
-import com.xzjmyk.pm.activity.ui.erp.fragment.BaseFragment;
-import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionAllFragment;
-import com.xzjmyk.pm.activity.ui.erp.fragment.SubscriptionMyFragment;
-import com.xzjmyk.pm.activity.util.im.Constants;
-import com.xzjmyk.pm.activity.view.NoSlideViewpager;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubscribeDetailActivity.java → app_modular/appmessages/src/main/java/com/modular/appmessages/activity/SubscribeDetailActivity.java

@@ -1,5 +1,6 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.modular.appmessages.activity;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ -32,16 +33,16 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.umeng.socialize.media.UMImage;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.CommonUtil;
+import com.core.widget.crouton.Crouton;
+import com.modular.appmessages.R;
+import com.umeng.socialize.ShareAction;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
 
 import org.apache.http.cookie.Cookie;
 import org.json.JSONException;
@@ -80,7 +81,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                 case APPLY_DETAIL_SUBSCRIPTION:
                     progressDialog.dismiss();
                     Log.d("applysubscription", msg.getData().getString("result"));
-                    CommonUtil.imageToast(mContext, R.drawable.ic_apply_submit_success, "", 2000);
+//                    CommonUtil.imageToast(mContext, R.drawable.ic_apply_submit_success, "", 2000);
                     mSubStatus = 2;
                     mApplyButton.setText(getString(R.string.subscribe_requested));
                     mApplyButton.setEnabled(false);
@@ -140,26 +141,23 @@ public class SubscribeDetailActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.app_about:
-                new ShareAction(activity).setDisplayList(
-                        SHARE_MEDIA.SINA,
-                        SHARE_MEDIA.QQ,
-                        SHARE_MEDIA.QZONE,
-                        SHARE_MEDIA.WEIXIN,
-                        SHARE_MEDIA.WEIXIN_CIRCLE,
-                        SHARE_MEDIA.WEIXIN_FAVORITE,
-                        SHARE_MEDIA.MORE)
-                        .withTitle("UU互联订阅号")
-                        .withText(mSubName)
-                        .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                        .withTargetUrl(subscribeUrl + "&sessionUser=" + CommonUtil.getSharedPreferences(mContext, "erp_username"))
-                        .setCallback(CommonUtil.umShareListener)
-                        .open();
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.app_about) {
+            new ShareAction(activity).setDisplayList(
+                    SHARE_MEDIA.SINA,
+                    SHARE_MEDIA.QQ,
+                    SHARE_MEDIA.QZONE,
+                    SHARE_MEDIA.WEIXIN,
+                    SHARE_MEDIA.WEIXIN_CIRCLE,
+                    SHARE_MEDIA.WEIXIN_FAVORITE,
+                    SHARE_MEDIA.MORE)
+                    .withTitle("UU互联订阅号")
+                    .withText(mSubName)
+                    .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
+                    .withTargetUrl(subscribeUrl + "&sessionUser=" + CommonUtil.getSharedPreferences(mContext, "erp_username"))
+                    .setCallback(CommonUtil.umShareListener)
+                    .open();
+        } else if (android.R.id.home == item.getItemId()) {
+            onBackPressed();
         }
         return true;
     }
@@ -280,6 +278,7 @@ public class SubscribeDetailActivity extends BaseActivity {
         }
     }
 
+    @SuppressLint("NewApi")
     private void initViews() {
         mProgressBar = (ProgressBar) findViewById(R.id.subscribe_detail_pb);
         mApplyButton = (Button) findViewById(R.id.subscribe_detail_apply_btn);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/Subscription2Activity.java → app_modular/appmessages/src/main/java/com/modular/appmessages/activity/Subscription2Activity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.message;
+package com.modular.appmessages.activity;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -21,26 +21,22 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.SubMessage;
-import com.xzjmyk.pm.activity.db.dao.SubsDao;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.SubcribeManageActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
-import com.xzjmyk.pm.activity.ui.erp.adapter.SubscriptionAdapter;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.RecycleViewDivider;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.crouton.Style;
+import com.core.widget.RecycleViewDivider;
+import com.core.widget.crouton.Crouton;
+import com.core.widget.crouton.Style;
+import com.modular.appmessages.R;
+import com.modular.appmessages.adapter.SubscriptionAdapter;
+import com.modular.appmessages.db.SubsDao;
+import com.modular.appmessages.model.SubMessage;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -50,11 +46,8 @@ import java.util.Map;
 
 public class Subscription2Activity extends BaseActivity {
     private static final int REQUEST_SUBS_DETAIL = 0x20;
-    @ViewInject(R.id.swiperefresh)
     private SwipeRefreshLayout swiperefresh;
-    @ViewInject(R.id.recycler)
     private RecyclerView recycler;
-    @ViewInject(R.id.loading_tv)
     private TextView loading_tv;
 
     private long daylong = 24 * 1000 * 3600;
@@ -111,15 +104,12 @@ public class Subscription2Activity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.subscribe_manage:
-                Intent intent = new Intent();
-                intent.setClass(this, SubcribeManageActivity.class);
-                startActivity(intent);
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId()==R.id.subscribe_manage){
+            Intent intent = new Intent();
+            intent.setClass(this, SubcribeManageActivity.class);
+            startActivity(intent);
+        }else if (android.R.id.home==item.getItemId()){
+            onBackPressed();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -128,13 +118,16 @@ public class Subscription2Activity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_subscription2);
-        ViewUtils.inject(this);
         init();
         initView();
         initEvent();
     }
 
+
     private void initView() {
+        swiperefresh= (SwipeRefreshLayout) findViewById(R.id.swiperefresh);
+        recycler= (RecyclerView) findViewById(R.id.recycler);
+        loading_tv= (TextView) findViewById(R.id.loading_tv);
         ViewUtil.LoginERPTask(this, handler, 0x12);
         LinearLayoutManager layoutManager = new LinearLayoutManager(ct);
         recycler.setLayoutManager(layoutManager);
@@ -242,7 +235,7 @@ public class Subscription2Activity extends BaseActivity {
     private void clickItem(SubMessage bean, int position) {
         String url = baseUrl + "common/charts/mobileCharts.action";
         String title = bean.getTitle();
-        Intent intent_web = new Intent(ct, WebViewCommActivity.class);
+        Intent intent_web = new Intent("com.modular.main.WebViewCommActivity" );
         intent_web.putExtra("url", url);
         intent_web.putExtra("p", title);
         intent_web.putExtra("cookie", true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/AllRemovedSubsAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllRemovedSubsAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.os.Handler;
@@ -8,10 +8,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
 import com.core.model.SubscriptionNumber;
-import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
 import com.core.widget.MyListView;
+import com.modular.appmessages.R;
+import com.modular.appmessages.model.AllSubscriptonKindMessage;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/AllRemovedSubsItemAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllRemovedSubsItemAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.os.Handler;
@@ -8,11 +8,12 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.common.data.ListUtils;
 import com.common.preferences.SharedUtil;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SubscriptionNumber;
 import com.core.dao.DBManager;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.model.SubscriptionNumber;
+import com.core.utils.CommonUtil;
+import com.modular.appmessages.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +40,7 @@ public class AllRemovedSubsItemAdapter extends BaseAdapter {
         keyStrings = new ArrayList<>();
         cacheKeyStrings = new ArrayList<>();
         allKeyStrings = new ArrayList<>();
-        mDbManager = new DBManager(mContext);
+        mDbManager = new DBManager();
         currentMaster = CommonUtil.getSharedPreferences(mContext, "erp_master");
         currentUser = CommonUtil.getSharedPreferences(mContext, "erp_username");
 
@@ -96,7 +97,7 @@ public class AllRemovedSubsItemAdapter extends BaseAdapter {
                 String type = mSubscriptionNumbers.get(position).getType();
                 mSubscriptionNumbers.remove(position);
                 notifyDataSetChanged();
-                keyStrings = CommonUtil.getSingleElement(cacheKeyStrings);
+                keyStrings = ListUtils.getSingleElement(cacheKeyStrings);
                 initKeyStrings();
 
                 if (mSubscriptionNumbers.size() == 0){

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.modular.appmessages.adapter;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -15,14 +15,14 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.common.ui.ImageUtil;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.SubscriptionNumber;
+import com.core.app.Constants;
 import com.core.dao.DBManager;
+import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.CommonUtil;
+import com.core.widget.CustomProgressDialog;
+import com.core.widget.crouton.Crouton;
+import com.modular.appmessages.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -149,7 +149,7 @@ public class AllSubscriptionAdapter extends BaseAdapter {
                 case APPLY_SUBSCRIPTION:
                     progressDialog.dismiss();
                     Log.d("applysubscription", msg.getData().getString("result"));
-                    CommonUtil.imageToast(mContext, R.drawable.ic_apply_submit_success, "", 2000);
+//                    CommonUtil.imageToast(mContext, R.drawable.ic_apply_submit_success, "", 2000);
                     mSubscriptionNumbers.get(clickPosition).setStatus(2);
                     mDbManager.updateAllSubs(mSubscriptionNumbers.get(clickPosition));
                     notifyDataSetChanged();

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/AllSubscriptionNumbersAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/AllSubscriptionNumbersAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.modular.appmessages.adapter;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -11,13 +11,13 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
+import com.core.app.Constants;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.CommonUtil;
+import com.core.widget.CustomProgressDialog;
+import com.core.widget.crouton.Crouton;
+import com.modular.appmessages.R;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -136,7 +136,7 @@ public class AllSubscriptionNumbersAdapter extends BaseAdapter {
                 case APPLY_SUBSCRIPTION:
                     progressDialog.dismiss();
                     Log.d("applysubscription", msg.getData().getString("result"));
-                    CommonUtil.imageToast(mContext,R.drawable.ic_apply_submit_success,"",2000);
+//                    CommonUtil.imageToast(mContext,R.drawable.ic_apply_submit_success,"",2000);
                     mSubscriptionNumbers.get(clickPosition).setStatus(2);
                     notifyDataSetChanged();
                     break;

app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/ApprovalAdapter.java

@@ -407,19 +407,19 @@ public class ApprovalAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     }
 
     private void showTimeSelect(final TextView showView, final int position) {
-        DatePicker picker = new DatePicker(ct, DatePicker.YEAR_MONTH_DAY);
-        picker.setRange(2015, 2019, true);
-        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
-        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
-            @Override
-            public void onDatePicked(String year, String month, String day) {
-                String time = year + "-" + month + "-" + day;
-                LogUtil.i("time=" + time);
-                showView.setText(time);
-                approvals.get(position).setValues(time);
-            }
-        });
-        picker.show();
+//        DatePicker picker = new DatePicker(ct, DatePicker.YEAR_MONTH_DAY);
+//        picker.setRange(2015, 2019, true);
+//        picker.setSelectedItem(CalendarUtil.getYear(), CalendarUtil.getMonth(), CalendarUtil.getDay());
+//        picker.setOnDatePickListener(new DatePicker.OnYearMonthDayPickListener() {
+//            @Override
+//            public void onDatePicked(String year, String month, String day) {
+//                String time = year + "-" + month + "-" + day;
+//                LogUtil.i("time=" + time);
+//                showView.setText(time);
+//                approvals.get(position).setValues(time);
+//            }
+//        });
+//        picker.show();
     }
 
     private void selectItem(Approval approval, final int position) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/MySubscriptionAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/MySubscriptionAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -14,16 +14,16 @@ import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-import com.common.ui.ImageUtil;
 import com.common.system.DisplayUtil;
-import com.xzjmyk.pm.activity.R;
-import com.core.model.PersonalSubscriptionBean;
+import com.common.ui.ImageUtil;
+import com.core.app.Constants;
 import com.core.dao.DBManager;
+import com.core.model.PersonalSubscriptionBean;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.CommonUtil;
+import com.core.widget.CustomProgressDialog;
+import com.core.widget.crouton.Crouton;
+import com.modular.appmessages.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/NewSchedultAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/NewSchedultAdapter.java

@@ -1,6 +1,8 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.os.Build;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,11 +12,11 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.data.ObjectUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.modular.appmessages.R;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
-import com.common.data.ObjectUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -78,6 +80,7 @@ public class NewSchedultAdapter extends BaseAdapter {
     public long getItemId(int position) {
         return position;
     }
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     @Override
     public View getView(int position, View view, ViewGroup parent) {
         AllProcess fields_object = fList.get(position);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SchedultAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/SchedultAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.text.Html;
@@ -10,9 +10,9 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 import com.common.data.ObjectUtils;
+import com.modular.appmessages.R;
+import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 
 import java.text.SimpleDateFormat;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/SubsTypeAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/SubsTypeAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
+import com.modular.appmessages.R;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SubscribeManegeVpAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/SubscribeManegeVpAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
 import android.content.Context;
 import android.support.v4.app.Fragment;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/SubscriptionAdapter.java → app_modular/appmessages/src/main/java/com/modular/appmessages/adapter/SubscriptionAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.adapter;
+package com.modular.appmessages.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -7,12 +7,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.message.SubMessage;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.imageloader.LoadLocalImageUtil;
+import com.modular.appmessages.R;
+import com.modular.appmessages.model.SubMessage;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -99,7 +99,7 @@ public class SubscriptionAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 } else {
                     imageSrc = srcs[position % srcs.length];
                 }
-                LoadLocalImageUtil.getInstance().displayFromDrawable(imageSrc, viewHolder.item_image);
+                displayFromDrawable(imageSrc, viewHolder.item_image);
                 if (!bean.isRead()) {
                     isRead = MyApplication.getInstance().getString(R.string.unreaded);
                     isReColor = R.color.red;
@@ -124,6 +124,13 @@ public class SubscriptionAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         }
     }
 
+    public void displayFromDrawable(int imageId, ImageView imageView) {
+        // String imageUri = "drawable://" + R.drawable.image; // from drawables
+        // (only images, non-9patch)
+        ImageLoader.getInstance().displayImage("drawable://" + imageId,
+                imageView);
+    }
+
     private void initEvent(View itemView) {
         itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -165,6 +172,7 @@ public class SubscriptionAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
     public class TimeViewHolder extends RecyclerView.ViewHolder {
         TextView item_time_tv;
+
         public TimeViewHolder(View itemView) {
             super(itemView);
             item_time_tv = (TextView) itemView.findViewById(R.id.item_time_tv);

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SubsDao.java → app_modular/appmessages/src/main/java/com/modular/appmessages/db/SubsDao.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.db.dao;
+package com.modular.appmessages.db;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -6,13 +6,13 @@ import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.core.db.DatabaseManager;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
+import com.core.utils.CommonUtil;
+import com.modular.appmessages.model.SubMessage;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/BaseFragment.java → app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/BaseFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.fragment;
+package com.modular.appmessages.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,8 +8,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
+import com.core.widget.CustomProgressDialog;
+import com.modular.appmessages.R;
+
 
 /**
  * BaseFragment 采用工厂模式

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionAllFragment.java → app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/SubscriptionAllFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.fragment;
+package com.modular.appmessages.fragment;
 
 import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
@@ -20,16 +20,16 @@ import com.core.app.Constants;
 import com.core.dao.DBManager;
 import com.core.model.SubscriptionNumber;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.widget.EmptyLayout;
+import com.core.widget.crouton.Crouton;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.AllSubscriptionAdapter;
-import com.xzjmyk.pm.activity.adapter.SubsTypeAdapter;
-import com.xzjmyk.pm.activity.bean.message.AllSubscriptonKindMessage;
-import com.xzjmyk.pm.activity.ui.erp.activity.SubscribeDetailActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.modular.appmessages.R;
+import com.modular.appmessages.activity.SubscribeDetailActivity;
+import com.modular.appmessages.adapter.AllSubscriptionAdapter;
+import com.modular.appmessages.adapter.SubsTypeAdapter;
+import com.modular.appmessages.model.AllSubscriptonKindMessage;
 
 import org.json.JSONArray;
 import org.json.JSONException;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/SubscriptionMyFragment.java → app_modular/appmessages/src/main/java/com/modular/appmessages/fragment/SubscriptionMyFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.fragment;
+package com.modular.appmessages.fragment;
 
 import android.content.Intent;
 import android.os.Handler;
@@ -13,14 +13,14 @@ import com.core.app.Constants;
 import com.core.dao.DBManager;
 import com.core.model.PersonalSubscriptionBean;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.MySubscriptionAdapter;
-import com.xzjmyk.pm.activity.ui.erp.activity.SubscribeDetailActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.modular.appmessages.R;
+import com.modular.appmessages.activity.SubscribeDetailActivity;
+import com.modular.appmessages.adapter.MySubscriptionAdapter;
 
 import org.json.JSONArray;
 import org.json.JSONException;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/AllSubscriptonKindMessage.java → app_modular/appmessages/src/main/java/com/modular/appmessages/model/AllSubscriptonKindMessage.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.message;
+package com.modular.appmessages.model;
 
 import com.core.model.SubscriptionNumber;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SubMessage.java → app_modular/appmessages/src/main/java/com/modular/appmessages/model/SubMessage.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.message;
+package com.modular.appmessages.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/message/SubscriptionMessage.java → app_modular/appmessages/src/main/java/com/modular/appmessages/model/SubscriptionMessage.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.message;
+package com.modular.appmessages.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/NoSlideViewpager.java → app_modular/appmessages/src/main/java/com/modular/appmessages/ui/NoSlideViewpager.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view;
+package com.modular.appmessages.ui;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/WorkDailyAddActivity.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
+import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiConfig;
@@ -33,7 +34,6 @@ import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.RecognizerDialogUtil;
-import com.core.utils.TimeUtils;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.xmpp.utils.audio.voicerecognition.JsonParser;