Browse Source

1、推送sdk更新,配置
2、审批页面附件查看

RaoMeng 6 years ago
parent
commit
f5a3259cad
28 changed files with 38 additions and 42 deletions
  1. 8 3
      WeiChat/build.gradle
  2. 17 23
      WeiChat/src/main/AndroidManifest.xml
  3. 4 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java
  4. 0 5
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/PushNetMessageReceiver.java
  5. BIN
      WeiChat/src/main/jniLibs/arm64-v8a/libbdpush_V2_9.so
  6. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libbdpush_V2_4.so
  7. BIN
      WeiChat/src/main/jniLibs/armeabi-v7a/libbdpush_V2_9.so
  8. BIN
      WeiChat/src/main/jniLibs/armeabi/libbdpush_V2_4.so
  9. BIN
      WeiChat/src/main/jniLibs/armeabi/libbdpush_V2_9.so
  10. BIN
      WeiChat/src/main/jniLibs/autoupdatesdk-release.aar
  11. BIN
      WeiChat/src/main/jniLibs/mips/libbdpush_V2_4.so
  12. BIN
      WeiChat/src/main/jniLibs/mips/libbdpush_V2_7.so
  13. BIN
      WeiChat/src/main/jniLibs/mips/libbdpush_V2_9.so
  14. BIN
      WeiChat/src/main/jniLibs/mips64/libbdpush_V2_4.so
  15. BIN
      WeiChat/src/main/jniLibs/mips64/libbdpush_V2_7.so
  16. BIN
      WeiChat/src/main/jniLibs/mips64/libbdpush_V2_9.so
  17. BIN
      WeiChat/src/main/jniLibs/pushservice-6.7.3.20.jar
  18. BIN
      WeiChat/src/main/jniLibs/x86/libbdpush_V2_4.so
  19. BIN
      WeiChat/src/main/jniLibs/x86/libbdpush_V2_7.so
  20. BIN
      WeiChat/src/main/jniLibs/x86/libbdpush_V2_9.so
  21. BIN
      WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_4.so
  22. BIN
      WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_7.so
  23. BIN
      WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_9.so
  24. 3 3
      WeiChat/version.properties
  25. BIN
      app_core/common/libs/pushservice-5.3.0.99.jar
  26. BIN
      app_core/common/libs/pushservice-6.7.3.20.jar
  27. 0 3
      app_core/common/src/main/java/com/core/app/AppConstant.java
  28. 6 1
      app_modular/apputils/src/main/java/com/modular/apputils/network/FileDownloader.java

+ 8 - 3
WeiChat/build.gradle

@@ -52,7 +52,6 @@ def getVersionCode() {
 
 
 android {
-    
     def versionArray = getVersionCode()
     //====================Add below two line=============
     dexOptions {
@@ -104,6 +103,12 @@ android {
         abortOnError false
     }
 
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
+    }
+
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
@@ -157,10 +162,10 @@ android {
         }
     }*/
 
-  
+
 }
 
-repositories{
+repositories {
     flatDir {
         dirs 'libs'
     }

+ 17 - 23
WeiChat/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.xzjmyk.pm.activity"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:versionCode="158"
-          android:versionName="6.1.9">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.xzjmyk.pm.activity"
+    android:versionCode="158"
+    android:versionName="6.1.9">
 
     <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="22" />
+        android:minSdkVersion="17"
+        android:targetSdkVersion="26" />
     <!-- share umeng -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -71,12 +71,11 @@
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
 
-    <!-- 适配Android N系统必需的ContentProvider写权限声明,写权限包含应用包名 -->
-    <!-- <uses-permission android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example" /> -->
-    <!-- <permission -->
-    <!-- android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.baidu.push.example" -->
-    <!-- android:protectionLevel="normal"> -->
-    <!-- </permission> -->
+    <!-- 适配Android N系统必需的ContentProvider写权限声明,写权限包含应用包名-->
+    <uses-permission android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity" />
+    <permission
+        android:name="baidu.push.permission.WRITE_PUSHINFOPROVIDER.com.xzjmyk.pm.activity"
+        android:protectionLevel="signature"></permission>
 
     <!-- 百度自动更新 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -375,8 +374,7 @@
 
 
         <activity android:name=".video.VideoRecordActivity" />
-        <activity
-            android:name="com.uas.appme.other.activity.CardcastActivity" />
+        <activity android:name="com.uas.appme.other.activity.CardcastActivity" />
         <activity
             android:name="com.uas.appme.other.activity.BasicInfoEditActivity"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
@@ -522,10 +520,10 @@
         <!-- 百度 -->
         <meta-data
             android:name="BDAPPID"
-            android:value="7178311" />
+            android:value="10537889" />
         <meta-data
             android:name="BDAPPKEY"
-            android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
+            android:value="bCH2mzKcIjefS9PvqwDdBrNBGSWrHETK" />
         <!-- <meta-data -->
         <!-- android:name="BDAPPID" -->
         <!-- android:value="8037149" /> -->
@@ -556,8 +554,7 @@
         <!--</intent-filter>-->
         <!--</receiver>-->
 
-        <activity
-            android:name=".video.VideoActivity" />
+        <activity android:name=".video.VideoActivity" />
         <activity
             android:name=".ui.erp.activity.CompanyActivity"
             android:hardwareAccelerated="true" />
@@ -767,14 +764,12 @@
         </service>
         <!-- </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"
@@ -803,7 +798,6 @@
         <!-- push应用定义消息receiver声明 -->
         <receiver android:name=".ui.PushNetMessageReceiver">
             <intent-filter android:priority="1000">
-
                 <!-- 接收push消息 -->
                 <action android:name="com.baidu.android.pushservice.action.MESSAGE" />
                 <!-- 接收bind,unbind,fetch,delete等反馈消息 -->
@@ -821,7 +815,7 @@
 
         <meta-data
             android:name="api_key"
-            android:value="EmEVqG9NiKchcSbkoGkiyG2F2rp8YNmf" />
+            android:value="bCH2mzKcIjefS9PvqwDdBrNBGSWrHETK" />
         <!-- 百度推送相关结束 -->
 
 

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

@@ -601,7 +601,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, 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(), AppConstant.BAIDU_PUSH);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), com.core.app.Constants.BAIDU_PUSH, 1);
         if (isPush == 0) {
             PushManager.stopWork(this);
         }
@@ -923,10 +923,10 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                 cal.set(Calendar.MILLISECOND, 0);
                 long startcal = cal.getTimeInMillis();
                 long endcal = cal.getTimeInMillis() + 24 * 60 * 60 * 1000;
-                List<Schedule> systemSchedule =null;
-                try{
+                List<Schedule> systemSchedule = null;
+                try {
                     ScheduleUtils.getSystemCalendar(MyApplication.getInstance(), startcal, endcal);
-                }catch (Exception e){
+                } catch (Exception e) {
 
                 }
                 for (int i = 0; i < dataArray.size(); i++) {

+ 0 - 5
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/PushNetMessageReceiver.java

@@ -59,7 +59,6 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 
             @Override
             public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
-                // TODO Auto-generated method stub
                 Log.d("wang", "上传channelId成功了");
             }
 
@@ -176,15 +175,11 @@ public class PushNetMessageReceiver extends PushMessageReceiver {
 
     @Override
     public void onSetTags(Context arg0, int arg1, List<String> arg2, List<String> arg3, String arg4) {
-        // TODO Auto-generated method stub
 
     }
 
     @Override
     public void onUnbind(Context arg0, int arg1, String arg2) {
-
         Log.i("wang", arg1 + "++++++" + arg2);
     }
-
-
 }

BIN
WeiChat/src/main/jniLibs/arm64-v8a/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/armeabi/libbdpush_V2_7.so → WeiChat/src/main/jniLibs/armeabi-v7a/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/armeabi/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libbdpush_V2_7.so → WeiChat/src/main/jniLibs/armeabi/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/autoupdatesdk-release.aar


BIN
WeiChat/src/main/jniLibs/mips/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/mips/libbdpush_V2_7.so


BIN
WeiChat/src/main/jniLibs/mips/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/mips64/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/mips64/libbdpush_V2_7.so


BIN
WeiChat/src/main/jniLibs/mips64/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/pushservice-6.7.3.20.jar


BIN
WeiChat/src/main/jniLibs/x86/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/x86/libbdpush_V2_7.so


BIN
WeiChat/src/main/jniLibs/x86/libbdpush_V2_9.so


BIN
WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_4.so


BIN
WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_7.so


BIN
WeiChat/src/main/jniLibs/x86_64/libbdpush_V2_9.so


+ 3 - 3
WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Oct 14 09:35:00 CST 2019
+#Mon Oct 28 17:13:04 CST 2019
 debugName=972
-versionName=702
+versionName=703
 debugCode=972
-versionCode=256
+versionCode=257

BIN
app_core/common/libs/pushservice-5.3.0.99.jar


BIN
app_core/common/libs/pushservice-6.7.3.20.jar


+ 0 - 3
app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -58,7 +58,6 @@ public class AppConstant {
 
 
     public static final String UPHEAD = "UPHEAD";
-    public  static  final  String BAIDU_PUSH = "BAIDU_PUSH";
     public static final String FRIEND = "friend";
 
 
@@ -72,8 +71,6 @@ public class AppConstant {
     public static final String action_save_ = "NEW_FUNCTION_NOTICE";
 
 
-
-
     public static final String UPDATA_UUHELPER = "UPDATA_UUHELPER";
     public static final String UUSPORT_PUSH = "UUSPORT_PUSH";
     public static final String UPDATE_STEPRANKING_PRISE = "UPDATE_STEPRANKING_PRISE";

+ 6 - 1
app_modular/apputils/src/main/java/com/modular/apputils/network/FileDownloader.java

@@ -141,7 +141,12 @@ public class FileDownloader {
             if (fileNames != null && fileNames.length > 1) {
                 String fileName = fileNames[1];
                 if (!TextUtils.isEmpty(fileName)) {
-                    fileName = fileName.substring(1, fileName.length());
+                    if (fileName.startsWith("\"") || fileName.startsWith("“")) {
+                        fileName = fileName.substring(1, fileName.length());
+                    }
+                    if (fileName.endsWith("\"") || fileName.endsWith("”")) {
+                        fileName =  fileName.substring(0, fileName.length() - 1);
+                    }
                     if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
                         final String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/uu/download";
                         File file = new File(path);