Skip to content

Issues:升级华为，个推，极光sdk版本 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
star-andy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issues:升级华为，个推，极光sdk版本 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {

defaultConfig {
//由于com.peng.one.push包名在魅族推送平台被OnePush其他使用者占用，现在修改为com.peng.one.push1
applicationId "com.peng.one.push1"
applicationId "com.mixpush.demo"
minSdkVersion 16
targetSdkVersion 25
versionCode 1
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
<!--个推推送静态注册-->
<meta-data
android:name="PUSH_APPID"
android:value="edX56uUoQ7ASr4ru4c3rVA"/>
android:value="SjLrkd2uHE8FMIzhCcpNM9"/>
<meta-data
android:name="PUSH_APPKEY"
android:value="Crl1UEA5Fd8tooEDmS5aA3"/>
android:value="18yy50piaC9Sb3BCM6pkE4"/>
<meta-data
android:name="PUSH_APPSECRET"
android:value="D9hcD0r6Ec5ANGSLY92XP3"/>
android:value="iX8FKkKEls8OS3tcr31Co7"/>

<!--魅族推送静态注册-->
<meta-data
Expand All @@ -56,12 +56,12 @@
android:value="developer"/>
<meta-data
android:name="JPUSH_APPKEY"
android:value="41bb9f84d2158a7be9de3b47"/>
android:value="ad82cb333cafb6108c7744f9"/>

<!--华为HMS推送静态注册-->
<meta-data
android:name="com.huawei.hms.client.appid"
android:value="100099491"/>
android:value="100352131"/>

<!--华为老版本推送不需要静态注册-->

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/peng/one/push1/PushApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import android.os.Process;
import android.util.Log;

import com.peng.one.push1.BuildConfig;
import com.peng.one.push.OnePush;

import java.util.List;

/**
Expand Down Expand Up @@ -35,7 +35,7 @@ public void onCreate() {
} else if(RomUtils.isFlymeRom()){
result = platformCode == 103;
} else {
result= platformCode == 106;
result= platformCode == 105;
}
Log.i(TAG, "Register-> code: "+platformCode+" name: "+platformName+" result: "+result);
return result;
Expand Down
2 changes: 0 additions & 2 deletions one-push-getui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
testCompile 'junit:junit:4.12'
// provided project(':one-push-core')
provided 'com.peng.library:one-push-core:1.2.1'
Expand Down
1 change: 0 additions & 1 deletion one-push-huawei-hms-lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'

}
Expand Down
1 change: 0 additions & 1 deletion one-push-huawei-hmsagents/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'
provided 'com.peng.library:one-push-core:1.2.1'
compile 'com.huawei.android.hms:push:2.6.0.301'
Expand Down
11 changes: 10 additions & 1 deletion one-push-jpush/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ android {
versionName "1.2.3"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

manifestPlaceholders = [
JPUSH_PKGNAME: "xxx",
JPUSH_APPKEY : "xxx", //JPush上注册的包名对应的appkey.
JPUSH_CHANNEL: "xxx", //暂时填写默认值即可.
]
}
buildTypes {
release {
Expand All @@ -31,8 +37,11 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.3.1'
testCompile 'junit:junit:4.12'

compile 'cn.jiguang.sdk:jpush:3.1.3' // 此处以JPush 3.1.5 版本为例。
compile 'cn.jiguang.sdk:jcore:1.2.1' // 此处以JCore 1.2.2 版本为例。

provided 'com.peng.library:one-push-core:1.2.3'
// provided project(':one-push-core')
}
Expand Down
Binary file removed one-push-jpush/libs/arm64-v8a/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/armeabi-v7a/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/armeabi/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/jcore-android-1.1.7.jar
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/jpush-android-3.0.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/mips/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/mips64/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/x86/libjcore117.so
View file
Open in desktop
Binary file not shown.
Binary file removed one-push-jpush/libs/x86_64/libjcore117.so
View file
Open in desktop
Binary file not shown.
112 changes: 2 additions & 110 deletions one-push-jpush/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,110 +3,10 @@
<!-- Required -->
<permission
android:name="${applicationId}.permission.JPUSH_MESSAGE"
android:protectionLevel="signature" />

<!-- Required 一些系统要求的权限，如访问网络等-->
<uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<!-- Optional for location -->
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
android:protectionLevel="signature"/>
<uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE"/>
<application>

<!-- Rich push 核心功能 since 2.0.6-->
<activity
android:name="cn.jpush.android.ui.PopWinActivity"
android:theme="@style/MyDialogStyle"
android:exported="false">
</activity>

<!-- Required SDK核心功能-->
<activity
android:name="cn.jpush.android.ui.PushActivity"
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.NoTitleBar"
android:exported="false">
<intent-filter>
<action android:name="cn.jpush.android.ui.PushActivity" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="${applicationId}" />
</intent-filter>
</activity>

<!-- Required SDK 核心功能-->
<!-- 可配置android:process参数将PushService放在其他进程中 -->
<service
android:name="cn.jpush.android.service.PushService"
android:process=":mult"
android:exported="false">
<intent-filter>
<action android:name="cn.jpush.android.intent.REGISTER" />
<action android:name="cn.jpush.android.intent.REPORT" />
<action android:name="cn.jpush.android.intent.PushService" />
<action android:name="cn.jpush.android.intent.PUSH_TIME" />
</intent-filter>
</service>
<!-- since 3.0.9 Required SDK 核心功能-->
<provider
android:authorities="${applicationId}.DataProvider"
android:name="cn.jpush.android.service.DataProvider"
android:exported="true"
/>

<!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
<!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
<service
android:name="cn.jpush.android.service.DaemonService"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="cn.jpush.android.intent.DaemonService" />
<category android:name="${applicationId}" />
</intent-filter>

</service>

<!-- Required SDK核心功能-->
<receiver
android:name="cn.jpush.android.service.PushReceiver"
android:enabled="true"
android:exported="false">
<intent-filter android:priority="1000">
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> <!--Required 显示通知栏 -->
<category android:name="${applicationId}" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT" />
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
<!-- Optional -->
<intent-filter>
<action android:name="android.intent.action.PACKAGE_ADDED" />
<action android:name="android.intent.action.PACKAGE_REMOVED" />

<data android:scheme="package" />
</intent-filter>
</receiver>

<!-- Required SDK核心功能-->
<receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false"/>

<!-- User defined. For test only 用户自定义的广播接收器-->
<receiver
android:name="com.peng.one.push.jpush.JPushReceiver"
Expand All @@ -122,14 +22,6 @@
</intent-filter>
</receiver>

<!-- User defined. For test only 用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
<receiver android:name="com.peng.one.push.jpush.JPushTagOrAliasReceiver">
<intent-filter>
<action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
<category android:name="${applicationId}"></category>
</intent-filter>
</receiver>


</application>

Expand Down