diff --git a/iFish7/build.gradle b/iFish7/build.gradle index b3960bf7c..31833dc26 100644 --- a/iFish7/build.gradle +++ b/iFish7/build.gradle @@ -132,10 +132,10 @@ dependencies { implementation 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxjava:1.1.6' //阿里云推送相关 - api "com.aliyun.ams:alicloud-android-push:${gradle.pushVersion}" - api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}" - api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1" - api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}" +// api "com.aliyun.ams:alicloud-android-push:${gradle.pushVersion}" +// api "com.aliyun.ams:alicloud-android-third-push:${gradle.thirdPushVersion}" +// api "com.aliyun.ams:alicloud-android-third-push-xiaomi:3.8.6.1" +// api "com.aliyun.ams:alicloud-android-third-push-huawei:${gradle.thirdPushVersion}" implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.24'//微信官方依赖库 implementation 'androidx.appcompat:appcompat:1.6.1'//1.3.0 implementation 'androidx.constraintlayout:constraintlayout:2.1.4'//2.0.4 diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml index d5b24e2d6..45a8232d7 100644 --- a/iFish7/src/main/AndroidManifest.xml +++ b/iFish7/src/main/AndroidManifest.xml @@ -2,16 +2,6 @@ - - = Build.VERSION_CODES.O) { - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - // 通知渠道的id。 - String id = "1"; - // 用户可以看到的通知渠道的名字。 - CharSequence name = "爱鱼奇"; - // 用户可以看到的通知渠道的描述。 -// String description = "通知"; - int importance = NotificationManager.IMPORTANCE_HIGH; - NotificationChannel mChannel = new NotificationChannel(id, name, importance); - // 配置通知渠道的属性。 -// mChannel.setDescription(description); - // 设置通知出现时的闪灯（如果Android设备支持的话）。 - mChannel.enableLights(true); - mChannel.setLightColor(Color.RED); - // 设置通知出现时的震动（如果Android设备支持的话）。 - mChannel.enableVibration(true); - mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400}); - // 最后在notificationmanager中创建该通知渠道。 - mNotificationManager.createNotificationChannel(mChannel); - } - - - } +// private void initalipushSDK() { +// PushServiceFactory.init(this); +// +// //创建渠道 +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { +// NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); +// // 通知渠道的id。 +// String id = "1"; +// // 用户可以看到的通知渠道的名字。 +// CharSequence name = "爱鱼奇"; +// // 用户可以看到的通知渠道的描述。 +//// String description = "通知"; +// int importance = NotificationManager.IMPORTANCE_HIGH; +// NotificationChannel mChannel = new NotificationChannel(id, name, importance); +// // 配置通知渠道的属性。 +//// mChannel.setDescription(description); +// // 设置通知出现时的闪灯（如果Android设备支持的话）。 +// mChannel.enableLights(true); +// mChannel.setLightColor(Color.RED); +// // 设置通知出现时的震动（如果Android设备支持的话）。 +// mChannel.enableVibration(true); +// mChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400}); +// // 最后在notificationmanager中创建该通知渠道。 +// mNotificationManager.createNotificationChannel(mChannel); +// } +// +// +// } // private void initSMSSDK() {//初始化MOB短信 SDK // SMSSDK.initSDK(this, "18c495ec6c718", "7db27e28ff94227f246ae7ef5ad3fb92"); diff --git a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java b/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java index 5e19a24b1..c7885ac2b 100644 --- a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java +++ b/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java @@ -1,60 +1,58 @@ -package com.ifish.push; - -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import com.alibaba.sdk.android.push.MessageReceiver; -import com.alibaba.sdk.android.push.notification.CPushMessage; -import com.ifish.activity.RecentContactsActivity; - -import java.util.Map; - -/** - * Created by Administrator on 2019/5/22. - */ - -public class AlipushReceiver extends MessageReceiver { - // 消息接收部分的LOG_TAG - public static final String REC_TAG = "receiver"; - - @Override - public void onNotification(Context context, String title, String summary, Map extraMap) { - // TODO 处理推送通知 - Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap); - } - - @Override - public void onMessage(Context context, CPushMessage cPushMessage) { - Log.e("MyMessageReceiver", "onMessage, messageId: " + cPushMessage.getMessageId() + ", title: " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); - } - - @Override - public void onNotificationOpened(Context context, String title, String summary, String extraMap) { - Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); - Intent intent = new Intent(); - intent.setClass(context, RecentContactsActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - @Override - protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { - Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); - Intent intent = new Intent(); - intent.setClass(context, RecentContactsActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - - @Override - protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) { - Log.e("MyMessageReceiver", "onNotificationReceivedInApp, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap + ", openType:" + openType + ", openActivity:" + openActivity + ", openUrl:" + openUrl); - } - - @Override - protected void onNotificationRemoved(Context context, String messageId) { - Log.e("MyMessageReceiver", "onNotificationRemoved"); - } - -} +//package com.ifish.push; +// +//import android.content.Context; +//import android.content.Intent; +//import android.util.Log; +// +//import com.ifish.activity.RecentContactsActivity; +// +//import java.util.Map; +// +///** +// * Created by Administrator on 2019/5/22. +// */ +// +//public class AlipushReceiver extends MessageReceiver { +// // 消息接收部分的LOG_TAG +// public static final String REC_TAG = "receiver"; +// +// @Override +// public void onNotification(Context context, String title, String summary, Map extraMap) { +// // TODO 处理推送通知 +// Log.e("MyMessageReceiver", "Receive notification, title: " + title + ", summary: " + summary + ", extraMap: " + extraMap); +// } +// +// @Override +// public void onMessage(Context context, CPushMessage cPushMessage) { +// Log.e("MyMessageReceiver", "onMessage, messageId: " + cPushMessage.getMessageId() + ", title: " + cPushMessage.getTitle() + ", content:" + cPushMessage.getContent()); +// } +// +// @Override +// public void onNotificationOpened(Context context, String title, String summary, String extraMap) { +// Log.e("MyMessageReceiver", "onNotificationOpened, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); +// Intent intent = new Intent(); +// intent.setClass(context, RecentContactsActivity.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// context.startActivity(intent); +// } +// +// @Override +// protected void onNotificationClickedWithNoAction(Context context, String title, String summary, String extraMap) { +// Log.e("MyMessageReceiver", "onNotificationClickedWithNoAction, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap); +// Intent intent = new Intent(); +// intent.setClass(context, RecentContactsActivity.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// context.startActivity(intent); +// } +// +// @Override +// protected void onNotificationReceivedInApp(Context context, String title, String summary, Map extraMap, int openType, String openActivity, String openUrl) { +// Log.e("MyMessageReceiver", "onNotificationReceivedInApp, title: " + title + ", summary: " + summary + ", extraMap:" + extraMap + ", openType:" + openType + ", openActivity:" + openActivity + ", openUrl:" + openUrl); +// } +// +// @Override +// protected void onNotificationRemoved(Context context, String messageId) { +// Log.e("MyMessageReceiver", "onNotificationRemoved"); +// } +// +//} diff --git a/iFish7/src/main/java/com/ifish/push/PopupPushActivity.java b/iFish7/src/main/java/com/ifish/push/PopupPushActivity.java index 496ee4712..a33b17e78 100644 --- a/iFish7/src/main/java/com/ifish/push/PopupPushActivity.java +++ b/iFish7/src/main/java/com/ifish/push/PopupPushActivity.java @@ -1,39 +1,39 @@ -package com.ifish.push; - -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.alibaba.sdk.android.push.AndroidPopupActivity; -import com.ifish.activity.RecentContactsActivity; - -import java.util.Map; - -/** - * Created by Administrator on 2019/6/2. - */ - -public class PopupPushActivity extends AndroidPopupActivity { - static final String TAG = "PopupPushActivity"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - /** - * 实现通知打开回调方法，获取通知相关信息 - * - * @param title 标题 - * @param summary 内容 - * @param extMap 额外参数 - */ - @Override - protected void onSysNoticeOpened(String title, String summary, Map extMap) { - Intent intent = new Intent(); - intent.setClass(this, RecentContactsActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - this.startActivity(intent); - Log.d(TAG, "OnMiPushSysNoticeOpened, title: " + title + ", content: " + summary + ", extMap: " + extMap); - } -} +//package com.ifish.push; +// +//import android.content.Intent; +//import android.os.Bundle; +//import android.util.Log; +// +//import com.alibaba.sdk.android.push.AndroidPopupActivity; +//import com.ifish.activity.RecentContactsActivity; +// +//import java.util.Map; +// +///** +// * Created by Administrator on 2019/6/2. +// */ +// +//public class PopupPushActivity extends AndroidPopupActivity { +// static final String TAG = "PopupPushActivity"; +// +// @Override +// protected void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// } +// +// /** +// * 实现通知打开回调方法，获取通知相关信息 +// * +// * @param title 标题 +// * @param summary 内容 +// * @param extMap 额外参数 +// */ +// @Override +// protected void onSysNoticeOpened(String title, String summary, Map extMap) { +// Intent intent = new Intent(); +// intent.setClass(this, RecentContactsActivity.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// this.startActivity(intent); +// Log.d(TAG, "OnMiPushSysNoticeOpened, title: " + title + ", content: " + summary + ", extMap: " + extMap); +// } +//} diff --git a/iFish7/src/main/java/com/ifish/utils/Config.kt b/iFish7/src/main/java/com/ifish/utils/Config.kt new file mode 100644 index 000000000..dcc872e8e --- /dev/null +++ b/iFish7/src/main/java/com/ifish/utils/Config.kt @@ -0,0 +1,8 @@ +package com.ifish.utils + +class Config { + companion object{ + + const val deviceId= "" + } +} \ No newline at end of file diff --git a/iFish7/src/main/res/layout/mysetting_activity.xml b/iFish7/src/main/res/layout/mysetting_activity.xml index 49bbbe1bc..215bb8c50 100644 --- a/iFish7/src/main/res/layout/mysetting_activity.xml +++ b/iFish7/src/main/res/layout/mysetting_activity.xml @@ -281,7 +281,16 @@ android:layout_marginRight="@dimen/mine_fragment_ic_right" android:src="@drawable/ic_back_right_black" /> - +