push

WeiChat/src/main/AndroidManifest.xml

@@ -274,7 +274,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="com.me.appme.other.activity.RoomInfoActivity"/>
+        <activity android:name="com.uas.appme.other.activity.RoomInfoActivity"/>
         <activity
             android:name=".ui.message.AddContactsActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -335,16 +335,16 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.me.appme.settings.activity.SettingActivity"
+            android:name="com.uas.appme.settings.activity.SettingActivity"
             android:configChanges="keyboardHidden|orientation"
             android:screenOrientation="portrait"/>
-        <activity android:name="com.me.appme.settings.activity.AboutActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.AboutActivity"/>
         <activity android:name=".video.VideoRecordActivity"/>
         <activity
-            android:name="com.me.appme.other.activity.CardcastActivity"
+            android:name="com.uas.appme.other.activity.CardcastActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
         <activity
-            android:name="com.me.appme.other.activity.BasicInfoEditActivity"
+            android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
         <activity android:name=".CaptureResultActivity"/>
         <activity android:name=".CommonWebviewActivity"/>
@@ -353,7 +353,7 @@
             android:name=".ui.tool.MultiImagePreviewActivity"
             android:configChanges="orientation|screenSize" />
         <activity
-            android:name="com.me.appme.other.activity.SelectAreaActivity"
+            android:name="com.uas.appme.other.activity.SelectAreaActivity"
             android:screenOrientation="portrait"/>
         <activity
             android:name=".ui.tool.SelectConstantActivity"
@@ -370,7 +370,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.me.appme.other.activity.BasicInfoActivity"
+            android:name="com.uas.appme.other.activity.BasicInfoActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.modular.basic.BasicInfoActivity" />
@@ -534,7 +534,7 @@
             android:name=".video.VideoActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar"/>
         <activity android:name=".ui.erp.activity.CompanyActivity"/>
-        <activity android:name="com.me.appme.settings.activity.BaseInfoActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.BaseInfoActivity"/>
         <activity android:name=".ui.circle.PhoneSelectActivity"/>
         <activity android:name=".ui.erp.activity.crm.ClientActivity"/>
         <activity android:name=".ApplySubscribeActivity"/>
@@ -681,10 +681,10 @@
             android:label="@string/my_mission"
             android:theme="@style/OAThemeOutOffice"/>
         <activity android:name=".ui.erp.activity.crm.SubsActivity"/>
-        <activity android:name="com.me.appme.other.activity.UpdateSingleTextActivity"/>
-        <activity android:name="com.me.appme.other.activity.UpdateSexActivity"/>
+        <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity"/>
+        <activity android:name="com.uas.appme.other.activity.UpdateSexActivity"/>
         <activity
-            android:name="com.me.appme.settings.activity.FeedbackActivity"
+            android:name="com.uas.appme.settings.activity.FeedbackActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
         <activity android:name=".ui.erp.activity.oa.OAActivity"/>
         <activity android:name=".ui.erp.activity.oa.OAMainActivity"/>
@@ -903,20 +903,20 @@
             android:label="@string/activity_visit_aims"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity
-            android:name="com.me.appworks.OA.erp.activity.FlightsActivity"
+            android:name="com.uas.appworks.OA.erp.activity.FlightsActivity"
             android:label="@string/activity_flights"/>
 
         <!-- 打卡2.0模块 -->
         <activity
-            android:name="com.me.appworks.OA.erp.activity.OfficeAddressSettingsActivity"
+            android:name="com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity"
             android:label="@string/office_addr_setting"/>
         <activity
-            android:name="com.me.appworks.OA.erp.activity.SignSeniorSettingActivity"
+            android:name="com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity"
             android:label="@string/super_setting"/>
         <activity
             android:name=".ui.erp.activity.form.SelectCalendarActivity"
             android:label="@string/title_activity_select_calendar"/>
-        <activity android:name="com.me.appworks.OA.erp.activity.AddFlihtsActivity"/>
+        <activity android:name="com.uas.appworks.OA.erp.activity.AddFlihtsActivity"/>
         <activity
             android:name=".ui.erp.activity.oa.FlihtsTimeActivity"
             android:label="@string/work_time_setting" />
@@ -924,7 +924,7 @@
             android:name=".ui.erp.activity.oa.FlightsDateActivity"
             android:label="@string/work_day_setting" />
         <activity
-            android:name="com.me.appworks.OA.erp.activity.MyRuleSetActivity"
+            android:name="com.uas.appworks.OA.erp.activity.MyRuleSetActivity"
             android:label="@string/my_rule_setting"/>
             android:name="com.me.appworks.OA.erp.activity.HolidaysActivity"
             android:label="@string/holidays"/>
@@ -1002,7 +1002,7 @@
             android:exported="true"/>
         <!-- 计步功能 服务 -->
         <service
-            android:name="com.me.appme.pedometer.service.StepService"
+            android:name="com.uas.appme.pedometer.service.StepService"
             android:priority="1000"
             android:process="com.spring.stepcount.service">
             <intent-filter>
@@ -1037,7 +1037,7 @@
         <activity
             android:name=".ui.erp.activity.crm.AddBusinessActivity"
             android:label="@string/crm_creat_business"/>
-        <activity android:name="com.me.appme.settings.activity.SelectLanguageActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.SelectLanguageActivity"/>
         <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"/>
         <activity
             android:name=".ui.me.InfoCodeActivity"
@@ -1057,7 +1057,7 @@
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
             android:windowSoftInputMode="adjustPan"/>
-        <activity android:name="com.me.appme.settings.activity.BookingSetActivity"/>
+        <activity android:name="com.uas.appme.settings.activity.BookingSetActivity"/>
         <activity
             android:name="com.xzjmyk.pm.pictureselector.PictureSelectorDemo"
             android:label="PictureSelectorDemo" />

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

@@ -72,9 +72,9 @@ 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.pedometer.service.StepService;
-import com.me.appme.pedometer.utils.StepCountCheckUtil;
-import com.me.appme.settings.activity.FeedbackActivity;
+import com.uas.appme.pedometer.service.StepService;
+import com.uas.appme.pedometer.utils.StepCountCheckUtil;
+import com.uas.appme.settings.activity.FeedbackActivity;
 import com.uas.appcontact.listener.ImStatusListener;
 import com.uas.appcontact.ui.fragment.GroupChatFragment;
 import com.uas.appcontact.ui.fragment.ContactsFragment;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterUserBasicInfoActivity.java

@@ -39,7 +39,7 @@ import com.core.xmpp.model.Area;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
-import com.me.appme.other.activity.SelectAreaActivity;
+import com.uas.appme.other.activity.SelectAreaActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -50,7 +50,7 @@ import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.me.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleFragment.java

@@ -38,8 +38,8 @@ 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.me.appme.other.activity.BasicInfoActivity;
-import com.me.appme.other.widget.SelectPicPopupWindow;
+import com.uas.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.widget.SelectPicPopupWindow;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PersonalQzoneActivity.java

@@ -53,7 +53,7 @@ import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.me.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
 import com.xzjmyk.pm.activity.R;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -1030,7 +1030,7 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
             MsgBroadcast.broadcastMsgNumReset(CardInfoActivity.this);
             Intent intent = new Intent(mContext, ChatActivity.class);
             mFriend.setRemarkName(userName);
-            intent.putExtra(ChatActivity.FRIEND, mFriend);
+            intent.putExtra(AppConstant.FRIEND, mFriend);
             startActivity(intent);
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/PMsgDetailHeaderView.java

@@ -27,7 +27,7 @@ import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
-import com.me.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.BasicInfoActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;

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

@@ -24,7 +24,7 @@ import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.EmployeesModel;
+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.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;

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

@@ -39,7 +39,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -49,7 +49,7 @@ import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.EmployeesModel;
+import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionActivity;

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

@@ -37,7 +37,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;

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

@@ -37,7 +37,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -25,7 +25,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;

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

@@ -27,7 +27,7 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.EmployeesModel;
+import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;

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

@@ -39,7 +39,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;

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

@@ -32,7 +32,7 @@ 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.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

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

@@ -26,7 +26,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshGridView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appme.settings.model.Business;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;

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

@@ -34,8 +34,8 @@ import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;

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

@@ -38,8 +38,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.AppWebViewActivity;

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

@@ -29,9 +29,9 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-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.uas.appworks.OA.erp.model.EmployeesModel;
+import com.uas.appworks.OA.erp.model.FlightsModel;
+import com.uas.appworks.OA.erp.model.FlightsTimeModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.calenderlist.DatePickerController;
 import com.xzjmyk.pm.activity.ui.erp.view.calenderlist.DayPickerView;

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

@@ -18,8 +18,8 @@ import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.FlightsTimeModel;
-import com.me.appworks.OA.erp.utils.MostLinearLayoutManager;
+import com.uas.appworks.OA.erp.model.FlightsTimeModel;
+import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -32,7 +32,7 @@ import com.core.net.location.BdLocationHelper;
 import com.core.utils.TimeUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.utils.MostLinearLayoutManager;
+import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MissionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;

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

@@ -42,8 +42,8 @@ import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;

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

@@ -22,8 +22,8 @@ import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectCollisionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;

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

@@ -34,7 +34,7 @@ import com.core.widget.ClearEditText;
 import com.core.widget.listener.EditChangeListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.HrorgsModel;
+import com.uas.appworks.OA.erp.model.HrorgsModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.MyTreeListViewAdapter;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.Node;

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

@@ -35,10 +35,10 @@ import com.core.model.WorkModel;
 import com.core.net.location.BdLocationHelper;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.activity.FlightsActivity;
-import com.me.appworks.OA.erp.activity.MyRuleSetActivity;
-import com.me.appworks.OA.erp.activity.OfficeAddressSettingsActivity;
-import com.me.appworks.OA.erp.activity.SignSeniorSettingActivity;
+import com.uas.appworks.OA.erp.activity.FlightsActivity;
+import com.uas.appworks.OA.erp.activity.MyRuleSetActivity;
+import com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity;
+import com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.WorkAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.WorkPresenter;

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

@@ -40,8 +40,8 @@ import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;

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

@@ -30,8 +30,8 @@ import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.SideBar;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectPCollisionAdapter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;

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

@@ -39,8 +39,8 @@ import com.core.xmpp.CoreService;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.dao.NewFriendDao;
 import com.core.xmpp.model.AddAttentionResult;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.uas.appcontact.model.contacts.Contacts;
 import com.uas.appcontact.utils.ContactsUtils;
 import com.xzjmyk.pm.activity.R;

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

@@ -16,7 +16,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.widget.listener.EditChangeListener;
-import com.me.appworks.OA.erp.model.EmployeesModel;
+import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.List;

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

@@ -13,7 +13,7 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.List;

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

@@ -15,7 +15,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.List;

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

@@ -37,7 +37,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.me.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.BasicInfoActivity;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
@@ -183,7 +183,7 @@ public class UUFriendFragment extends EasyFragment {
                     intent = new Intent(ct, NewFriendActivity.class);
                 } else if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 新朋友消息
                     intent = new Intent(ct, ChatActivity.class);
-                    intent.putExtra(ChatActivity.FRIEND, friend);
+                    intent.putExtra(AppConstant.FRIEND, friend);
 
                 } else {
                     intent = new Intent(ct, BasicInfoActivity.class);

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

@@ -1,6 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.model;
 
-import com.me.appme.other.model.Master;
+import com.uas.appme.other.model.Master;
 
 import java.io.Serializable;
 

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

@@ -845,7 +845,7 @@ public class MessagePresenter implements OnHttpResultListener {
                 mContext.startActivity(new Intent(mContext, NewFriendActivity.class));
             } else {
                 Intent intent = new Intent(mContext, ChatActivity.class);
-                intent.putExtra(ChatActivity.FRIEND, friend);
+                intent.putExtra(AppConstant.FRIEND, friend);
                 mContext.startActivity(intent);
             }
         } else {

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

@@ -22,8 +22,8 @@ import com.core.utils.CompanyHandlerInfoUtil;
 import com.core.utils.sortlist.BaseComparator;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.PingYinUtil;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.uas.appcontact.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;

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

@@ -2,7 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.presenter.imp;
 
 import com.core.base.HttpImp;
 import com.core.utils.sortlist.BaseSortModel;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/tree/MyTreeListViewAdapter.java

@@ -13,8 +13,8 @@ import android.widget.TextView;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.MyApplication;
-import com.me.appworks.OA.erp.model.BaseNodeBean;
-import com.me.appworks.OA.erp.model.HrorgsModel;
+import com.uas.appworks.OA.erp.model.BaseNodeBean;
+import com.uas.appworks.OA.erp.model.HrorgsModel;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/tree/Node.java

@@ -1,7 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.view.tree;
 
 
-import com.me.appworks.OA.erp.model.BaseNodeBean;
+import com.uas.appworks.OA.erp.model.BaseNodeBean;
 
 import java.util.ArrayList;
 import java.util.List;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/tree/TreeHelper.java

@@ -1,7 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.view.tree;
 
 
-import com.me.appworks.OA.erp.model.BaseNodeBean;
+import com.uas.appworks.OA.erp.model.BaseNodeBean;
 import com.xzjmyk.pm.activity.R;
 
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/view/tree/TreeListViewAdapter.java

@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import com.me.appworks.OA.erp.model.BaseNodeBean;
+import com.uas.appworks.OA.erp.model.BaseNodeBean;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/find/MyFriendFragment.java

@@ -9,9 +9,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.RadioGroup;
 
-import com.me.appme.other.fragment.AttentionFragment;
-import com.me.appme.other.fragment.FriendFragment;
-import com.me.appme.other.fragment.RoomFragment;
+import com.uas.appme.other.fragment.AttentionFragment;
+import com.uas.appme.other.fragment.FriendFragment;
+import com.uas.appme.other.fragment.RoomFragment;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;

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

@@ -40,9 +40,10 @@ import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appme.other.model.Master;
-import com.me.appme.settings.activity.BaseInfoActivity;
-import com.me.appme.widget.MasterDialog;
+import com.uas.appme.other.model.Master;
+import com.uas.appme.settings.activity.BaseInfoActivity;
+import com.uas.appme.settings.activity.SettingActivity;
+import com.uas.appme.widget.MasterDialog;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.xzjmyk.pm.activity.CaptureResultActivity;
 import com.xzjmyk.pm.activity.R;
@@ -438,7 +439,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(intent);
                 break;
             case R.id.setting_rl:// 设置
-                startActivity(new Intent(getActivity(), com.me.appme.settings.activity.SettingActivity.class));
+                startActivity(new Intent(getActivity(), SettingActivity.class));
                 CommonUtil.setSharedPreferences(ct, Constants.NEW_SETING, true);
                 tv_menu_setting.setVisibility(View.GONE);
                 tv_oa_desc.setVisibility(View.GONE);

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

@@ -61,7 +61,7 @@ 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.uas.appcontact.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.io.File;
@@ -87,7 +87,7 @@ import java.util.UUID;
  */
 public class ChatActivity extends ActionBackActivity
         implements ChatContentView.MessageEventListener, ChatBottomView.ChatBottomListener, ChatMessageListener {
-    public static final String FRIEND = "friend";
+
 
     @SuppressWarnings("unused")
     private TextView mAuthStateTipTv;
@@ -311,7 +311,7 @@ public class ChatActivity extends ActionBackActivity
         super.onDestroy();
         mChatBottomView.recordCancel();
         if (mFastVolley != null)
-            mFastVolley.cancelAll(FRIEND);
+            mFastVolley.cancelAll(AppConstant.FRIEND);
         ListenerManager.getInstance().removeChatMessageListener(this);
         unbindService(mConnection);
         unregisterReceiver(broadcastReceiver);
@@ -970,7 +970,7 @@ public class ChatActivity extends ActionBackActivity
                 }
             }
         }, User.class, params);
-        mFastVolley.addDefaultRequest(FRIEND, request);
+        mFastVolley.addDefaultRequest(AppConstant.FRIEND, request);
     }
 
 

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

@@ -120,7 +120,7 @@ public class InstantMessageActivity extends BaseActivity implements OnClickListe
                               /*此处传文件这里message是没有什么用的,不过因为之前在chatactivity中已经对逻辑有了instantmessage非空的判断,所以这里就带上 */
                             intent.putExtra(Constants.INSTANT_MESSAGE_FILE, instantFilePath);
                             intent.putExtras(bundle);
-                            intent.putExtra(ChatActivity.FRIEND, friend);
+                            intent.putExtra(AppConstant.FRIEND, friend);
                             startActivity(intent);
                         }
                     } else {// 群聊

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

@@ -57,8 +57,8 @@ import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;
 import com.ipaulpro.afilechooser.FileUtils;
-import com.me.appme.other.activity.BasicInfoActivity;
-import com.me.appme.other.activity.RoomInfoActivity;
+import com.uas.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.RoomInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.core.app.ActionBackActivity;

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

@@ -22,11 +22,11 @@ import com.core.utils.sortlist.PingYinUtil;
 import com.core.utils.sortlist.SideBar;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.model.ChatMessage;
+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.adapter.FriendSortAdapter;
-import com.uas.appcontact.ui.activity.ChatActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.im.Constants;
 
@@ -184,7 +184,7 @@ public class SelectNewContactsActivity extends BaseActivity implements OnClickLi
 				 * broadcast.putExtras(bundle); sendBroadcast(broadcast);
 				 */
                     Intent intent = new Intent(SelectNewContactsActivity.this, ChatActivity.class);
-                    intent.putExtra(ChatActivity.FRIEND, friend);
+                    intent.putExtra(AppConstant.FRIEND, friend);
                     Bundle bundle = new Bundle();
                     bundle.putParcelable(Constants.INSTANT_MESSAGE, message);
                     intent.putExtras(bundle);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/ComplaintDetailActivity.java

@@ -36,8 +36,8 @@ import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/pageforms/FormDetailActivity.java

@@ -46,8 +46,8 @@ import com.core.utils.helper.AvatarHelper;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;

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

@@ -39,8 +39,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;

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

@@ -29,8 +29,8 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
-import com.me.appworks.OA.erp.model.SelectEmUser;
+import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/im/UserRoleUtils.java

@@ -6,7 +6,7 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.utils.CommonUtil;
-import com.me.appme.settings.activity.SettingActivity;
+import com.uas.appme.settings.activity.SettingActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
 import com.xzjmyk.pm.activity.ui.message.MessageFragment;

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

@@ -29,7 +29,7 @@ import com.core.model.OAConfig;
 import com.core.model.WorkModel;
 import com.core.utils.CommonInterface;
 import com.core.utils.TimeUtils;
-import com.me.appme.pedometer.service.StepService;
+import com.uas.appme.pedometer.service.StepService;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.MessageDao;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;

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

@@ -25,7 +25,7 @@ import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.TimeUtils;
-import com.me.appme.pedometer.utils.TimeUtil;
+import com.uas.appme.pedometer.utils.TimeUtil;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;

app_core/common/src/main/java/com/core/constant/AppConstant.java

@@ -57,4 +57,5 @@ public class AppConstant {
 
     public static final String UPHEAD = "UPHEAD";
     public  static  final  String BAIDU_PUSH = "BAIDU_PUSH";
+    public static final String FRIEND = "friend";
 }

app_core/common/src/main/java/com/core/xmpp/utils/AppConstant.java

@@ -49,5 +49,5 @@ public class AppConstant {
 
     /* 进入SingleImagePreviewActivity需要带上的参数 */
     public static final String EXTRA_IMAGE_URI = "image_uri";
-
+    public static final String FRIEND = "friend";
 }

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.me.appcontact.R;
+import com.uas.appcontact.R;
 import com.uas.appcontact.model.contacts.ContactsModel;
 
 import java.util.ArrayList;

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

@@ -14,10 +14,10 @@ import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.core.model.Friend;
 import com.core.utils.helper.AvatarHelper;
-import com.core.widget.crouton.Crouton;
 import com.core.utils.sortlist.BaseSortModel;
-import com.core.widget.stickylistheaders.StickyListHeadersAdapter;
-import com.me.appcontact.R;
+import com.core.widget.crouton.Crouton;
+import com.uas.appcontact.R;
+import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersAdapter;
 
 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.me.appcontact.R;
+import com.uas.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.utils.sortlist.BaseSortModel;
-import com.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.appcontact.R;
 
 import java.text.DecimalFormat;
 import java.util.List;

app_modular/appcontact/src/main/java/com/uas/appcontact/manager/ContactsManager.java

@@ -1,4 +1,4 @@
-package com.uas.manager;
+package com.uas.appcontact.manager;
 
 
 import android.os.Bundle;

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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.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.me.appcontact.R;
+import com.uas.appcontact.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -33,16 +33,15 @@ import com.core.model.EmployeesEntity;
 import com.core.model.Friend;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.CommonUtil;
-import com.core.widget.CustomProgressDialog;
-import com.core.widget.VoiceSearchView;
-import com.core.widget.listener.EditChangeListener;
 import com.core.utils.sortlist.BaseComparator;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.PingYinUtil;
 import com.core.utils.sortlist.SideBar;
-import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
+import com.core.widget.CustomProgressDialog;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
 import com.core.xmpp.utils.AppConstant;
-import com.me.appcontact.R;
+import com.uas.appcontact.R;
 import com.uas.appcontact.adapter.FriendSortAdapter;
 import com.uas.appcontact.listener.ImStatusListener;
 import com.uas.appcontact.manager.ContactsManager;
@@ -53,6 +52,7 @@ import com.uas.appcontact.ui.activity.MyFriendActivity;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 import com.uas.appcontact.ui.activity.PlatContactAddPeopleActivity;
 import com.uas.appcontact.ui.activity.UserSearchActivity;
+import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
 import com.yalantis.phoenix.PullToRefreshView;
 
 import java.util.ArrayList;

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

@@ -34,13 +34,13 @@ import com.core.model.EmployeesEntity;
 import com.core.model.Friend;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.CommonUtil;
+import com.core.utils.sortlist.BaseComparator;
+import com.core.utils.sortlist.BaseSortModel;
+import com.core.utils.sortlist.PingYinUtil;
+import com.core.utils.sortlist.SideBar;
 import com.core.widget.CustomProgressDialog;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
-import com.core.widget.sortlist.BaseComparator;
-import com.core.widget.sortlist.BaseSortModel;
-import com.core.widget.sortlist.PingYinUtil;
-import com.core.widget.sortlist.SideBar;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;

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.me.appcontact.R;
+import com.uas.appcontact.R;
 import com.uas.appcontact.ui.activity.CommonFragmentActivity;
 
 import java.util.ArrayList;

app_modular/appme/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.me.appme" >
 
-<application
-    android:allowBackup="true"
-    android:label="@string/app_name"
-    android:supportsRtl="true">
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
 
 </application>
 </manifest>

app_modular/appme/src/main/java/com/uas/appme/dao/AreasDao.java

@@ -1,15 +1,15 @@
-package com.me.appme.dao;
+package com.uas.appme.dao;
 
 import android.text.TextUtils;
 
 import com.core.app.MyApplication;
 import com.core.db.SQLiteHelper;
+import com.core.xmpp.model.Area;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.me.appme.settings.model.Area;
 
 import java.sql.SQLException;
 import java.util.List;

app_modular/appme/src/main/java/com/uas/appme/other/activity/BasicInfoActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -71,7 +71,6 @@ import com.core.xmpp.utils.CardcastUiUpdateUtil;
 import com.me.appme.R;
 import com.uas.appcontact.db.ContactsDao;
 import com.uas.appcontact.model.contacts.ContactsModel;
-import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -1108,13 +1107,13 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         public void onClick(View v) {
             MsgBroadcast.broadcastMsgUiUpdate(BasicInfoActivity.this);
             MsgBroadcast.broadcastMsgNumReset(BasicInfoActivity.this);
-            Intent intent = new Intent(mContext, ChatActivity.class);
+            Intent intent = new Intent("com.modular.message.ChatActivity");
             //TODO
             String name = name_tv.getText().toString();
             if (StringUtil.isEmpty(name))
                 name = userName;
             mFriend.setRemarkName(name);
-            intent.putExtra(ChatActivity.FRIEND, mFriend);
+            intent.putExtra(AppConstant.FRIEND, mFriend);
             startActivity(intent);
         }
     }

app_modular/appme/src/main/java/com/uas/appme/other/activity/BasicInfoEditActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -41,11 +41,11 @@ import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.utils.helper.LoginHelper;
+import com.core.xmpp.model.Area;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.me.appme.R;
-import com.me.appme.settings.model.Area;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.apache.http.Header;

app_modular/appme/src/main/java/com/uas/appme/other/activity/CardcastActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -16,9 +16,9 @@ import com.core.base.BaseActivity;
 import com.core.model.NewFriendMessage;
 import com.core.xmpp.CoreService;
 import com.me.appme.R;
-import com.me.appme.other.fragment.AttentionFragment;
-import com.me.appme.other.fragment.FriendFragment;
-import com.me.appme.other.fragment.RoomFragment;
+import com.uas.appme.other.fragment.AttentionFragment;
+import com.uas.appme.other.fragment.FriendFragment;
+import com.uas.appme.other.fragment.RoomFragment;
 
 /**
  * 我的名片盒

app_modular/appme/src/main/java/com/uas/appme/other/activity/RoomInfoActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;

app_modular/appme/src/main/java/com/uas/appme/other/activity/SelectAreaActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,9 +14,9 @@ import android.widget.TextView;
 import com.core.app.ActionBackActivity;
 import com.core.app.MyApplication;
 import com.core.widget.PinnedSectionListView;
+import com.core.xmpp.model.Area;
 import com.me.appme.R;
-import com.me.appme.dao.AreasDao;
-import com.me.appme.settings.model.Area;
+import com.uas.appme.dao.AreasDao;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appme/src/main/java/com/uas/appme/other/activity/UpdateSexActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.content.Intent;
 import android.os.Bundle;

app_modular/appme/src/main/java/com/uas/appme/other/activity/UpdateSingleTextActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.activity;
+package com.uas.appme.other.activity;
 
 import android.content.Context;
 import android.content.Intent;

app_modular/appme/src/main/java/com/uas/appme/other/adapter/FriendSortAdapter.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.adapter;
+package com.uas.appme.other.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -18,7 +18,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.utils.sortlist.BaseSortModel;
 import com.core.widget.crouton.Crouton;
 import com.me.appme.R;
-import com.me.appme.other.widget.SelectPicPopupWindow;
+import com.uas.appme.other.widget.SelectPicPopupWindow;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appme/src/main/java/com/uas/appme/other/fragment/AttentionFragment.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.fragment;
+package com.uas.appme.other.fragment;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -40,9 +40,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.me.appme.R;
-import com.me.appme.other.activity.BasicInfoActivity;
-import com.me.appme.other.activity.CardcastActivity;
-import com.me.appme.other.adapter.FriendSortAdapter;
+import com.uas.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.CardcastActivity;
+import com.uas.appme.other.adapter.FriendSortAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -400,8 +400,8 @@ public class AttentionFragment extends EasyFragment {
 
 	/**
 	 * 取消关注
-	 * 
-	 * @param friend
+	 *
+	 * @param
 	 */
 	private void showCancelAttentionDialog(final BaseSortModel<Friend> sortFriend) {
 		if (sortFriend.getBean().getStatus() == Friend.STATUS_UNKNOW) {
@@ -433,7 +433,7 @@ public class AttentionFragment extends EasyFragment {
 
 	/**
 	 * 
-	 * @param friend
+	 * @param
 	 * @param type
 	 *            0 取消关注 <br/>
 	 *            1、彻底删除<br/>

app_modular/appme/src/main/java/com/uas/appme/other/fragment/FriendFragment.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.fragment;
+package com.uas.appme.other.fragment;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -46,9 +46,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.me.appme.R;
-import com.me.appme.other.activity.BasicInfoActivity;
-import com.me.appme.other.activity.CardcastActivity;
-import com.me.appme.other.adapter.FriendSortAdapter;
+import com.uas.appme.other.activity.BasicInfoActivity;
+import com.uas.appme.other.activity.CardcastActivity;
+import com.uas.appme.other.adapter.FriendSortAdapter;
 import com.uas.appcontact.ui.activity.NewFriendActivity;
 
 import java.util.ArrayList;

app_modular/appme/src/main/java/com/uas/appme/other/fragment/RoomFragment.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.fragment;
+package com.uas.appme.other.fragment;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -34,8 +34,8 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.me.appme.R;
-import com.me.appme.other.activity.CardcastActivity;
-import com.me.appme.other.adapter.FriendSortAdapter;
+import com.uas.appme.other.activity.CardcastActivity;
+import com.uas.appme.other.adapter.FriendSortAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;

app_modular/appme/src/main/java/com/uas/appme/other/model/Master.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.model;
+package com.uas.appme.other.model;
 
 import java.io.Serializable;
 import java.util.Date;

app_modular/appme/src/main/java/com/uas/appme/other/widget/SelectPicPopupWindow.java

@@ -1,4 +1,4 @@
-package com.me.appme.other.widget;
+package com.uas.appme.other.widget;
 
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;

app_modular/appme/src/main/java/com/uas/appme/pedometer/bean/StepEntity.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.bean;
+package com.uas.appme.pedometer.bean;
 
 /**
  * Created by FANGLH

app_modular/appme/src/main/java/com/uas/appme/pedometer/calendar/BeforeOrAfterCalendarView.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.calendar;
+package com.uas.appme.pedometer.calendar;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,7 +7,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import com.me.appme.R;
-import com.me.appme.pedometer.utils.TimeUtil;
+import com.uas.appme.pedometer.utils.TimeUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appme/src/main/java/com/uas/appme/pedometer/calendar/RecordsCalenderItemView.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.calendar;
+package com.uas.appme.pedometer.calendar;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -10,7 +10,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.me.appme.R;
-import com.me.appme.pedometer.view.NewStepActivity;
+import com.uas.appme.pedometer.view.NewStepActivity;
 
 
 /**

app_modular/appme/src/main/java/com/uas/appme/pedometer/constant/Constant.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.constant;
+package com.uas.appme.pedometer.constant;
 
 /**
  * Created by FANGLH

app_modular/appme/src/main/java/com/uas/appme/pedometer/db/StepDBOpenHelper.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.db;
+package com.uas.appme.pedometer.db;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

app_modular/appme/src/main/java/com/uas/appme/pedometer/db/StepDataDao.java

@@ -1,11 +1,11 @@
-package com.me.appme.pedometer.db;
+package com.uas.appme.pedometer.db;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.me.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.bean.StepEntity;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appme/src/main/java/com/uas/appme/pedometer/service/StepService.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.service;
+package com.uas.appme.pedometer.service;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -25,11 +25,11 @@ import android.os.RemoteException;
 
 import com.core.app.MyApplication;
 import com.me.appme.R;
-import com.me.appme.pedometer.bean.StepEntity;
-import com.me.appme.pedometer.constant.Constant;
-import com.me.appme.pedometer.db.StepDataDao;
-import com.me.appme.pedometer.utils.TimeUtil;
-import com.me.appme.pedometer.view.StepSplashActivity;
+import com.uas.appme.pedometer.bean.StepEntity;
+import com.uas.appme.pedometer.constant.Constant;
+import com.uas.appme.pedometer.db.StepDataDao;
+import com.uas.appme.pedometer.utils.TimeUtil;
+import com.uas.appme.pedometer.view.StepSplashActivity;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/CommonSensorUtils.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.utils;
+package com.uas.appme.pedometer.utils;
 
 import android.content.Context;
 import android.hardware.Sensor;

app_modular/appme/src/main/java/com/uas/appme/pedometer/utils/StepCountCheckUtil.java

@@ -1,4 +1,4 @@
-package com.me.appme.pedometer.utils;
+package com.uas.appme.pedometer.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;