update 业务模块

WeiChat/build.gradle

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

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xzjmyk.pm.activity"
-    android:versionCode="111"
-    android:versionName="5.8.9">
+          package="com.xzjmyk.pm.activity"
+          android:versionCode="111"
+          android:versionName="5.8.9">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -145,7 +145,11 @@
                 <action android:name="cat.ereza.customactivityoncrash.ERROR" />
             </intent-filter>
         </activity>
-    
+        <!-- 登录模块 -->
+        <activity
+            android:name=".ui.account.LoginActivity"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />
         <!---->
         <activity android:name=".ui.account.DataDownloadActivity">
@@ -176,13 +180,23 @@
             android:label="@string/oatravel_apply" />
         <activity android:name=".ui.erp.activity.CommonDocDetailsActivity" />
         <activity android:name=".ui.erp.activity.SaleSelectActivity" />
-        <activity android:name=".ui.message.SelectActivity" />
+        <activity android:name=".ui.message.SelectActivity">
+            <intent-filter>
+                <action android:name="com.modular.message.SelectActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
         <activity android:name=".ui.erp.activity.QueryActivity" />
         <activity android:name=".ui.erp.activity.ErpMenActivity" />
         <activity android:name=".ui.erp.activity.DbfindListActivity" />
         <activity android:name=".ui.erp.activity.DbfindList2Activity" />
-        <activity android:name=".ui.circle.view.CardInfoActivity" />
+        <activity android:name=".ui.circle.view.CardInfoActivity">
+            <intent-filter>
+                <action android:name="com.modular.view.CardInfoActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.oa.AskForLeaveActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -223,16 +237,12 @@
         <activity android:name=".ui.erp.activity.TaskActivity" />
         <activity android:name=".ui.erp.activity.ScheduleActivity" />
         <activity android:name=".ui.erp.activity.SubscribeDetailActivity" />
-        <!-- Contacts 模块 -->
-        <activity
-            android:name=".ui.erp.activity.CompanyContactsActivity"
-            android:windowSoftInputMode="stateVisible|adjustResize" />
         <!-- 通用的activity 加载fragment -->
-        <activity android:name=".ui.erp.activity.CommonFragmentActivity" />
-        <activity
-            android:name=".ui.contact.MyFriendActivity"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity android:name=".ui.erp.activity.UUFriendActivity" />
+        <activity android:name="com.uas.appcontact.ui.activity.CommonFragmentActivity"/>
+        <activity
+            android:name="com.uas.appcontact.ui.activity.MyFriendActivity"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing"/>
         <!-- UserCheckedActivity -->
         <activity
             android:name=".ui.UserCheckedActivity"
@@ -252,23 +262,43 @@
             </intent-filter>
         </activity>
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity" />
-        <activity android:name=".ui.message.NewFriendActivity" />
-        <activity android:name=".ui.message.MucChatActivity" />
-        <activity android:name=".ui.message.RoomInfoActivity" />
+        <activity android:name=".ui.message.ChatActivity" >
+            <intent-filter>
+                <action android:name="com.modular.message.ChatActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".ui.message.MucChatActivity">
+            <intent-filter>
+                <action android:name="com.modular.message.MucChatActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.uas.appme.other.activity.RoomInfoActivity"/>
         <activity
             android:name=".ui.message.AddContactsActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+            android:windowSoftInputMode="adjustUnspecified|stateHidden">
+
+            <intent-filter>
+                <action android:name="com.modular.main.AddContactsActivity"/>
+                <category android:name="com.modular.main.AddContactsActivity"/>
+                <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=".ui.groupchat.SelectContactsActivity" />
+        <activity android:name=".ui.groupchat.SelectContactsActivity">
+            <intent-filter>
+                <action android:name="com.modular.groupchat.SelectContactsActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- Circlr模块 -->
-        <activity android:name=".ui.circle.BasicInfoActivity" />
         <activity android:name=".ui.circle.BusinessCircleActivity" />
         <activity android:name=".ui.circle.PersonalQzoneActivity" />
         <activity android:name=".ui.circle.CircleAudioRecordActivity" />
@@ -285,36 +315,43 @@
             android:name=".ui.circle.PMsgDetailActivity"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateAlwaysHidden|adjustUnspecified" />
-        <activity android:name=".ui.circle.BaiduMapActivity" />
+        <activity android:name=".ui.circle.BaiduMapActivity">
+            <intent-filter>
+                <action android:name="com.modular.baidu.BaiduMapActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- 附近模块 -->
         <activity
-            android:name=".ui.contact.UserSearchActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name=".ui.contact.UserListActivity" />
+            android:name="com.uas.appcontact.ui.activity.UserSearchActivity"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+        <activity android:name="com.uas.appcontact.ui.activity.UserListActivity"/>
         <!-- Me模块 -->
-        <activity android:name=".ui.me.LocalVideoActivity" />
-        <activity
-            android:name=".ui.me.SettingActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait" />
-        <activity android:name=".ui.me.AboutActivity" />
-        <activity android:name=".video.VideoRecordActivity" />
+        <activity android:name=".ui.me.LocalVideoActivity">
+            <intent-filter>
+                <action android:name="com.modular.im.LocalVideoActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+
+        <activity android:name=".video.VideoRecordActivity"/>
         <activity
-            android:name=".ui.cardcast.CardcastActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:name="com.uas.appme.other.activity.CardcastActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
         <activity
-            android:name=".ui.me.BasicInfoEditActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name=".CaptureResultActivity" />
-        <activity android:name=".CommonWebviewActivity" />
+            android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden"/>
+        <activity android:name=".CaptureResultActivity"/>
+        <activity android:name=".CommonWebviewActivity"/>
         <!-- Tool Activity -->
         <activity
             android:name=".ui.tool.MultiImagePreviewActivity"
             android:configChanges="orientation|screenSize" />
         <activity
-            android:name=".ui.tool.SelectAreaActivity"
-            android:screenOrientation="portrait" />
+            android:name="com.uas.appme.other.activity.SelectAreaActivity"
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".ui.tool.SelectConstantActivity"
             android:screenOrientation="portrait" />
@@ -323,25 +360,45 @@
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.SingleImagePreviewActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="com.modular.tool.SingleImagePreviewActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.uas.appme.other.activity.BasicInfoActivity"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="com.modular.basic.BasicInfoActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.tool.VideoPlayActivity"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize">
+            <intent-filter>
+                <action android:name="com.modular.tool.VideoPlayActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.tool.WebViewActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.tool.SelectDateActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.tool.MemoryFileManagement"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.circle.SendBaiDuLocate"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="com.modular.im.SendBaiDuLocate" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- CoreService -->
-        <service android:name=".xmpp.CoreService" />
+        <service android:name="com.core.xmpp.CoreService" />
         <!-- 百度Location -->
         <service
             android:name="com.baidu.location.f"
@@ -372,7 +429,7 @@
         <!-- 文件选择的内容提供者 -->
         <provider
             android:name="com.ipaulpro.afilechooser.LocalStorageProvider"
-            android:authorities="com.uas.afilechooser.provider"
+            android:authorities="com.me.afilechooser.provider"
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
@@ -392,7 +449,12 @@
         <activity
             android:name=".ui.message.InstantMessageActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="com.modular.main.MainActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.message.SelectNewContactsActivity"
             android:launchMode="singleTask"
@@ -403,7 +465,12 @@
             android:screenOrientation="portrait" />
         <activity
             android:name="com.ipaulpro.afilechooser.FileReceiverActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="com.modular.afilechooser.FileReceiverActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <!-- oA模块提醒功能本地推送 -->
 
@@ -462,12 +529,12 @@
 
         <activity
             android:name=".video.VideoActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar" />
-        <activity android:name=".ui.erp.activity.CompanyActivity" />
-        <activity android:name=".ui.erp.activity.BaseInfoActivity" />
-        <activity android:name=".ui.circle.PhoneSelectActivity" />
-        <activity android:name=".ui.erp.activity.crm.ClientActivity" />
-        <activity android:name=".ApplySubscribeActivity" />
+            android:theme="@style/Theme.AppCompat.NoActionBar"/>
+        <activity android:name=".ui.erp.activity.CompanyActivity"/>
+
+        <activity android:name=".ui.circle.PhoneSelectActivity"/>
+        <activity android:name=".ui.erp.activity.crm.ClientActivity"/>
+        <activity android:name=".ApplySubscribeActivity"/>
         <!-- android:theme="@style/Theme.AppCompat.NoActionBar" /> -->
         <activity
             android:name=".ui.erp.activity.oa.AddMeetingActivity"
@@ -609,15 +676,13 @@
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
             android:label="@string/my_mission"
-            android:theme="@style/OAThemeOutOffice" />
-        <activity android:name=".ui.erp.activity.crm.SubsActivity" />
-        <activity android:name=".ui.erp.activity.me.UpdateSingleTextActivity" />
-        <activity android:name=".ui.erp.activity.me.UpdateSexActivity" />
-        <activity
-            android:name=".ui.erp.activity.me.FeedbackActivity"
-            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
-        <activity android:name=".ui.erp.activity.oa.OAActivity" />
-        <activity android:name=".ui.erp.activity.oa.OAMainActivity" />
+            android:theme="@style/OAThemeOutOffice"/>
+        <activity android:name=".ui.erp.activity.crm.SubsActivity"/>
+        <activity android:name="com.uas.appme.other.activity.UpdateSingleTextActivity"/>
+        <activity android:name="com.uas.appme.other.activity.UpdateSexActivity"/>
+
+        <activity android:name=".ui.erp.activity.oa.OAActivity"/>
+        <activity android:name=".ui.erp.activity.oa.OAMainActivity"/>
 
         <!-- 分享开始   umeng api key -->
         <meta-data
@@ -664,9 +729,7 @@
             android:configChanges="keyboardHidden|orientation"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name=".ui.erp.activity.oa.SelectActivity"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+
         <activity
             android:name=".ui.erp.activity.oa.ChangeMobileActivity"
             android:label="@string/change_mobile" />
@@ -677,7 +740,12 @@
         <!-- 分享结束 -->
         <activity
             android:name=".ui.groupchat.CreateGroupActivity"
-            android:label="@string/title_friend_add" />
+            android:label="@string/title_friend_add">
+            <intent-filter>
+                <action android:name="com.modular.groupchat.CreateGroupActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.message.ProcessMsgActivity"
             android:label="@string/title_activity_process_msg" />
@@ -786,7 +854,7 @@
             android:name=".ui.message.Subscription2Activity"
             android:label="@string/subscribe_title" />
         <activity
-            android:name=".ui.erp.activity.oa.MissionSetActivity"
+            android:name="com.uas.appworks.OA.erp.activity.MissionSetActivity"
             android:label="@string/activity_mission_set" />
         <activity
             android:name=".ui.erp.activity.oa.DestinationActivity"
@@ -823,20 +891,20 @@
             android:label="@string/activity_visit_aims"
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity
-            android:name=".ui.erp.activity.oa.FlightsActivity"
-            android:label="@string/activity_flights" />
+            android:name="com.uas.appworks.OA.erp.activity.FlightsActivity"
+            android:label="@string/activity_flights"/>
 
         <!-- 打卡2.0模块 -->
         <activity
-            android:name=".ui.me.OfficeAddressSettingsActivity"
-            android:label="@string/office_addr_setting" />
+            android:name="com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity"
+            android:label="@string/office_addr_setting"/>
         <activity
-            android:name=".ui.me.SignSeniorSettingActivity"
-            android:label="@string/super_setting" />
+            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=".ui.erp.activity.oa.AddFlihtsActivity" />
+            android:label="@string/title_activity_select_calendar"/>
+        <activity android:name="com.uas.appworks.OA.erp.activity.AddFlihtsActivity"/>
         <activity
             android:name=".ui.erp.activity.oa.FlihtsTimeActivity"
             android:label="@string/work_time_setting" />
@@ -844,11 +912,10 @@
             android:name=".ui.erp.activity.oa.FlightsDateActivity"
             android:label="@string/work_day_setting" />
         <activity
-            android:name=".ui.erp.activity.oa.MyRuleSetActivity"
-            android:label="@string/my_rule_setting" />
-        <activity
-            android:name=".ui.erp.activity.oa.HolidaysActivity"
-            android:label="@string/holidays" />
+            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"/>
         <activity
             android:name=".ui.erp.activity.oa.StatisticsActivity"
             android:label="@string/work_statistics" />
@@ -893,7 +960,12 @@
         <activity android:name=".ui.platform.pageforms.FormDetailActivity" />
         <activity android:name=".ui.erp.activity.message.ProcessB2BActivity" />
         <activity android:name=".ui.platform.task.TaskB2BActivity" />
-        <activity android:name=".ui.platform.task.TaskAddB2BActivity" />
+        <activity android:name=".ui.platform.task.TaskAddB2BActivity">
+            <intent-filter>
+                <action android:name="com.modular.task.TaskAddB2BActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity android:name=".ui.platform.task.TaskDetailB2BActivity" />
         <activity
             android:name=".ui.erp.activity.PlatLeaveAddActivity"
@@ -902,26 +974,18 @@
         <activity
             android:name=".ui.platform.activity.ChangeDealManActivity"
             android:label="导航" />
-        <activity android:name=".ui.platform.task.TaskAddErpActivity" />
-        <activity
-            android:name=".ui.erp.activity.oa.PlatContactAddPeopleActivity"
-            android:label="@string/add_new_people"
-            android:windowSoftInputMode="adjustPan" />
+        <activity android:name=".ui.platform.task.TaskAddErpActivity">
+            <intent-filter>
+                <action android:name="com.modular.task.TaskAddErpActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="@string/navigation" />
-        <activity
-            android:name="com.xzjmyk.pm.newpedo.view.NewStepActivity"
-            android:label="@string/set_sport" />
-        <activity
-            android:name="com.xzjmyk.pm.newpedo.view.NewStepListActivity"
-            android:label="@string/sports_recode_more" />
-        <activity
-            android:name="com.xzjmyk.pm.newpedo.view.StepSplashActivity"
-            android:exported="true" />
         <!-- 计步功能 服务 -->
         <service
-            android:name="com.xzjmyk.pm.newpedo.service.StepService"
+            android:name="com.uas.appme.pedometer.service.StepService"
             android:priority="1000"
             android:process="com.spring.stepcount.service">
             <intent-filter>
@@ -947,15 +1011,16 @@
         <activity android:name=".ui.erp.activity.oa.PlatMsgThirdActivity" />
         <activity
             android:name=".ui.erp.activity.oa.AddContactsActivity"
-            android:label="@string/add_contact" />
+            android:label="@string/add_contact">
+
+        </activity>
         <activity
             android:name=".ui.erp.activity.oa.AddVisitReportActivity"
             android:label="@string/visitrecord" />
         <activity
             android:name=".ui.erp.activity.crm.AddBusinessActivity"
-            android:label="@string/crm_creat_business" />
-        <activity android:name=".ui.erp.activity.setting.SelectLanguageActivity" />
-        <activity android:name=".ui.erp.activity.oa.SearchSelectActivity" />
+            android:label="@string/crm_creat_business"/>
+        <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"/>
         <activity
             android:name=".ui.me.InfoCodeActivity"
             android:label="@string/info_2dcode" />
@@ -973,8 +1038,7 @@
         <activity android:name=".ui.erp.activity.secretary.BookingListActivity" />
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
-            android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.erp.activity.secretary.BookingSetActivity" />
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name="com.xzjmyk.pm.pictureselector.PictureSelectorDemo"
             android:label="PictureSelectorDemo" />
@@ -990,14 +1054,14 @@
         <activity android:name=".ui.erp.activity.oa.FileLoadingActivity" />
         <activity android:name=".ui.erp.activity.oa.ApprovalActivity" />
         <activity android:name=".ui.erp.activity.AppWebViewActivity" />
-
         <activity
-            android:name=".ui.erp.activity.contanct.ContactsActivity"
-            android:windowSoftInputMode="adjustPan" />
-      
-
+            android:name=".ui.erp.activity.message.PersonalRegActivity"
+            android:label="个人注册" />
+        <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
 
+        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"></activity>
+        <activity android:name="com.core.widget.view.Activity.ImgsActivity"/>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/ipaulpro/afilechooser/FileReceiverActivity.java

@@ -16,7 +16,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.ChatMessage;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.message.InstantMessageActivity;
 import com.xzjmyk.pm.activity.util.im.Constants;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ApplySubscribeActivity.java

@@ -17,7 +17,7 @@ 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.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

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

@@ -25,22 +25,29 @@ import com.android.volley.VolleyError;
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.dao.CircleMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.utils.AppConstant;
+import com.core.xmpp.utils.HtmlUtils;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -49,15 +56,8 @@ import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.im.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -26,22 +26,28 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.dao.CircleMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.utils.AppConstant;
+import com.core.xmpp.utils.HtmlUtils;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -49,14 +55,8 @@ import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.im.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -9,7 +9,7 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.R;
 

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

@@ -12,7 +12,7 @@ import com.common.data.StringUtil;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.db.DatabaseManager;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
+import com.core.model.MissionModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
 import com.core.utils.TimeUtils;

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

@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.core.db.DatabaseManager;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
+import com.core.model.WorkModel;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.utils.TimeUtils;
 

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

@@ -53,47 +53,49 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+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;
 import com.core.net.volley.FastVolley;
 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.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;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.modular.login.LoginActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
-import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
-import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
-import com.xzjmyk.pm.activity.ui.groupchat.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;
-import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.dialog.QSearchPpwindowUtils;
 import com.xzjmyk.pm.activity.util.im.Constants;
 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.xzjmyk.pm.activity.xmpp.CoreService;
-import com.xzjmyk.pm.activity.xmpp.ListenerManager;
-import com.core.xmpp.listener.AuthStateListener;
-import com.xzjmyk.pm.newpedo.service.StepService;
-import com.xzjmyk.pm.newpedo.utils.StepCountCheckUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -104,7 +106,8 @@ import java.util.Map;
 import static android.view.View.GONE;
 
 
-public class MainActivity extends BaseActivity implements NetWorkObservable.NetWorkObserver, AuthStateListener {
+
+public class MainActivity extends BaseActivity implements ImStatusListener, NetWorkObservable.NetWorkObserver, AuthStateListener {
     private static final int LOG_SEND_REQUEST = 17519;
     public static String HASHCODE = "MainActivity";
     public static boolean isUnReadWork;   //判断我的空间是否有新内容
@@ -139,7 +142,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private WorksFragment mWorksFragment;//工作
     private GroupChatFragment mGroupChatFragment;//群聊
     private MeFragment mMeFragment;//我
-    private ContactFragment mBusinessCircleFragment;
+    private ContactsFragment mBusinessCircleFragment;
     public static String BAIDU_PUSH = "BAIDUPUSH";
     public static String UU_STEP = "UUSTEP";
     public static String Q_SEARCH = "Q_SEARCH";
@@ -278,7 +281,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 updateMessageTitle();
             } else if (checkedId == R.id.main_tab_two) {
                 if (mBusinessCircleFragment == null) {
-                    mBusinessCircleFragment = new ContactFragment();
+                    mBusinessCircleFragment = new ContactsFragment();
                 }
                 changeFragment(mBusinessCircleFragment, TAG_BusinessCircle);//发现
                 getSupportActionBar().setTitle(getString(R.string.contact_title));
@@ -488,7 +491,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         SIP_SERVER_HOST = host == null ? "120.24.211.24" : host;
         PushManager.startWork(getApplicationContext(), PushConstants.LOGIN_TYPE_API_KEY,
                 CommonUtil.getMetaValue(this, "api_key"));
-        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), AppConstant.BAIDU_PUSH);
         if (isPush == 0) {
             PushManager.stopWork(this);
         }
@@ -571,6 +574,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private Handler handler = new Handler();
     private Runnable runnable = new MyRunnable();
     private Boolean firstRed = true;
+
     private void doHiTask() {
         int isUUStep = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.UU_STEP);
         if (isUUStep != 0 && StepCountCheckUtil.isSupportStepCountSensor(this)) { // 开启UU运动
@@ -593,14 +597,14 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     }
 
     private void hiQuickSearch() {
-        int qs =  PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.Q_SEARCH);
+        int qs = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.Q_SEARCH);
         if (CommonUtil.isReleaseVersion() || MainActivity.class == null || qs == 1) return;
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                 QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
+                QSearchPpwindowUtils.qSearchWindows(MainActivity.this);
             }
-        },4000);
+        }, 4000);
     }
 
     public class MyRunnable implements Runnable {
@@ -611,6 +615,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             BadgeUtil.setBadgeCount(getApplicationContext(), mMsgUnReadNum, R.drawable.hongdian);//启动红点显示逻辑
         }
     }
+
     private PopupWindow popupWindow;
 
     private void initScoringWindows() {
@@ -876,7 +881,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
         mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
         mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
-        mBusinessCircleFragment = (ContactFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
+        mBusinessCircleFragment = (ContactsFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
     }
 
     /**

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

@@ -12,7 +12,7 @@ import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
+import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

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

@@ -12,8 +12,8 @@ import com.core.base.ActivityStack;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.utils.sp.UserSp;
-import com.modular.login.LoginActivity;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.core.app.ActionBackActivity;
 import com.core.utils.helper.LoginHelper;
 
 

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

@@ -24,7 +24,7 @@ import com.core.model.User;
 import com.core.model.CircleMessage;
 import com.core.xmpp.model.MucRoom;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
+import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.core.xmpp.listener.OnCompleteListener;
@@ -39,7 +39,7 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.DataLoadView;
+import com.core.widget.DataLoadView;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;

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

@@ -12,7 +12,7 @@ import android.widget.EditText;
 import com.common.hmac.Md5Util;
 import com.common.data.StringUtil;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 
 /**
  * 注册输入密码界面

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

@@ -19,29 +19,29 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.common.data.StringUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.RequestParams;
-import com.nostra13.universalimageloader.core.ImageLoader;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
+import com.core.base.BaseActivity;
 import com.core.model.LoginRegisterResult;
 import com.core.model.User;
-import com.core.utils.helper.LoginHelper;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+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.uas.appme.other.activity.SelectAreaActivity;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.R;
 
 import org.apache.http.Header;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/cardcast/BlacklistActivity.java

@@ -1,553 +0,0 @@
-package com.xzjmyk.pm.activity.ui.cardcast;//package com.xzjmyk.pm.activity.ui.cardcast;
-//
-//import java.util.ArrayList;
-//import java.util.Collections;
-//import java.util.HashMap;
-//import java.util.List;
-//
-//import android.app.AlertDialog;
-//import android.app.ProgressDialog;
-//import android.content.BroadcastReceiver;
-//import android.content.ComponentName;
-//import android.content.Context;
-//import android.content.DialogInterface;
-//import android.content.Intent;
-//import android.content.ServiceConnection;
-//import android.os.Bundle;
-//import android.os.Handler;
-//import android.os.IBinder;
-//import android.text.InputFilter;
-//import android.text.TextUtils;
-//import android.view.View;
-//import android.view.ViewGroup;
-//import android.widget.AdapterView;
-//import android.widget.EditText;
-//import android.widget.ListView;
-//import android.widget.TextView;
-//
-//import com.android.volley.Response.ErrorListener;
-//import com.android.volley.VolleyError;
-//import com.handmark.pulltorefresh.library.PullToRefreshBase;
-//import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
-//import com.handmark.pulltorefresh.library.PullToRefreshListView;
-//import com.sk.im.AnalysisActivity;
-//import com.sk.im.Constant;
-//import com.sk.im.MyApplication;
-//import com.sk.im.R;
-//import com.sk.im.adapter.FriendSortAdapter;
-//import com.sk.im.bean.AttentionUser;
-//import com.sk.im.bean.Friend;
-//import com.sk.im.bean.message.NewFriendMessage;
-//import com.sk.im.bean.message.XmppMessage;
-//import com.sk.im.broadcast.CardcastUiUpdateUtil;
-//import com.sk.im.broadcast.MsgBroadcast;
-//import com.sk.im.db.dao.FriendDao;
-//import com.sk.im.service.FriendHelper;
-//import com.sk.im.sortlist.BaseComparator;
-//import com.sk.im.sortlist.BaseSortModel;
-//import com.sk.im.sortlist.PingYinUtil;
-//import com.sk.im.sortlist.SideBar;
-//import com.sk.im.ui.circle.PersonalInfoActivity;
-//import com.sk.im.util.ProgressDialogUtil;
-//import com.sk.im.util.ToastUtil;
-//import com.sk.im.util.Utils;
-//import com.sk.im.view.TopNormalBar;
-//import com.sk.im.volley.FastVolley;
-//import com.sk.im.volley.ObjectResult;
-//import com.sk.im.volley.Result;
-//import com.sk.im.volley.StringJsonObjectRequest;
-//import com.sk.im.xmpp.CoreService;
-//import com.sk.im.xmpp.CoreService.CoreServiceBinder;
-//
-//public class BlacklistActivity extends AnalysisActivity {
-//
-//	private TopNormalBar mTopTitleBar;
-//	private PullToRefreshListView mPullToRefreshListView;
-//	private TextView mTextDialog;
-//	private SideBar mSideBar;
-//	private ProgressDialog mProgressDialog;
-//	private List<BaseSortModel<Friend>> mSortFriends;
-//	private BaseComparator<Friend> mBaseComparator;
-//	private FriendSortAdapter mAdapter;
-//	private String mLoginUserId;
-//	private Handler mHandler = new Handler();
-//
-//	private boolean mBind;
-//	private CoreService mXmppService;
-//
-//	@Override
-//	protected void onCreate(Bundle savedInstanceState) {
-//		super.onCreate(savedInstanceState);
-//
-//		mSortFriends = new ArrayList<BaseSortModel<Friend>>();
-//		mBaseComparator = new BaseComparator<Friend>();
-//		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-//
-//		setContentView(R.layout.activity_simple_sort_pullrefresh_list);
-//		initView();
-//
-//		registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
-//		mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
-//
-//	}
-//
-//	private ServiceConnection mServiceConnection = new ServiceConnection() {
-//		@Override
-//		public void onServiceDisconnected(ComponentName name) {
-//			mXmppService = null;
-//		}
-//
-//		@Override
-//		public void onServiceConnected(ComponentName name, IBinder service) {
-//			mXmppService = ((CoreServiceBinder) service).getService();
-//		}
-//	};
-//
-//	@Override
-//	protected void onDestroy() {
-//		super.onDestroy();
-//		unregisterReceiver(mUpdateReceiver);
-//		if (mBind) {
-//			unbindService(mServiceConnection);
-//		}
-//	}
-//
-//	private boolean mNeedUpdate = true;
-//	private boolean mResumed = false;
-//
-//	@Override
-//	protected void onResume() {
-//		super.onResume();
-//		if (mNeedUpdate) {
-//			loadData();
-//			mNeedUpdate = false;
-//		}
-//		mResumed = true;
-//	}
-//
-//	@Override
-//	protected void onPause() {
-//		super.onPause();
-//		mResumed = false;
-//	}
-//
-//	private BroadcastReceiver mUpdateReceiver = new BroadcastReceiver() {
-//		@Override
-//		public void onReceive(Context context, Intent intent) {
-//			if (intent.getAction().equals(CardcastUiUpdateUtil.ACTION_UPDATE_UI)) {
-//				if (mResumed) {
-//					loadData();
-//				} else {
-//					mNeedUpdate = true;
-//				}
-//			}
-//		}
-//	};
-//
-//	private void initView() {
-//		initTopTitleBar();
-//		mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
-//		mTextDialog = (TextView) findViewById(R.id.text_dialog);
-//		mSideBar = (SideBar) findViewById(R.id.sidebar);
-//		mSideBar.setTextView(mTextDialog);
-//
-//		mSideBar.setOnTouchingLetterChangedListener(new SideBar.OnTouchingLetterChangedListener() {
-//			@Override
-//			public void onTouchingLetterChanged(String s) {
-//				// 该字母首次出现的位置
-//				int position = mAdapter.getPositionForSection(s.charAt(0));
-//				if (position != -1) {
-//					mPullToRefreshListView.getRefreshableView().setSelection(position);
-//				}
-//			}
-//		});
-//
-//		mAdapter = new FriendSortAdapter(this, mSortFriends);
-//
-//		mPullToRefreshListView.setMode(Mode.PULL_FROM_START);
-//		mPullToRefreshListView.getRefreshableView().setAdapter(mAdapter);
-//
-//		mPullToRefreshListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<ListView>() {
-//			@Override
-//			public void onRefresh(PullToRefreshBase<ListView> refreshView) {
-//				loadData();
-//			}
-//		});
-//
-//		mPullToRefreshListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-//			@Override
-//			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-//				Friend friend = mSortFriends.get((int) id).getBean();
-//				Intent intent = new Intent(BlacklistActivity.this, PersonalInfoActivity.class);
-//				intent.putExtra(Constant.EXTRA_USER_ID, friend.getUserId());
-//				startActivity(intent);
-//			}
-//		});
-//
-//		mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-//			@Override
-//			public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-//				BaseSortModel<Friend> sortFriend = mSortFriends.get((int) id);
-//				if (sortFriend == null || sortFriend.getBean() == null) {
-//					return false;
-//				}
-//				showLongClickOperationDialog(sortFriend);
-//				return true;
-//			}
-//		});
-//
-//		mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.requesting));
-//
-//	}
-//
-//	private void initTopTitleBar() {
-//		mTopTitleBar = (TopNormalBar) findViewById(R.id.top_title_bar);
-//		mTopTitleBar.title(R.string.my_blacklist);
-//	}
-//
-//	private void loadData() {
-//		new Thread(new Runnable() {
-//			@Override
-//			public void run() {
-//				long startTime = System.currentTimeMillis();
-//				final List<Friend> friends = FriendDao.getInstance().getAllBlacklists(mLoginUserId);
-//
-//				long delayTime = 200 - (startTime - System.currentTimeMillis());// 保证至少500ms的刷新过程
-//				if (delayTime < 0) {
-//					delayTime = 0;
-//				}
-//
-//				mHandler.postDelayed(new Runnable() {
-//					@Override
-//					public void run() {
-//						mSortFriends.clear();
-//						mSideBar.clearExist();
-//						if (friends != null && friends.size() > 0) {
-//							for (int i = 0; i < friends.size(); i++) {
-//								BaseSortModel<Friend> mode = new BaseSortModel<Friend>();
-//								mode.setBean(friends.get(i));
-//								setSortCondition(mode);
-//								mSortFriends.add(mode);
-//							}
-//							Collections.sort(mSortFriends, mBaseComparator);
-//						}
-//						mAdapter.notifyDataSetInvalidated();
-//						mPullToRefreshListView.onRefreshComplete();
-//					}
-//				}, delayTime);
-//			}
-//		}).start();
-//	}
-//
-//	private final void setSortCondition(BaseSortModel<Friend> mode) {
-//		Friend friend = mode.getBean();
-//		if (friend == null) {
-//			return;
-//		}
-//		String name = friend.getShowName();
-//		String wholeSpell = PingYinUtil.getPingYin(name);
-//		if (!TextUtils.isEmpty(wholeSpell)) {
-//			String firstLetter = Character.toString(wholeSpell.charAt(0));
-//			mSideBar.addExist(firstLetter);
-//			mode.setWholeSpell(wholeSpell);
-//			mode.setFirstLetter(firstLetter);
-//			mode.setSimpleSpell(PingYinUtil.converterToFirstSpell(name));
-//		} else {// 如果全拼为空，理论上是一种错误情况，因为这代表着昵称为空
-//			mode.setWholeSpell("#");
-//			mode.setFirstLetter("#");
-//			mode.setSimpleSpell("#");
-//		}
-//	}
-//
-//	// ///////////其他操作///////////////////
-//	private void showLongClickOperationDialog(final BaseSortModel<Friend> sortFriend) {
-//		Friend friend = sortFriend.getBean();
-//		if (friend.getStatus() != Friend.STATUS_BLACKLIST && friend.getStatus() == Friend.STATUS_ATTENTION
-//				&& friend.getStatus() == Friend.STATUS_FRIEND) {
-//			return;
-//		}
-//		CharSequence[] items = new CharSequence[4];
-//		items[0] = getString(R.string.set_remark_name);// 设置备注名
-//		if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 在黑名单中,显示“设置备注名”、“移除黑名单”,"取消关注"，“彻底删除”
-//			items[1] = getString(R.string.remove_blacklist);
-//		} else {
-//			items[1] = getString(R.string.add_blacklist);
-//		}
-//		items[2] = getString(R.string.cancel_attention);
-//		items[3] = getString(R.string.delete_all);
-//
-//		new AlertDialog.Builder(this).setItems(items, new DialogInterface.OnClickListener() {
-//			@Override
-//			public void onClick(DialogInterface dialog, int which) {
-//				switch (which) {
-//				case 0:// 设置备注名
-//					showRemarkDialog(sortFriend);
-//					break;
-//				case 1:// 加入黑名单，或者移除黑名单
-//					showBlacklistDialog(sortFriend);
-//					break;
-//				case 2:// 取消关注
-//					showCancelAttentionDialog(sortFriend);
-//					break;
-//				case 3:// 解除关注关系或者解除好友关系
-//					showDeleteAllDialog(sortFriend);
-//					break;
-//				}
-//			}
-//		}).setCancelable(true).create().show();
-//	}
-//
-//	private void showRemarkDialog(final BaseSortModel<Friend> sortFriend) {
-//		final EditText editText = new EditText(BlacklistActivity.this);
-//		editText.setMaxLines(2);
-//		editText.setLines(2);
-//		editText.setText(sortFriend.getBean().getShowName());
-//		editText.setFilters(new InputFilter[] { new InputFilter.LengthFilter(20) });
-//		editText.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-//
-//		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-//		builder.setTitle(R.string.set_remark_name).setView(editText)
-//				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						String input = editText.getText().toString();
-//						if (input.equals(sortFriend.getBean().getShowName())) {// 备注名没变
-//							return;
-//						}
-//						if (!Utils.isNickName(input)) {// 不符合昵称
-//							if (input.length() != 0) {
-//								ToastUtil.showNormalToast(BlacklistActivity.this, R.string.remark_name_format_error);
-//								return;
-//							} else {// 不符合昵称，因为长度为0，但是可以做备注名操作，操作就是清除备注名
-//									// 判断之前有没有备注名
-//								if (TextUtils.isEmpty(sortFriend.getBean().getRemarkName())) {// 如果没有备注名，就不需要清除
-//									return;
-//								}
-//							}
-//						}
-//						remarkFriend(sortFriend, input);
-//					}
-//				}).setNegativeButton(getString(R.string.cancel), null);
-//		builder.create().show();
-//	}
-//
-//	private void remarkFriend(final BaseSortModel<Friend> sortFriend, final String remarkName) {
-//		HashMap<String, String> params = new HashMap<String, String>();
-//		params.put("access_token", MyApplication.getInstance().mAccessToken);
-//		params.put("toUserId", sortFriend.getBean().getUserId());
-//		params.put("remarkName", remarkName);
-//
-//		ProgressDialogUtil.show(mProgressDialog);
-//		StringJsonObjectRequest<Result> request = new StringJsonObjectRequest<Result>(mConfig.FRIENDS_REMARK, new ErrorListener() {
-//			@Override
-//			public void onErrorResponse(VolleyError arg0) {
-//				ProgressDialogUtil.dismiss(mProgressDialog);
-//				ToastUtil.showErrorNet(BlacklistActivity.this);
-//			}
-//		}, new StringJsonObjectRequest.Listener<Result>() {
-//			@Override
-//			public void onResponse(ObjectResult<Result> result) {
-//				boolean success = Result.defaultParser(BlacklistActivity.this, result, true);
-//				ProgressDialogUtil.dismiss(mProgressDialog);
-//				if (success) {
-//					String firstLetter = sortFriend.getFirstLetter();
-//					mSideBar.removeExist(firstLetter);// 移除之前设置的首字母
-//					sortFriend.getBean().setRemarkName(remarkName);// 修改备注名称
-//					setSortCondition(sortFriend);
-//					Collections.sort(mSortFriends, mBaseComparator);
-//					mAdapter.notifyDataSetChanged();
-//					// 更新到数据库
-//					FriendDao.getInstance().setRemarkName(mLoginUserId, sortFriend.getBean().getUserId(), remarkName);
-//					// 更新消息界面（因为昵称变了，所有要更新）
-//					// MainUiUpdateUtil.broadcastUpdateMsgUi(BlacklistActivity.this);
-//				}
-//
-//			}
-//		}, Result.class, params);
-//		request.setRetryPolicy(FastVolley.newDefaultRetryPolicy());
-//		FastVolley.getInstance().add(request);
-//
-//	}
-//
-//	/* 显示加入黑名单的对话框 */
-//	private void showBlacklistDialog(final BaseSortModel<Friend> sortFriend) {
-//		final Friend friend = sortFriend.getBean();
-//		int messageId = 0;
-//		if (friend.getStatus() == Friend.STATUS_BLACKLIST) {// 已经在黑名单，那就是移出黑名单
-//			messageId = R.string.remove_blacklist_prompt;
-//		} else if (friend.getStatus() == Friend.STATUS_ATTENTION || friend.getStatus() == Friend.STATUS_FRIEND) {
-//			messageId = R.string.add_blacklist_prompt;
-//		} else {// 其他关系（错误的状态）
-//			return;
-//		}
-//		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage(messageId)
-//				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						if (friend.getStatus() == Friend.STATUS_BLACKLIST) {//
-//							removeBlacklist(sortFriend);
-//						} else if (friend.getStatus() == Friend.STATUS_ATTENTION || friend.getStatus() == Friend.STATUS_FRIEND) {
-//							// addBlacklist(sortFriend);//黑名单界面，不可能出现此情况
-//						}
-//					}
-//				}).setNegativeButton(getString(R.string.cancel), null);
-//		builder.create().show();
-//	}
-//
-//	private void removeBlacklist(final BaseSortModel<Friend> sortFriend) {
-//		HashMap<String, String> params = new HashMap<String, String>();
-//		params.put("access_token", MyApplication.getInstance().mAccessToken);
-//		params.put("toUserId", sortFriend.getBean().getUserId());
-//
-//		ProgressDialogUtil.show(mProgressDialog);
-//		StringJsonObjectRequest<AttentionUser> request = new StringJsonObjectRequest<AttentionUser>(mConfig.FRIENDS_BLACKLIST_DELETE,
-//				new ErrorListener() {
-//					@Override
-//					public void onErrorResponse(VolleyError arg0) {
-//						ProgressDialogUtil.dismiss(mProgressDialog);
-//						ToastUtil.showErrorNet(BlacklistActivity.this);
-//					}
-//				}, new StringJsonObjectRequest.Listener<AttentionUser>() {
-//					@Override
-//					public void onResponse(ObjectResult<AttentionUser> result) {
-//						boolean success = Result.defaultParser(BlacklistActivity.this, result, true);
-//						if (success) {
-//							int currentStatus = Friend.STATUS_UNKNOW;
-//							if (result.getData() != null) {
-//								currentStatus = result.getData().getStatus();
-//							}
-//							FriendDao.getInstance().updateFriendStatus(sortFriend.getBean().getOwnerId(), sortFriend.getBean().getUserId(),
-//									currentStatus);
-//
-//							switch (currentStatus) {
-//							case Friend.STATUS_ATTENTION:
-//								NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
-//										XmppMessage.TYPE_NEWSEE, null, sortFriend.getBean());
-//								mXmppService.sendNewFriendMessage(sortFriend.getBean().getUserId(), message1);
-//
-//								FriendHelper.addAttentionExtraOperation(sortFriend.getBean().getOwnerId(), sortFriend.getBean().getUserId());
-//
-//								break;
-//							case Friend.STATUS_FRIEND:
-//
-//								NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
-//										XmppMessage.TYPE_FRIEND, null, sortFriend.getBean());
-//								mXmppService.sendNewFriendMessage(sortFriend.getBean().getUserId(), message2);
-//								FriendHelper.addFriendExtraOperation(sortFriend.getBean().getOwnerId(), sortFriend.getBean().getUserId());
-//								break;
-//							default:// 其他，理论上不可能
-//								break;
-//							}
-//
-//							ToastUtil.showNormalToast(BlacklistActivity.this, R.string.remove_blacklist_succ);
-//
-//							mSortFriends.remove(sortFriend);
-//							String firstLetter = sortFriend.getFirstLetter();
-//							mSideBar.removeExist(firstLetter);// 移除之前设置的首字母
-//							mAdapter.notifyDataSetInvalidated();
-//
-//							// 更新消息界面
-//							MsgBroadcast.broadcastMsgUiUpdate(mContext);
-//						}
-//						ProgressDialogUtil.dismiss(mProgressDialog);
-//					}
-//				}, AttentionUser.class, params);
-//		request.setRetryPolicy(FastVolley.newDefaultRetryPolicy());
-//		FastVolley.getInstance().add(request);
-//	}
-//
-//	/**
-//	 * 取消关注
-//	 * 
-//	 * @param friend
-//	 */
-//	private void showCancelAttentionDialog(final BaseSortModel<Friend> sortFriend) {
-//		if (sortFriend.getBean().getStatus() == Friend.STATUS_UNKNOW) {
-//			return;
-//		}
-//		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage(R.string.cancel_attention_prompt)
-//				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						deleteFriend(sortFriend, 0);
-//					}
-//				}).setNegativeButton(getString(R.string.cancel), null);
-//		builder.create().show();
-//	}
-//
-//	private void showDeleteAllDialog(final BaseSortModel<Friend> sortFriend) {
-//		if (sortFriend.getBean().getStatus() == Friend.STATUS_UNKNOW) {
-//			return;
-//		}
-//		AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage(R.string.delete_all_prompt)
-//				.setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
-//					@Override
-//					public void onClick(DialogInterface dialog, int which) {
-//						deleteFriend(sortFriend, 1);
-//					}
-//				}).setNegativeButton(getString(R.string.cancel), null);
-//		builder.create().show();
-//	}
-//
-//	/**
-//	 * 
-//	 * @param friend
-//	 * @param type
-//	 *            0 取消关注 <br/>
-//	 *            1、彻底删除<br/>
-//	 */
-//	private void deleteFriend(final BaseSortModel<Friend> sortFriend, final int type) {
-//		HashMap<String, String> params = new HashMap<String, String>();
-//		params.put("access_token", MyApplication.getInstance().mAccessToken);
-//		params.put("toUserId", sortFriend.getBean().getUserId());
-//
-//		String url = null;
-//		if (type == 0) {
-//			url = mConfig.FRIENDS_ATTENTION_DELETE;// 取消关注
-//		} else {
-//			url = mConfig.FRIENDS_DELETE;// 删除好友
-//		}
-//
-//		ProgressDialogUtil.show(mProgressDialog);
-//		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(url, new ErrorListener() {
-//			@Override
-//			public void onErrorResponse(VolleyError arg0) {
-//				ProgressDialogUtil.dismiss(mProgressDialog);
-//				ToastUtil.showErrorNet(BlacklistActivity.this);
-//			}
-//		}, new StringJsonObjectRequest.Listener<Void>() {
-//			@Override
-//			public void onResponse(ObjectResult<Void> result) {
-//				boolean success = Result.defaultParser(BlacklistActivity.this, result, true);
-//				if (success) {
-//					if (type == 0) {
-//						ToastUtil.showNormalToast(BlacklistActivity.this, R.string.cancel_attention_succ);
-//						NewFriendMessage message = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
-//								XmppMessage.TYPE_DELSEE, null, sortFriend.getBean());
-//						mXmppService.sendNewFriendMessage(sortFriend.getBean().getUserId(), message);// 解除关注
-//					} else {
-//						ToastUtil.showNormalToast(BlacklistActivity.this, R.string.delete_all_succ);
-//						NewFriendMessage message = NewFriendMessage.createWillSendMessage(MyApplication.getInstance().mLoginUser,
-//								XmppMessage.TYPE_DELALL, null, sortFriend.getBean());
-//						mXmppService.sendNewFriendMessage(sortFriend.getBean().getUserId(), message);// 解除好友
-//					}
-//
-//					FriendHelper.removeAttentionOrFriend(mLoginUserId, sortFriend.getBean().getUserId());
-//
-//					mSortFriends.remove(sortFriend);
-//					String firstLetter = sortFriend.getFirstLetter();
-//					mSideBar.removeExist(firstLetter);// 移除之前设置的首字母
-//					mAdapter.notifyDataSetInvalidated();
-//
-//					// 更新消息界面
-//					MsgBroadcast.broadcastMsgUiUpdate(mContext);
-//				}
-//				ProgressDialogUtil.dismiss(mProgressDialog);
-//			}
-//		}, Void.class, params);
-//		request.setRetryPolicy(FastVolley.newDefaultRetryPolicy());
-//		FastVolley.getInstance().add(request);
-//
-//	}
-//
-//}

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

@@ -31,37 +31,38 @@ import com.alibaba.fastjson.JSON;
 import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.common.ui.CameraUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
+import com.common.ui.CameraUtil;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.MyPhoto;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.xmpp.dao.CircleMessageDao;
+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.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.core.app.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
-import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
-import com.core.utils.ToastUtil;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
-import com.core.net.volley.ArrayResult;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonArrayRequest;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -74,7 +75,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.xzjmyk.pm.activity.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
+import static com.core.xmpp.utils.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
 
 /**
  * 我的商务圈

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

@@ -21,36 +21,38 @@ import android.widget.ListView;
 
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.CircleMessage;
+import com.core.model.MyPhoto;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.xmpp.dao.CircleMessageDao;
+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.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.core.app.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
-import com.core.model.MyPhoto;
-import com.core.model.CircleMessage;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
+import com.xzjmyk.pm.activity.bean.circle.Comment;
+import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.core.base.BaseActivity;
+import com.core.app.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
-import com.core.net.volley.ArrayResult;
-import com.core.net.volley.StringJsonArrayRequest;
-import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.circle.Comment;
-import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.core.xmpp.listener.OnCompleteListener;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.core.utils.ToastUtil;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -16,13 +16,13 @@ import android.widget.TextView;
 
 import com.common.ui.CameraUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
 import com.xzjmyk.pm.activity.audio.RecordController;
 import com.xzjmyk.pm.activity.audio.RecordListener;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.core.app.ActionBackActivity;
 import com.core.utils.ToastUtil;
 
 import java.io.File;

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

@@ -22,31 +22,31 @@ import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.data.CalendarUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.BaseActivity;
 import com.core.model.Friend;
 import com.core.model.User;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.xmpp.dao.FriendDao;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgAudioHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgDetailHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgImageHeaderView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgTypeView;
 import com.xzjmyk.pm.activity.ui.circle.view.PMsgVideoHeaderView;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.CommentBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
-import com.core.net.volley.ArrayResult;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonArrayRequest;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -30,40 +30,41 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.common.ui.CameraUtil;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.MyPhoto;
+import com.core.net.volley.ArrayResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonArrayRequest;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.xmpp.dao.CircleMessageDao;
+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.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
-import com.core.app.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PersonalQzoneAdapter;
-import com.core.model.MyPhoto;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.db.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
-import com.core.base.BaseActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;
-import com.core.net.volley.ArrayResult;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonArrayRequest;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -76,7 +77,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.xzjmyk.pm.activity.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
+import static com.core.xmpp.utils.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
 
 /**
  * 工作圈个人中心
@@ -413,7 +414,6 @@ public class PersonalQzoneActivity extends BaseActivity implements showCEView {
         mAvatarImg.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {// 进入个人资料页
-//                Intent intent = new Intent(BusinessCircleActivity.this, BasicInfoActivity.class);
                 Intent intent = new Intent(PersonalQzoneActivity.this,BasicInfoActivity.class);
                 if (isMyBusiness() || isMySpace()) {
                     intent.putExtra(AppConstant.EXTRA_USER_ID, mLoginUserId);

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

@@ -1,77 +0,0 @@
-package com.xzjmyk.pm.activity.ui.circle;
-
-import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
-import android.support.v4.app.FragmentActivity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
-import android.widget.Button;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.PopupWindow;
-
-import com.xzjmyk.pm.activity.R;
-
-public class SelectPicPopupWindow extends PopupWindow {
-	  private Button mSend_text,mSend_picture,mSend_voice,mSend_video;
-	    private View mMenuView;
-	 
-	    public SelectPicPopupWindow(FragmentActivity context,OnClickListener itemsOnClick) {
-	        super(context);
-	        LayoutInflater inflater = (LayoutInflater) context
-	                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-	        mMenuView = inflater.inflate(R.layout.business_dialog, null);
-	        mSend_text = (Button) mMenuView.findViewById(R.id.btn_send_text);
-	        mSend_picture = (Button) mMenuView.findViewById(R.id.btn_send_picture);
-	        mSend_voice = (Button) mMenuView.findViewById(R.id.btn_send_voice);
-	        mSend_video = (Button) mMenuView.findViewById(R.id.btn_send_video);
-	        //取消按钮
-	      /*  btn_cancel.setOnClickListener(new OnClickListener() {
-	 
-	            public void onClick(View v) {
-	                //销毁弹出框
-	                dismiss();
-	            }
-	        });*/
-	        //设置按钮监听
-	        mSend_text.setOnClickListener(itemsOnClick);
-	        mSend_picture.setOnClickListener(itemsOnClick);
-	        mSend_voice.setOnClickListener(itemsOnClick);
-	        mSend_video.setOnClickListener(itemsOnClick);
-	        //设置SelectPicPopupWindow的View
-	        this.setContentView(mMenuView);
-	        //设置SelectPicPopupWindow弹出窗体的宽
-	        this.setWidth(LayoutParams.MATCH_PARENT);
-	        //设置SelectPicPopupWindow弹出窗体的高
-	        this.setHeight(LayoutParams.WRAP_CONTENT);
-	        //设置SelectPicPopupWindow弹出窗体可点击
-	        this.setFocusable(true);
-	        //设置SelectPicPopupWindow弹出窗体动画效果
-	        this.setAnimationStyle(R.style.Buttom_Popwindow);
-	        //实例化一个ColorDrawable颜色为半透明
-	        ColorDrawable dw = new ColorDrawable(0xb0000000);
-	        //设置SelectPicPopupWindow弹出窗体的背景
-	        this.setBackgroundDrawable(dw);
-	        //mMenuView添加OnTouchListener监听判断获取触屏位置如果在选择框外面则销毁弹出框
-	        mMenuView.setOnTouchListener(new OnTouchListener() {
-	             
-	            public boolean onTouch(View v, MotionEvent event) {
-	                 
-	                int height = mMenuView.findViewById(R.id.pop_layout).getTop();
-	                int bottom = mMenuView.findViewById(R.id.pop_layout).getBottom();
-	                int y=(int) event.getY();
-	                if(event.getAction()==MotionEvent.ACTION_UP){
-	                    if(y<height){
-	                        dismiss();
-	                    }else if(y>bottom){
-	                    	dismiss();
-	                    }
-	                }               
-	                return true;
-	            }
-	        });
-	 
-	    }
-}

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

@@ -20,11 +20,11 @@ import com.android.volley.VolleyError;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.bean.UploadFileResult;
+import com.core.xmpp.model.Area;
+import com.core.model.UploadFileResult;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.modular.login.LoginActivity;

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

@@ -20,7 +20,7 @@ import com.baidu.mapapi.map.Marker;
 import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 

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

@@ -34,22 +34,22 @@ import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.bean.UploadFileResult;
-import com.core.utils.helper.LoginHelper;
-import com.xzjmyk.pm.activity.util.im.helper.UploadService;
-import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
+import com.core.model.UploadFileResult;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.LoginHelper;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.model.Area;
+import com.core.xmpp.utils.AppConstant;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
+import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.pictureselector.ComPictureAdapter;
 import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 

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

@@ -31,11 +31,11 @@ import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.bean.UploadFileResult;
+import com.core.xmpp.model.Area;
+import com.core.model.UploadFileResult;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.modular.login.LoginActivity;

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

@@ -42,34 +42,34 @@ import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.AddAttentionResult;
+import com.core.xmpp.model.AddAttentionResult;
 import com.core.model.AttentionUser;
 import com.core.model.Friend;
 import com.core.model.User;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.broadcast.CardcastUiUpdateUtil;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
+import com.core.xmpp.utils.CardcastUiUpdateUtil;
+import com.core.broadcast.MsgBroadcast;
 import com.core.xmpp.dao.FriendDao;
-import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
+import com.core.xmpp.dao.NewFriendDao;
 import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
+import com.core.xmpp.FriendHelper;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.DataLoadView;
+import com.core.widget.DataLoadView;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;
 import com.core.net.volley.StringJsonObjectRequest;
-import com.xzjmyk.pm.activity.xmpp.CoreService;
-import com.xzjmyk.pm.activity.xmpp.ListenerManager;
+import com.core.xmpp.CoreService;
+import com.core.xmpp.ListenerManager;
 import com.core.xmpp.listener.NewFriendListener;
 
 import java.util.HashMap;
@@ -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

@@ -20,17 +20,17 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.system.DisplayUtil;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
 import com.core.model.User;
+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.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;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -31,6 +31,10 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -40,13 +44,9 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest.HttpMethod;
 import com.lidroid.xutils.view.annotation.ViewInject;
 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.util.im.RecordUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
+import com.xzjmyk.pm.activity.util.im.RecordUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 

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

@@ -18,7 +18,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Approve;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.R;
 
 public class ApproveDisplayActivity extends BaseActivity implements OnClickListener {

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

@@ -25,11 +25,21 @@ import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.ActivityUtils;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.EmptyLayout;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.ComDocGriddataOutAdapter;
 import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
@@ -37,26 +47,16 @@ import com.xzjmyk.pm.activity.adapter.CommonDocMainMsgAdapter;
 import com.xzjmyk.pm.activity.adapter.NodeAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -18,7 +18,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.model.Hrorgs;
-import com.xzjmyk.pm.activity.ui.erp.view.CustomerListView;
+import com.core.widget.CustomerListView;
 
 import java.util.List;
 

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

@@ -25,17 +25,17 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.helper.AvatarHelper;
+import com.core.widget.ClearEditText;
 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.model.Employees;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.widget.ClearEditText;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -28,19 +28,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.ClearEditText;
+import com.core.widget.EmptyLayout;
 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.ClearEditText;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -37,7 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
 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.CustomerListView;
+import com.core.widget.CustomerListView;
 import com.core.utils.TimeUtils;
 
 import java.io.File;

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

@@ -14,22 +14,22 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.EmptyLayout;
+import com.core.xmpp.dao.FriendDao;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.model.Friend;
-import com.core.xmpp.dao.FriendDao;
-import com.core.base.BaseActivity;
 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.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.apache.http.client.ClientProtocolException;
 

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

@@ -31,7 +31,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-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.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;

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

@@ -17,7 +17,7 @@ import android.widget.TextView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 

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

@@ -11,7 +11,7 @@ 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.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.util.im.Constants;
 
 import java.util.ArrayList;

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

@@ -20,22 +20,21 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.common.data.ObjectUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.net.http.ViewUtil;
+import com.core.widget.EmptyLayout;
+import com.core.xmpp.dao.FriendDao;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.model.Friend;
-import com.core.xmpp.dao.FriendDao;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.NewsData;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ObjectUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -18,19 +18,19 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.common.data.ObjectUtils;
+import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.BaseActivity;
 import com.core.model.Friend;
+import com.core.net.http.ViewUtil;
+import com.core.widget.EmptyLayout;
 import com.core.xmpp.dao.FriendDao;
-import com.core.base.BaseActivity;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.NoticeData;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ObjectUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -29,7 +29,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-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.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;

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

@@ -45,11 +45,10 @@ import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewAdapter;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
 import com.core.utils.FlexJsonUtil;
 import com.common.data.ObjectUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
-import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.MonPickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 

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

@@ -29,8 +29,8 @@ import com.xzjmyk.pm.activity.ui.erp.model.DetailColumns;
 import com.xzjmyk.pm.activity.ui.erp.model.LogsEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.PanelItems;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.core.widget.EmptyLayout;
+import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.PickDialog;
 import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

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

@@ -45,6 +45,10 @@ import android.widget.Toast;
 
 import com.common.LogUtil;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.EmptyLayout;
 import com.github.clans.fab.FloatingActionButton;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
@@ -53,13 +57,8 @@ 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

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

@@ -15,22 +15,22 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.EmptyLayout;
+import com.core.xmpp.dao.FriendDao;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.model.Friend;
-import com.core.xmpp.dao.FriendDao;
-import com.core.base.BaseActivity;
 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.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -31,26 +31,26 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+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.ViewUtil;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
 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.core.net.http.ViewUtil;
+import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.util.im.Blowfish;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
-import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 
 import java.util.ArrayList;
 import java.util.Date;

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

@@ -13,26 +13,26 @@ import com.baidu.mapapi.model.LatLng;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.OABaseActivity;
+import com.core.model.SelectBean;
+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.CommonInterface;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
+import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OABaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.AddBusinessAdapter;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.EmployeesModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.MyListView;
 
 import java.util.ArrayList;

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

@@ -36,8 +36,8 @@ import com.xzjmyk.pm.activity.ui.erp.adapter.HListViewOneAdapter;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
-import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.core.model.OAConfig;
+import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
 import com.xzjmyk.pm.activity.view.FunnelView;
 
 import java.text.SimpleDateFormat;

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

@@ -20,7 +20,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 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;

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

@@ -29,19 +29,19 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 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.ViewUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.app.MyApplication;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

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

@@ -40,29 +40,29 @@ import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.model.MissionModel;
+import com.core.model.OAConfig;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
 import com.core.net.location.BdLocationHelper;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 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.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.StickyListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.list.SimpleData;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.EmployeesModel;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
-import com.xzjmyk.pm.activity.view.stickylistheaders.StickyListHeadersListView;
+import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -30,8 +30,8 @@ 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.util.oa.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.core.utils.CommonInterface;
+import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;

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

@@ -24,23 +24,23 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.ToastUtil;
+import com.core.widget.ClearEditText;
+import com.core.widget.EmptyLayout;
+import com.core.widget.listener.EditChangeListener;
+import com.core.widget.view.SmoothCheckBox;
 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.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-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.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.utils.ToastUtil;
-import com.core.widget.ClearEditText;
-import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

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

@@ -27,19 +27,19 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
 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.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindListActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;
 

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

@@ -18,17 +18,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.widget.view.SmoothCheckBox;
 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.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-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.SmoothCheckBox;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -30,6 +30,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.model.OAConfig;
+import com.core.net.http.ViewUtil;
 import com.github.mikephil.charting.charts.BarChart;
 import com.github.mikephil.charting.components.Legend;
 import com.github.mikephil.charting.components.XAxis;
@@ -44,13 +48,10 @@ import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddVisitReportActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.wheel.DatePicker;
 
@@ -64,6 +65,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.core.model.OAConfig.canShowCrm2_0;
+
 /**
  * @功能:CRM 功能模块
  * @author:Arisono
@@ -1072,7 +1075,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                             startActivity(new Intent(ClientActivity.this, ContactManAddActivity.class));
                             break;*/
                         case 0:
-                            if (OAConfig.canShowCrm2_0() && !CommonUtil.isBiteman())
+                            if (canShowCrm2_0() && !CommonUtil.isBiteman())
                                 startActivity(new Intent(ClientActivity.this, AddBusinessActivity.class));
                             else
                                 startActivity(new Intent(ClientActivity.this, BusinessAddActivity.class));
@@ -1093,7 +1096,7 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                         case 3:
                             break;
                         case 2:
-                            startActivity(OAConfig.getVisitClass(ct));
+                            startActivity(getVisitClass(ct));
                             break;
 
                     }
@@ -1216,5 +1219,8 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
         ViewUtil.httpSendRequest(ct, url, param, mHandler, headers, what, null, null, "get");
     }
 
+    public  Intent getVisitClass(Context ct) {
+        return new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+    }
 }
 

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

@@ -27,7 +27,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 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.DbfindListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;

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

@@ -22,13 +22,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.EmployeesModel;
 import com.core.net.http.ViewUtil;
+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.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.steps.HorizontalStepsView;

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

@@ -24,26 +24,26 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.EmptyLayout;
 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.core.app.MyApplication;
+import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.core.utils.helper.AvatarHelper;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
-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.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -23,18 +23,18 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-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.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -18,17 +18,17 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.helper.AvatarHelper;
 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.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.crm.Business;
-import com.core.utils.helper.AvatarHelper;
-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.wheel.DatePicker;
 
 import java.util.ArrayList;

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

@@ -21,7 +21,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 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.xzjmyk.pm.activity.ui.erp.activity.oa.UserSelectActivity;

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

@@ -41,7 +41,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.core.model.SelectBean;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
@@ -52,7 +52,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -21,7 +21,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.core.model.SelectBean;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;

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

@@ -39,7 +39,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 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.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
@@ -53,7 +53,7 @@ import com.core.app.Constants;
 import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
 import com.common.data.RegexUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.ListViewInScroller;
+import com.uas.appcontact.ui.widget.stickylistheaders.ListViewInScroller;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.text.DecimalFormat;

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

@@ -30,13 +30,17 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+import com.core.utils.FlexJsonUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ExtraLeaveActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.LeaveActivity;
@@ -46,11 +50,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.HttpClient;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -25,25 +25,25 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.PlatWDdetailyActivity;
-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.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.ComplaintDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.Date;
 import java.util.HashMap;

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

@@ -28,20 +28,20 @@ import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 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.ViewUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -28,7 +28,7 @@ import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
 import com.core.net.http.http.OnHttpResultListener;

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

@@ -18,14 +18,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.core.utils.ToastUtil;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
+import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.HashMap;

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

@@ -15,6 +15,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
 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.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.OAConfig;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonInterface;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.SwitchView;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechError;
@@ -22,25 +34,13 @@ 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.core.app.MyApplication;
+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.bean.oa.SelectBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.util.ArrayList;

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

@@ -21,6 +21,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.OABaseActivity;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;

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

@@ -9,13 +9,13 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+import com.core.model.SelectBean;
+import com.core.widget.view.SwitchView;
 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.base.BaseActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;

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

@@ -27,26 +27,27 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
+import com.core.app.AppConfig;
+import com.core.app.MyApplication;
+import com.core.base.OABaseActivity;
+import com.core.model.OAConfig;
+import com.core.model.SelectBean;
+import com.core.widget.listener.EditChangeListener;
 import com.iflytek.cloud.RecognizerResult;
 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.core.app.AppConfig;
-import com.core.app.MyApplication;
+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.bean.oa.SelectBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
 import com.xzjmyk.pm.activity.ui.erp.activity.AppWebViewActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.ApprovalAdapter;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.ui.erp.presenter.ApprovaPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IApproval;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.util.oa.RecognizerDialogUtil;
 
 import java.util.ArrayList;

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

@@ -21,11 +21,11 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.core.model.SelectBean;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
+import com.core.model.WorkModel;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;

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

@@ -40,7 +40,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.core.utils.helper.AvatarHelper;
 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/oa/DestinationActivity.java

@@ -26,20 +26,20 @@ import com.baidu.mapapi.model.LatLng;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.MissionModel;
+import com.core.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.ClearEditText;
+import com.core.widget.listener.EditChangeListener;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
-import com.core.net.http.ViewUtil;
-import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.widget.ClearEditText;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 
 import java.text.DecimalFormat;

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

@@ -46,6 +46,19 @@ import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -55,8 +68,6 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
 import com.xzjmyk.pm.activity.bean.oa.CostBean;
@@ -64,28 +75,17 @@ import com.xzjmyk.pm.activity.bean.oa.CostSingleBean;
 import com.xzjmyk.pm.activity.bean.oa.CostTypeSingleBean;
 import com.xzjmyk.pm.activity.bean.oa.CostUpdatePModel;
 import com.xzjmyk.pm.activity.bean.oa.SaveCostDetailsGridStoreBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.bean.oa.UpdateCostDetailsGridStoreBean;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.AddCostBean;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.CostFormModel;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 
 import java.io.File;

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

@@ -24,20 +24,19 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.EmployeesModel;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.FlightsModel;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.FlightsTimeModel;
 import com.core.net.http.ViewUtil;
+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;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -14,12 +14,13 @@ import android.widget.TextView;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.OABaseActivity;
+import com.core.model.SelectBean;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+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.bean.oa.SelectBean;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.FlightsTimeModel;
-import com.xzjmyk.pm.activity.view.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.TimePicker;

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

@@ -23,11 +23,11 @@ import com.baidu.mapapi.search.poi.PoiDetailResult;
 import com.baidu.mapapi.search.poi.PoiIndoorResult;
 import com.baidu.mapapi.search.poi.PoiResult;
 import com.common.data.StringUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.core.net.location.BdLocationHelper;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
+import com.core.net.location.BdLocationHelper;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 
 import java.util.List;

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

@@ -17,18 +17,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.model.SearchPoiParam;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.MeetEntity;
 import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
-import com.xzjmyk.pm.activity.bean.oa.SearchPoiParam;
-import com.core.base.BaseActivity;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

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

@@ -19,20 +19,20 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
 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.bean.oa.MeetEntity;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-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.EmptyLayout;
-import com.core.widget.VoiceSearchView;
-import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -19,29 +19,31 @@ import com.baidu.mapapi.search.route.DrivingRouteLine;
 import com.baidu.mapapi.search.route.DrivingRouteResult;
 import com.common.LogUtil;
 import com.common.data.CalendarUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
-import com.core.net.location.BdLocationHelper;
 import com.core.app.MyApplication;
+import com.core.base.OABaseActivity;
+import com.core.model.MissionModel;
+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.uas.appworks.OA.erp.activity.MissionSetActivity;
+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.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.MissionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMission;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IMissionPresenter;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
-import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
-import com.xzjmyk.pm.activity.view.MostLinearLayoutManager;
+import com.xzjmyk.pm.activity.util.oa.PopupWindowHelper;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.List;
 

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

@@ -27,27 +27,26 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.api.wxapi.ApiConfig;
+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.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.EmptyLayout;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.db.dao.MessageDao;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewCommActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.MessageModel;
-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.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.utils.TimeUtils;
-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;

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

@@ -36,46 +36,47 @@ import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
 import com.common.thread.ThreadUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUAS;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConfig;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.OAConfig;
+import com.core.net.http.ViewUtil;
+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.CommonInterface;
+import com.core.utils.TimeUtils;
+import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.AppConfig;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OAAdapter;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskDetailB2BActivity;
-import com.core.utils.TimeUtils;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.util.oa.OAHttpUtil;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.OACalendarView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUAS;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -202,7 +203,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             finish();
         } else if (item.getItemId() == R.id.add_item) {
             if (isCrm) {//从客户
-                startActivityForResult(OAConfig.getVisitClass(ct), 0x20);
+                startActivityForResult(getVisitClass(ct), 0x20);
             } else
                 showPopupWindow(getWindow().findViewById(R.id.add_item));
         } else {
@@ -337,7 +338,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     }
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (e.isVisitRecord()) {
-                    intent = OAConfig.getVisitClass(ct);
+                    intent = getVisitClass(ct);
                     intent.putExtra("type", 2);
                     String chche = object.containsKey("status") ? object.getString("status") == null ? "" : object.getString("status") : "";
                     boolean me = (isMe && !"已拜访".equals(chche) && !"".equals(chche));
@@ -347,7 +348,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                     startActivityForResult(intent, isMe ? 0x20 : 0x21);
                 } else if (e.isMission()) {
                     if (util.isMissionOk(e)) {//外勤计划
-                        intent = OAConfig.getVisitClass(ct);
+                        intent =getVisitClass(ct);
                         intent.putExtra("type", 3);
                         intent.putExtra("isOutplan", true);
                         intent.putExtra("isMe", isMe);//可以提交拜访报告
@@ -797,7 +798,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                             intent.putExtra("type", 1);
                             break;
                         case 2:
-                            intent = OAConfig.getVisitClass(ct);
+                            intent =getVisitClass(ct);
                             break;
                         default:
                             String caller = (String) menusMap.get(position).get("item_caller");
@@ -1089,5 +1090,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         return super.dispatchTouchEvent(ev);
     }
 
-
+    public  Intent getVisitClass(Context ct) {
+        return new Intent(ct, OAConfig.canShowCrm2_0() ? AddVisitReportActivity.class : VisitReportAddActivity.class);
+    }
 }

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

@@ -18,6 +18,7 @@ import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
+import com.core.base.OABaseActivity;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
@@ -33,7 +34,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.OAPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IOAView;
 import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.erp.view.calender.OnCalendarClickListener;
 import com.xzjmyk.pm.activity.ui.erp.view.calender.month.MonthCalendarView;
 import com.xzjmyk.pm.activity.util.oa.OAHttpUtil;

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

@@ -24,15 +24,14 @@ import com.common.data.StringUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.utils.helper.AvatarHelper;
 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.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;

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

@@ -42,17 +42,17 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
+import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
+import com.core.widget.listener.EditChangeListener;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;

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

@@ -15,15 +15,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.AppConfig;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonInterface;
+import com.core.widget.view.SwitchView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 
 import java.util.HashMap;

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

@@ -18,24 +18,24 @@ import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.EmptyLayout;
+import com.core.widget.VoiceSearchView;
 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.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PlatDailyAdapter;
 import com.xzjmyk.pm.activity.bean.oa.PlatDailyBean;
-import com.core.base.BaseActivity;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
-import com.core.utils.TimeUtils;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -27,30 +27,30 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.PlatComAfAdapter;
-import com.xzjmyk.pm.activity.bean.oa.PlatComAfBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
-import com.core.utils.helper.AvatarHelper;
 import com.core.base.BaseActivity;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
-import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
+import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
+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.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;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
 import com.xzjmyk.pm.activity.ui.platform.activity.ChangeDealManActivity;
-import com.core.utils.TimeUtils;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.MyListView;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -17,12 +17,12 @@ 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.MeetingDocBean;
-import com.xzjmyk.pm.activity.bean.oa.SelectBean;
+import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonInterface;
+import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 

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

@@ -9,19 +9,20 @@ import android.widget.RelativeLayout;
 
 import com.baidu.mapapi.map.MapView;
 import com.baidu.mapapi.model.LatLng;
+import com.common.data.ListUtils;
+import com.core.base.OABaseActivity;
+import com.core.utils.ToastUtil;
+import com.core.widget.EmptyLayout;
+import com.core.widget.listener.EditChangeListener;
 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.SearchLocationAdapter;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SearchLocationModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SearchPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISearchView;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.core.utils.ToastUtil;
 
 import java.util.List;
 

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

@@ -21,18 +21,18 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.BaseActivity;
+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.ToastUtil;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.listener.EditChangeListener;
 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.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.core.widget.VoiceSearchView;
-import com.core.utils.ToastUtil;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -27,10 +27,10 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 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.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
+import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.api.wxapi.ApiConfig;

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

@@ -12,12 +12,13 @@ import android.widget.LinearLayout;
 import com.baidu.mapapi.map.MapView;
 import com.common.data.StringUtil;
 import com.common.system.InputMethodUtil;
+import com.core.base.OABaseActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectAimAdapter;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
+import com.core.widget.listener.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.SelectAimModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectAimPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectAim;

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

@@ -11,22 +11,23 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.LogUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.base.OABaseActivity;
+import com.core.constant.OAConfig;
+import com.core.utils.sortlist.BaseSortModel;
+import com.core.utils.sortlist.SideBar;
+import com.core.widget.EmptyLayout;
+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.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.bean.oa.SelectEmUser;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.sortlist.SideBar;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.SelectCollisionAdapter;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
-import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
 import com.xzjmyk.pm.activity.ui.erp.presenter.SelectCollisionPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.core.widget.VoiceSearchView;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
 
 import java.util.List;
 

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

@@ -16,29 +16,30 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+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.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.OABaseActivity;
 import com.core.dao.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.core.model.HrorgsEntity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.util.oa.CompanyHandlerInfoUtil;
-import com.xzjmyk.pm.activity.util.oa.OAConfig;
+import com.core.model.OAConfig;
 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.CompanyHandlerInfoUtil;
+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.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;
 import com.xzjmyk.pm.activity.ui.erp.view.tree.TreeListViewAdapter;
-import com.xzjmyk.pm.activity.ui.erp.view.tree.bean.HrorgsModel;
-import com.core.widget.ClearEditText;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;