合并最终发布版

WeiChat/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="81"
-    android:versionName="5.6.8" >
+    android:versionName="5.6.8">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -120,14 +120,14 @@
         android:label="@string/app_name"
         android:largeHeap="true"
         android:persistent="true"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_CHANNEL"
             android:value="baidu" />
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme" >
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -139,7 +139,7 @@
         <!-- 异常跳转页面 -->
         <activity
             android:name=".CustomCrashActivity"
-            android:process=":error_activity" >
+            android:process=":error_activity">
             <intent-filter>
                 <action android:name="cat.ereza.customactivityoncrash.ERROR" />
             </intent-filter>
@@ -337,7 +337,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme" >
+            android:theme="@style/ChooserTheme">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -354,13 +354,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS" >
+            android:permission="android.permission.MANAGE_DOCUMENTS">
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -395,7 +395,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity" >
+        <activity android:name=".ui.message.SelectCardActivity">
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -429,7 +429,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -606,7 +606,7 @@
         <activity
             android:name="com.tencent.tauth.AuthActivity"
             android:launchMode="singleTask"
-            android:noHistory="true" >
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -624,7 +624,7 @@
         <activity
             android:name=".WBShareActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
 
@@ -658,8 +658,8 @@
         <!-- push必须的receviver和service声明 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1" >
-            <intent-filter android:priority="1000" >
+            android:process=":bdservice_v1">
+            <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
                 <action android:name="com.baidu.android.pushservice.action.notification.SHOW" />
@@ -675,8 +675,8 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1" >
-            <intent-filter android:priority="1000" >
+            android:process=":bdservice_v1">
+            <intent-filter android:priority="1000">
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
             </intent-filter>
@@ -690,8 +690,8 @@
         <service
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
-            android:process=":bdservice_v1" >
-            <intent-filter android:priority="1000" >
+            android:process=":bdservice_v1">
+            <intent-filter android:priority="1000">
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
         </service>
@@ -731,8 +731,8 @@
         -->
         <!-- push富媒体结束 -->
         <!-- push应用定义消息receiver声明 -->
-        <receiver android:name=".ui.PushNetMessageReceiver" >
-            <intent-filter android:priority="1000" >
+        <receiver android:name=".ui.PushNetMessageReceiver">
+            <intent-filter android:priority="1000">
 
                 <!-- 接收push消息 -->
                 <action android:name="com.baidu.android.pushservice.action.MESSAGE" />
@@ -743,7 +743,7 @@
         </receiver>
         <!-- 在百度开发者中心查询应用的API Key -->
 
-        <receiver android:name=".ui.erp.util.auto.DateTimeReceiver" >
+        <receiver android:name=".ui.erp.util.auto.DateTimeReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.DATE_CHANGED" />
             </intent-filter>
@@ -795,8 +795,8 @@
         <service
             android:name="com.xzjmyk.pm.basepedo.service.StepService"
             android:priority="1000"
-            android:process="com.uu.step" >
-            <intent-filter android:priority="1000" >
+            android:process="com.uu.step">
+            <intent-filter android:priority="1000">
 
                 <!-- 系统启动完成后会调用 -->
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -809,7 +809,7 @@
             </intent-filter>
         </service>
 
-        <receiver android:name="com.xzjmyk.pm.basepedo.service.BootCompleteReceiver" >
+        <receiver android:name="com.xzjmyk.pm.basepedo.service.BootCompleteReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.USER_PRESENT" />
@@ -884,13 +884,13 @@
         <activity android:name=".ui.erp.activity.oa.MsgsSecondCommonActivity" />
         <activity android:name=".ui.platform.pageforms.WorkPageActivity" />
 
-        <!-- 独立模块需要重写的界面-->
-        <activity android:name=".ui.platform.pageforms.LeavePageActivity"/>
-        <activity android:name=".ui.erp.activity.oa.PlatDailyShowActivity"/>
-        <activity android:name=".ui.erp.activity.oa.PlatWDdetailyActivity"/>
+        <!-- 独立模块需要重写的界面 -->
+        <activity android:name=".ui.platform.pageforms.LeavePageActivity" />
+        <activity android:name=".ui.erp.activity.oa.PlatDailyShowActivity" />
+        <activity android:name=".ui.erp.activity.oa.PlatWDdetailyActivity" />
         <activity android:name=".ui.platform.pageforms.TravelPageActivity" />
-        <activity android:name=".ui.platform.pageforms.FormDetailActivity" >
-        </activity>
+        <activity android:name=".ui.platform.pageforms.FormDetailActivity"></activity>
+        <activity android:name=".ui.message.SubscriptionActivity"></activity>
     </application>
 
-</manifest>
+</manifest>

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

@@ -497,7 +497,7 @@ public class TaskActivity extends BaseActivity {
             @Override
             public void onClick(View v) {
                 popupWindow.dismiss();//loadWebView("jsps/mobile/addTask.jsp");
-                context.startActivity(new Intent(context, AddTaskActivity.class));
+                TaskActivity.this.startActivityForResult(new Intent(context, AddTaskActivity.class), 0x17);
             }
         });
 
@@ -626,7 +626,7 @@ public class TaskActivity extends BaseActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
-        if (requestCode == 0x20 && resultCode == 0x20) {
+        if (requestCode == 0x17 || requestCode == 0x20 && resultCode == 0x20) {
             refreshing();
         }
     }

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

@@ -6,7 +6,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 
@@ -91,7 +90,6 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
             public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
                 if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
-                    Log.i("gongpengming", "进来了 addOnScrollListener");
                     AndroidUtils.hideInput(ct, search_edit);
                 }
             }

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

@@ -219,11 +219,14 @@ public class SelectActivePresenter implements HttpHandler.OnResultListener {
 
     private void setUser2Sort(List<SelectEmUser> list, boolean isClick) {
         int numSelect = 0;
+        if (!StringUtils.isEmpty(selectName)) {
+            selectName.replaceAll("'", "");
+            selectName = "," + selectName + ",";
+        }
         for (SelectEmUser e : list) {
             BaseSortModel<SelectEmUser> mode = new BaseSortModel<>();
             if (!isClick && !StringUtils.isEmpty(selectName)) {
-                selectName=","+selectName+",";
-                if (StringUtils.isInclude(selectName, ","+e.getEmName()+",")) {
+                if (StringUtils.isInclude(selectName, "," + e.getEmName() + ",")) {
                     numSelect++;
                     mode.setClick(true);
                 }

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

@@ -0,0 +1,17 @@
+package com.xzjmyk.pm.activity.ui.erp.presenter;
+
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+/**
+ * Created by Bitliker on 2017/3/17.
+ */
+
+public class SubscriptionPresenter {
+    private BaseActivity ct;
+
+    public void start(BaseActivity ct) {
+        this.ct = ct;
+    }
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.xzjmyk.pm.activity.ui.message;
+
+import android.os.Bundle;
+
+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.base.BaseActivity;
+
+public class SubscriptionActivity extends BaseActivity {
+    @ViewInject(R.id.listView)
+    private PullToRefreshListView listView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_subscription);
+        ViewUtils.inject(this);
+    }
+
+
+}

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

@@ -0,0 +1,22 @@
+<com.xzjmyk.pm.activity.view.ResizeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ptr="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical" >
+
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:id="@+id/listView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollingCache="false"
+        ptr:ptrAnimationStyle="flip"
+        ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
+        ptr:ptrDrawableStart="@drawable/default_ptr_flip"
+        ptr:ptrHeaderTextColor="@color/black"
+        ptr:ptrMode="both"
+        ptr:ptrOverScroll="false"
+        ptr:ptrScrollingWhileRefreshingEnabled="true"
+        ptr:ptrShowIndicator="false" />
+
+</com.xzjmyk.pm.activity.view.ResizeLayout>

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

@@ -25,7 +25,6 @@
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/title"
         android:layout_below="@id/title"
-        android:layout_marginTop="5dp"
         android:layout_toRightOf="@id/home_tag"
         android:text="请搜索地址后完善单位名称"
         android:textColor="@color/text_hine"