Merge remote-tracking branch 'origin/developer' into developer

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

WeiChat/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     signingConfigs {
-//        config {
-//            keyPassword '13237658359'
-//            storeFile file('C:/Users/Arisono/Desktop/applicationsignname[20150409]')
-//            storePassword '13237658359'
-//            keyAlias 'jie-20150409'
-//        }
+        config {
+            keyPassword '13237658359'
+            storeFile file('C:/Users/Arisono/Desktop/applicationsignname[20150409]')
+            storePassword '13237658359'
+            keyAlias 'jie-20150409'
+        }
     }
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
@@ -31,6 +31,7 @@ android {
         }
         debug {
 //            signingConfig signingConfigs.config
+            signingConfig signingConfigs.config
         }
     }
 }

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="42"
-    android:versionName="4.2">
+    android:versionCode="43"
+    android:versionName="4.3">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -55,7 +55,7 @@ public class PhoneSelectActivity extends AppCompatActivity {
             return null;
         }
 
-        class VoiewHolder{
+        class VoiewHolder {
 
 
         }

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

@@ -28,7 +28,7 @@ public class Constants {
     public final static int SUCCESS_B2B=4;//B2B登录成功
     public final static int SUCCESS_ERP=5;//ERP登录成功
     public final static int SUCCESS_INITDATA =7;
-    public final static int SUCCESS_SUBCRIPTION =0x8;
+    public final static int SUCCESS_SUBCRIPTION = 0x8;
     public final static int APP_SOCKETIMEOUTEXCEPTION=99;//网络请求超时，错误，404响应
 
 

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

@@ -421,10 +421,12 @@ public class MessageFragment extends EasyFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == MessageFragment.REQUESTCODE) {
-            GONGGAO_count = data.getIntExtra(NoticeMenuActivity.GONGGAO, -1);
-            NES_count = data.getIntExtra(NoticeMenuActivity.NES, -1);
-            NOTICE_count = data.getIntExtra(NoticeMenuActivity.NOTICE, -1);
-            setNOTICE_count(GONGGAO_count + NES_count + NOTICE_count);
+            if (data != null) {
+                GONGGAO_count = data.getIntExtra(NoticeMenuActivity.GONGGAO, -1);
+                NES_count = data.getIntExtra(NoticeMenuActivity.NES, -1);
+                NOTICE_count = data.getIntExtra(NoticeMenuActivity.NOTICE, -1);
+                setNOTICE_count(GONGGAO_count + NES_count + NOTICE_count);
+            }
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/MyListView.java

@@ -22,5 +22,6 @@ public class MyListView extends ListView {
 	public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 		int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
 		super.onMeasure(widthMeasureSpec, expandSpec);
+//		super.onMeasure(widthMeasureSpec,heightMeasureSpec);
 	}
 }