合并draft分支

app_modular/appmessages/build.gradle

@@ -27,5 +27,4 @@ dependencies {
     compile project(':common')
     compile project(':network')
     compile project(':appworks')
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }

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

@@ -35,6 +35,8 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.dao.MessageDao;
+import com.core.model.MessageModel;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -43,8 +45,6 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.appmessages.R;
-import com.core.dao.MessageDao;
-import com.core.model.MessageModel;
 
 import java.util.ArrayList;
 import java.util.HashMap;