Skip to content

Commit f141ae1

Browse files
thinaaronthinaaron
committed
小米推送改为 kotlin
1 parent 87ba2a0 commit f141ae1

18 files changed

Lines changed: 356 additions & 393 deletions

File tree

‎app/src/main/java/net/coding/program/MainActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,13 +479,13 @@ public void onEventBottomBar(EventShowBottom showBottom) {
479479

480480
@Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
481481
public void onEventPushToken(EventPushToken pushToken) {
482-
if (TextUtils.isEmpty(pushToken.type) || TextUtils.isEmpty(pushToken.token)) {
482+
if (TextUtils.isEmpty(pushToken.getType()) || TextUtils.isEmpty(pushToken.getToken())) {
483483
return;
484484
}
485485

486486
Map<String, String> map = new HashMap<>();
487-
map.put("push", pushToken.type);
488-
map.put("token", pushToken.token);
487+
map.put("push", pushToken.getType());
488+
map.put("token", pushToken.getToken());
489489
try {
490490
map.put("deviceBrand", Build.BRAND);
491491
map.put("deviceType", Build.MODEL);
@@ -505,9 +505,9 @@ public void onSuccess() {
505505
super.onSuccess();
506506
globalVar.edit()
507507
.pushType()
508-
.put(pushToken.type)
508+
.put(pushToken.getType())
509509
.pushToken()
510-
.put(pushToken.token)
510+
.put(pushToken.getToken())
511511
.apply();
512512
}
513513

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = "1.2.10"
4+
ext.kotlin_version = '1.2.21'
55

66
repositories {
77
jcenter()

‎push-coding/src/main/java/net/coding/program/push/CodingPush.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private CodingPush() {
3838
public void initApplication(Context context, CommonPushClick clickPushAction) {
3939
this.clickPush = clickPushAction;
4040
if (Rom.isEmui()) {
41-
Log.d(PushAction.TAG, "use huawei push");
41+
Log.d(PushAction.Companion.getTAG(), "use huawei push");
4242
HuaweiPush.instance().initApplication(clickPushAction);
4343
} else { // default device use xiaomi push
4444
if (pushAction == null) {

‎push-huawei/src/main/java/net/coding/program/push/huawei/HuaweiPushReceiverActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private void jumpTargetActivity() {
3333

3434
Map<String, String> map = new HashMap<>();
3535

36-
Log.d(PushAction.TAG, "HuaweiPushReceiverActivity " + uri.toString());
36+
Log.d(PushAction.Companion.getTAG(), "HuaweiPushReceiverActivity " + uri.toString());
3737
try {
3838
if (uri != null) {
3939
final String paramUrl = "param_url";
@@ -51,7 +51,7 @@ private void jumpTargetActivity() {
5151
HuaweiPush.instance().click(this, map);
5252
}
5353
} catch (Exception e) {
54-
Log.d(PushAction.TAG, e.toString());
54+
Log.d(PushAction.Companion.getTAG(), e.toString());
5555
}
5656
}
5757

‎push-xiaomi/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.library'
2+
apply plugin: 'kotlin-android'
23

34
android {
45
compileSdkVersion 26
@@ -57,4 +58,8 @@ dependencies {
5758
implementation files('libs/MiPush_SDK_Client_3_5_1.jar')
5859

5960
compile 'org.greenrobot:eventbus:3.0.0'
61+
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
62+
}
63+
repositories {
64+
mavenCentral()
6065
}

push-xiaomi/src/main/java/net/coding/program/push/xiaomi/CommonPushClick.java renamed to push-xiaomi/src/main/java/net/coding/program/push/xiaomi/CommonPushClick.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package net.coding.program.push.xiaomi;
1+
package net.coding.program.push.xiaomi
22

3-
import android.content.Context;
4-
5-
import java.util.Map;
3+
import android.content.Context
64

75
/**
86
* Created by chenchao on 2017/11/3.
@@ -11,7 +9,7 @@
119
// 测试数据
1210
// 1984
1311
// coding://coding.net/push/huawei?param_url=https%3a%2f%2fcoding.net%2fu%2f1984%2fp%2fauth%2ftask%2f1732723&notification_id=11
14-
public interface CommonPushClick {
12+
interface CommonPushClick {
1513

16-
void click(Context context, Map<String, String> params);
14+
fun click(context: Context, params: Map<String, String>)
1715
}

‎push-xiaomi/src/main/java/net/coding/program/push/xiaomi/EventPushToken.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎push-xiaomi/src/main/java/net/coding/program/push/xiaomi/EventPushToken.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package net.coding.program.push.xiaomi
2+
3+
/**
4+
* Created by chenchao on 2017/11/13.
5+
*/
6+
7+
class EventPushToken(val type: String, val token: String)

‎push-xiaomi/src/main/java/net/coding/program/push/xiaomi/EventUnbindToken.java‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎push-xiaomi/src/main/java/net/coding/program/push/xiaomi/EventUnbindToken.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package net.coding.program.push.xiaomi
2+
3+
/**
4+
* Created by chenchao on 2017/11/13.
5+
*/
6+
7+
class EventUnbindToken

0 commit comments

Comments
 (0)