合并代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'
@@ -125,7 +125,8 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    compile files('libs/pushservice-4.5.5.77.jar')
+//    compile files('libs/pushservice-4.5.5.77.jar')
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
     compile project(':library-refreshlayout')
+    compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
 }

WeiChat/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="79"
-    android:versionName="5.5.7">
+    android:versionCode="73"
+    android:versionName="5.5.9">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -61,7 +61,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <!-- Push service 运行需要的权限 -->
     <!-- Push service 运行需要的权限 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -70,10 +69,12 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 富媒体需要声明的权限 -->
+    <uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER" />
+    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
 
 
@@ -315,9 +316,11 @@
             android:enabled="true"
             android:process=":remote" />
 
+        <!--正式apikey-->
         <meta-data
             android:name="com.baidu.lbsapi.API_KEY"
             android:value="KxANrz9HRWVqGGCm2cN8mXarpW0bBuYA" />
+
         <!-- 文件选择的activity -->
         <activity
             android:name="com.ipaulpro.afilechooser.FileChooserActivity"
@@ -373,17 +376,17 @@
         <!-- baidu  push service start -->
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <!-- push富媒体，使用富媒体推送必须声明 -->
-     <!--   <activity
-            android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="MediaViewActivity" >
-        </activity>
-        <activity
-            android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:label="MediaListActivity"
-            android:launchMode="singleTask" >
-        </activity>-->
+        <!--   <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaViewActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaViewActivity" >
+           </activity>
+           <activity
+               android:name="com.baidu.android.pushservice.richmedia.MediaListActivity"
+               android:configChanges="orientation|keyboardHidden"
+               android:label="MediaListActivity"
+               android:launchMode="singleTask" >
+           </activity>-->
         <!-- push富媒体结束 -->
 
         <!-- push应用定义消息receiver声明 -->
@@ -398,22 +401,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- push必须的receviver和service声明 -->
-        <receiver
-            android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            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" />
-                <action android:name="com.baidu.android.pushservice.action.media.CLICK" />
-                <!-- 以下四项为可选的action声明，可大大提高service存活率和消息到达速度 -->
-                <action android:name="android.intent.action.MEDIA_MOUNTED" />
-                <action android:name="android.intent.action.USER_PRESENT" />
-                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
-                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
-            </intent-filter>
-        </receiver>
         <!-- oA模块提醒功能本地推送 -->
         <receiver android:name=".ui.erp.util.alarm.AlarmReceiver">
             <intent-filter>
@@ -424,47 +411,11 @@
                 <action android:name="OFFWORK_ALARM_ACTION" />
             </intent-filter>
         </receiver>
-        <!-- Push服务接收客户端发送的各种请求 -->
-        <receiver
-            android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            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>
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
 
-        <service
-            android:name="com.baidu.android.pushservice.PushService"
-            android:exported="true"
-            android:process=":bdservice_v1">
-            <intent-filter android:priority="1000">
-                <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
-            </intent-filter>
-        </service>
         <service
             android:name="com.baidu.android.pushservice.CommandService"
             android:exported="true" />
 
-        <!-- 适配Android N系统必需的ContentProvider声明，写权限包含应用包名-->
-        <!-- <provider
-             android:name="com.baidu.android.pushservice.PushInfoProvider"
-             android:authorities="com.baidu.push.example.bdpush"
-             android:writePermission="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example"
-             android:protectionLevel = "signature"
-             android:exported="true" />-->
-
-        <!-- 在百度开发者中心查询应用的API Key -->
-        <meta-data
-            android:name="api_key"
-            android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
-
         <!--
             <activity android:name=".ui.erp.activity.NoticeMenuActivity" >
             <intent-filter>
@@ -760,6 +711,75 @@
             android:enabled="true"
             android:exported="true" />
         <activity android:name=".ui.erp.activity.form.DataFormDetailActivity" />
+
+        <!--百度推送相关-->
+        <!-- push必须的receviver和service声明 -->
+        <receiver
+            android:name="com.baidu.android.pushservice.PushServiceReceiver"
+            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" />
+                <action android:name="com.baidu.android.pushservice.action.media.CLICK" />
+                <!-- 以下四项为可选的action声明，可大大提高service存活率和消息到达速度 -->
+                <action android:name="android.intent.action.MEDIA_MOUNTED" />
+                <action android:name="android.intent.action.USER_PRESENT" />
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Push服务接收客户端发送的各种请求 -->
+        <receiver
+            android:name="com.baidu.android.pushservice.RegistrationReceiver"
+            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>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REMOVED" />
+
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="com.baidu.android.pushservice.PushService"
+            android:exported="true"
+            android:process=":bdservice_v1">
+            <intent-filter android:priority="1000">
+                <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
+            </intent-filter>
+        </service>
+
+        <!-- 4.4版本新增的CommandService声明，提升小米和魅族手机上的实际推送到达率 -->
+        <service
+            android:name="com.baidu.android.pushservice.CommandService"
+            android:exported="true" />
+        <!-- push结束 -->
+
+        <!-- 适配Android N系统必需的ContentProvider声明，写权限包含应用包名-->
+        <provider
+            android:name="com.baidu.android.pushservice.PushInfoProvider"
+            android:authorities="com.xzjmyk.pm.activity.bdpush"
+            android:exported="true"
+            android:protectionLevel="signature"
+            android:writePermission="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity" />
+
+        <!-- 在百度开发者中心查询应用的API Key -->
+        <meta-data
+            android:name="api_key"
+            android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
+
+        <!--测试apikey-->
+        <!--<meta-data
+            android:name="api_key"
+            android:value="03kY3VdsbU2khqSf8X1GbGRC" />-->
+
+        <!--百度推送相关结束-->
+
     </application>
 
 </manifest>

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

@@ -141,7 +141,7 @@ public class MyFriendActivity extends BaseActivity {
                     mPullToRefreshListView.getRefreshableView().setSelection(position + count);
                 }
                 if ("↑".equals(s)) {
-                    mPullToRefreshListView.getRefreshableView().setSelection(1);
+                    mPullToRefreshListView.getRefreshableView().setSelection(0);
                 }
             }
 

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

@@ -164,7 +164,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                     refreshListView.setSelection(position + count);
                 }
                 if ("↑".equals(s)) {
-                    refreshListView.setSelection(1);
+                    refreshListView.setSelection(0);
                 }
             }
 

library-refreshlayout/src/main/java/com/yalantis/phoenix/refresh_view/SunRefreshView.java

@@ -8,6 +8,7 @@ import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.graphics.drawable.Animatable;
 import android.view.animation.Animation;
 import android.view.animation.Interpolator;
@@ -56,7 +57,7 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
     private float mTownFinalTopOffset;
     private float mTownMoveOffset;
 
-    private int mSunSize = 100;
+    private int mSunSize = 30;
     private float mSunLeftOffset;
     private float mSunTopOffset;
 
@@ -115,7 +116,7 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
         mTown = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.buildings, options);
         mTown = Bitmap.createScaledBitmap(mTown, mScreenWidth, (int) (mScreenWidth * TOWN_RATIO), true);
         mSun = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.sun, options);
-        mSun = Bitmap.createScaledBitmap(mSun, mSunSize, mSunSize, true);
+        mSun = Bitmap.createScaledBitmap(mSun, sp2px(getContext(), mSunSize), sp2px(getContext(), mSunSize), true);
     }
 
     @Override
@@ -210,10 +211,22 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
 //        canvas.drawBitmap(mTown, matrix, null);
         Paint paint = new Paint();
         paint.setColor(Color.BLACK);
-        paint.setTextSize(40);
-        canvas.drawText("下拉刷新",mScreenWidth/2 - paint.measureText("下拉刷新")/2,mParent.getTotalDragDistance()/2+10,paint);
+        paint.setAntiAlias(true);
+        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+        paint.setTextSize(sp2px(getContext(), 14));
+        if (isRefreshing)
+            canvas.drawText("正在刷新", mScreenWidth / 2 - paint.measureText("正在刷新") / 2, mParent.getTotalDragDistance() / 2 + 12, paint);
+        else
+            canvas.drawText("下拉刷新", mScreenWidth / 2 - paint.measureText("下拉刷新") / 2, mParent.getTotalDragDistance() / 2 + 12, paint);
+
+    }
+
+    public static int sp2px(Context context, float spValue) {
+        final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
+        return (int) (spValue * fontScale + 0.5f);
     }
 
+
     private void drawSun(Canvas canvas) {
         Matrix matrix = mMatrix;
         matrix.reset();
@@ -223,7 +236,7 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
             dragPercent = (dragPercent + 9.0f) / 10;
         }
 
-        float sunRadius = (float) mSunSize / 2.0f;
+        float sunRadius = (float) sp2px(getContext(), mSunSize) / 2.0f;
         float sunRotateGrowth = SUN_INITIAL_ROTATE_GROWTH;
 
         float offsetX = mSunLeftOffset;
@@ -232,7 +245,7 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
                 - mTop; // Depending on Canvas position
 
         float scalePercentDelta = dragPercent - SCALE_START_PERCENT;
-        if (scalePercentDelta > 0) {
+        /*if (scalePercentDelta > 0) {
             float scalePercent = scalePercentDelta / (1.0f - SCALE_START_PERCENT);
             float sunScale = 1.0f - (1.0f - SUN_FINAL_SCALE) * scalePercent;
             sunRotateGrowth += (SUN_FINAL_ROTATE_GROWTH - SUN_INITIAL_ROTATE_GROWTH) * scalePercent;
@@ -247,13 +260,17 @@ public class SunRefreshView extends BaseRefreshView implements Animatable {
 
             offsetX += sunRadius;
             offsetY += sunRadius;
-        }
+        }*/
 
+//        matrix.postRotate(
+//                (isRefreshing ? 360 : -360) * mRotate * (isRefreshing ? 1 : sunRotateGrowth),
+//                offsetX,
+//                offsetY);
+        matrix.setTranslate(60, 25);
         matrix.postRotate(
                 (isRefreshing ? 360 : -360) * mRotate * (isRefreshing ? 1 : sunRotateGrowth),
-                offsetX,
-                offsetY);
-
+                60 + sunRadius,
+                25 + sunRadius);
         canvas.drawBitmap(mSun, matrix, null);
     }