20:39

WeiChat/build.gradle

@@ -102,6 +102,7 @@ dependencies {
   //  compile project(':applogin')
 //    compile project(':message')
     compile project(':appcontact')
+    compile project(':appme')
  
 }
 

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

@@ -53,12 +53,13 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
-import com.core.constant.AppConstant;
 import com.core.broadcast.MsgBroadcast;
+import com.core.constant.AppConstant;
 import com.core.dao.UserDao;
 import com.core.model.CircleMessage;
 import com.core.model.NewFriendMessage;
 import com.core.model.User;
+import com.core.model.WorkModel;
 import com.core.net.NetWorkObservable;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ArrayResult;
@@ -67,23 +68,23 @@ import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;
 import com.core.utils.IntentUtils;
 import com.core.utils.helper.LoginHelper;
+import com.core.xmpp.CoreService;
+import com.core.xmpp.ListenerManager;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.AuthStateListener;
+import com.me.appme.MeFragment;
 import com.uas.appcontact.listener.ImStatusListener;
+import com.uas.appcontact.ui.fragment.ContactFragment;
+import com.uas.appcontact.ui.fragment.GroupChatFragment;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
-import com.uas.appcontact.ui.fragment.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
-import com.core.model.WorkModel;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
-import com.uas.appcontact.ui.fragment.GroupChatFragment;
-import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.me.ScreenListener;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
@@ -93,8 +94,6 @@ import com.xzjmyk.pm.activity.util.oa.AutoErpService;
 import com.xzjmyk.pm.activity.util.oa.BadgeUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.DivideRadioGroup;
-import com.core.xmpp.CoreService;
-import com.core.xmpp.ListenerManager;
 import com.xzjmyk.pm.newpedo.service.StepService;
 import com.xzjmyk.pm.newpedo.utils.StepCountCheckUtil;
 
@@ -107,6 +106,7 @@ import java.util.Map;
 import static android.view.View.GONE;
 
 
+
 public class MainActivity extends BaseActivity implements ImStatusListener, NetWorkObservable.NetWorkObserver, AuthStateListener {
     private static final int LOG_SEND_REQUEST = 17519;
     public static String HASHCODE = "MainActivity";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -37,6 +37,7 @@ 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.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -44,13 +45,9 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.OfficeAddressBean;
 import com.xzjmyk.pm.activity.bean.oa.PlatSignAddressBean;
 import com.xzjmyk.pm.activity.bean.oa.SearchPoiParam;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
-import com.core.model.SelectBean;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchLocationActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import org.json.JSONArray;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SignSeniorSettingActivity.java

@@ -22,25 +22,16 @@ 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.model.OAConfig;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.utils.WorkHandlerUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
-import com.core.model.SelectBean;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
-import com.xzjmyk.pm.activity.util.oa.WorkHandlerUtil;
-import com.core.model.OAConfig;
-import com.core.utils.WorkHandlerUtil;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/ContactsAdapter.java

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import com.core.app.MyApplication;
 import com.core.utils.helper.AvatarHelper;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.model.contacts.ContactsModel;
 
 import java.util.ArrayList;
@@ -22,7 +22,7 @@ import java.util.List;
  */
 
 public class ContactsAdapter extends BaseAdapter {
-    
+
     private Context ct;
     private ResultItemsInface resultItemsInface;
     private List<ContactsModel> models=new ArrayList<>();

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/FriendSortAdapter.java

@@ -17,7 +17,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.sortlist.BaseSortModel;
 import com.core.widget.stickylistheaders.StickyListHeadersAdapter;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/NewFriendAdapter.java

@@ -15,7 +15,7 @@ import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.FriendDao;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.List;
 

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/UUFriendSortAdapter.java

@@ -16,7 +16,7 @@ import com.core.model.Friend;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.crouton.Crouton;
 import com.core.widget.sortlist.BaseSortModel;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appcontact/src/main/java/com/uas/appcontact/adapter/UserAdapter.java

@@ -14,7 +14,7 @@ import com.common.ui.ViewHolder;
 import com.core.app.MyApplication;
 import com.core.model.User;
 import com.core.utils.helper.AvatarHelper;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.text.DecimalFormat;
 import java.util.List;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ChatActivity.java

@@ -61,8 +61,8 @@ import com.core.xmpp.utils.flie.FileUtils;
 import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;
+import com.me.appcontact.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.uas.appcontact.R;
 
 import java.io.File;
 import java.util.ArrayList;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CommonFragmentActivity.java

@@ -6,7 +6,7 @@ import android.widget.FrameLayout;
 
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.ui.fragment.AutoCreateChatFragment;
 import com.uas.appcontact.ui.fragment.GroupChatFragment;
 

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/CompanyContactsActivity.java

@@ -53,7 +53,7 @@ import com.core.widget.SuperSwipeRefreshLayout;
 import com.core.widget.VoiceSearchView;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -66,7 +66,7 @@ import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.adapter.ContactsAdapter;
 import com.uas.appcontact.db.ContactsDao;
 import com.uas.appcontact.model.contacts.Contacts;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/MyFriendActivity.java

@@ -48,7 +48,7 @@ import com.core.xmpp.listener.OnCompleteListener;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.adapter.UUFriendSortAdapter;
 
 import java.util.ArrayList;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/NewFriendActivity.java

@@ -40,7 +40,7 @@ import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.adapter.NewFriendAdapter;
 
 import java.util.ArrayList;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/PlatContactAddPeopleActivity.java

@@ -21,7 +21,7 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/SelectDateActivity.java

@@ -12,7 +12,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import com.core.app.ActionBackActivity;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/UserListActivity.java

@@ -21,7 +21,7 @@ import com.core.utils.ToastUtil;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.adapter.UserAdapter;
 
 import java.util.ArrayList;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/UserSearchActivity.java

@@ -14,7 +14,7 @@ import android.widget.Toast;
 import com.common.data.StringUtil;
 import com.core.app.ActionBackActivity;
 import com.core.utils.ToastUtil;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 /**
  * 搜索职位筛选界面

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/AutoCreateChatFragment.java

@@ -62,7 +62,7 @@ import com.core.xmpp.model.MucRoom;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactFragment.java

@@ -49,7 +49,7 @@ import com.core.widget.sortlist.PingYinUtil;
 import com.core.widget.sortlist.SideBar;
 import com.core.widget.stickylistheaders.StickyListHeadersListView;
 import com.core.xmpp.utils.AppConstant;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.uas.appcontact.listener.ImStatusListener;
 import com.uas.appcontact.ui.activity.ChatActivity;

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/GroupChatFragment.java

@@ -43,7 +43,7 @@ import com.core.xmpp.model.MucRoom;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appcontact.R;
+import com.me.appcontact.R;
 import com.uas.appcontact.ui.activity.CommonFragmentActivity;
 
 import java.util.ArrayList;

app_modular/applogin/src/main/java/com/modular/login/LoginActivity.java

@@ -120,7 +120,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
+        if (v.getId() == R.id.login_btn){
+            login();
+        }else if (v.getId() == R.id.tv_register){
+//            startActivity(new Intent(mContext,RegisterSelectActivity.class));
+        }else if (v.getId() == R.id.tv_findPwd){
+            IntentUtils.webLinks(mContext,
+                    "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
+                    getString(R.string.login_getpwd));
+        }
+       /* switch (v.getId()) {
             case R.id.login_btn:
                 login();
                 break;
@@ -132,7 +141,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                         "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
                         getString(R.string.login_getpwd));
                 break;
-        }
+        }*/
     }
 
     private void login() {

app_modular/appme/build.gradle

@@ -22,5 +22,6 @@ dependencies {
     compile project(':common')
 //    compile project(':message')
     compile project(':appworks')
-
+    compile project(':applogin')
+    compile project(':appcontact')
 }

app_modular/appme/src/main/java/com/me/appme/settings/activity/FeedbackActivity.java

@@ -43,6 +43,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.constant.AppConstant;
+import com.core.model.UploadFileResult;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
@@ -59,6 +60,7 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.me.appme.R;
 import com.me.appme.settings.model.Area;
+import com.modular.login.LoginActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.io.File;

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/adapter/FlightsAdapter.java

@@ -10,8 +10,8 @@ import android.widget.TextView;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
-import com.me.appme.R;
 import com.me.appworks.OA.erp.model.FlightsModel;
+import com.me.appworks.R;
 
 import java.util.List;
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/model/FlightsModel.java

@@ -7,7 +7,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.utils.TimeUtils;
-import com.me.appme.R;
+import com.me.appworks.R;
 
 
 /**

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/model/SelectCollisionTurnBean.java

@@ -4,7 +4,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.core.app.MyApplication;
-import com.me.appme.R;
+import com.me.appworks.R;
 
 import java.util.List;
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/presenter/AddFlihtsPresenter.java

@@ -20,13 +20,13 @@ import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
-import com.me.appme.R;
 import com.me.appworks.OA.erp.model.EmployeesModel;
 import com.me.appworks.OA.erp.model.FlightsModel;
 import com.me.appworks.OA.erp.model.FlightsTimeModel;
 import com.me.appworks.OA.erp.model.HrorgsModel;
 import com.me.appworks.OA.erp.model.SelectEmUser;
 import com.me.appworks.OA.erp.view.IAddFlihtsView;
+import com.me.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -515,20 +515,16 @@ public class AddFlihtsPresenter implements OnHttpResultListener {
     }
 
     public void putData2Intent(int id, Intent intent) {
-        switch (id) {
-            case R.id.date_tv:
-                String day = model.getDay();
-                Log.i("gongpengming", "day=" + day);
-                intent.putExtra("day", day);
-                break;
-            case R.id.time_tv:
-                FlightsTimeModel timeModel = model.getTimeModel();
-                intent.putExtra("model", timeModel);
-                break;
-            case R.id.munber_tv:
-                EmployeesModel employeesModel = model.getEmployeesModel();
-                intent.putExtra(OAConfig.STRING_DATA, employeesModel.getEmployeeNames());
-                break;
+        if (id == R.id.date_tv){
+            String day = model.getDay();
+            Log.i("gongpengming", "day=" + day);
+            intent.putExtra("day", day);
+        }else if (id == R.id.time_tv){
+            FlightsTimeModel timeModel = model.getTimeModel();
+            intent.putExtra("model", timeModel);
+        }else if (id == R.id.munber_tv){
+            EmployeesModel employeesModel = model.getEmployeesModel();
+            intent.putExtra(OAConfig.STRING_DATA, employeesModel.getEmployeeNames());
         }
     }
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/presenter/FlightsPresernter.java

@@ -16,11 +16,11 @@ 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.CommonUtil;
-import com.me.appme.R;
 import com.me.appworks.OA.erp.model.EmployeesModel;
 import com.me.appworks.OA.erp.model.FlightsModel;
 import com.me.appworks.OA.erp.model.FlightsTimeModel;
 import com.me.appworks.OA.erp.view.IFlightsView;
+import com.me.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/view/IAddFlihtsView.java

@@ -1,7 +1,7 @@
 package com.me.appworks.OA.erp.view;
 
 
-import com.core.view.imp.HttpImp;
+import com.core.base.HttpImp;
 import com.me.appworks.OA.erp.model.FlightsModel;
 import com.me.appworks.OA.erp.model.SelectEmUser;
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/view/IFlightsView.java

@@ -1,6 +1,6 @@
 package com.me.appworks.OA.erp.view;
 
-import com.core.view.imp.HttpImp;
+import com.core.base.HttpImp;
 import com.me.appworks.OA.erp.model.FlightsModel;
 
 import java.util.List;