小米厂商通道问题修复;消息中心移除未处理订单消息同步移除消息弹框消息

@@ -57,11 +57,11 @@ android {
                 JPUSH_APPKEY : "27ceb79c44af41ad99202f7a", // NOTE: JPush 上注册的包名对应的 Appkey.
                 JPUSH_APPKEY : "27ceb79c44af41ad99202f7a", // NOTE: JPush 上注册的包名对应的 Appkey.
                 JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
                 JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
                 HUAWEI_APPID:"101934783",//华为平台注册的appid
                 HUAWEI_APPID:"101934783",//华为平台注册的appid
-                XIAOMI_APPKEY : "5811835841457", // 小米平台注册的appkey
-                XIAOMI_APPID : "2882303761518358457", // 小米平台注册的appid
-                OPPO_APPKEY : "94d77d10e7bb4c60bcf18a84c8ca8bdd", // OPPO平台注册的appkey
-                OPPO_APPID : "30260281", // OPPO平台注册的appid
-                OPPO_APPSECRET: "9b7e372f93794593953f93f118619570",//OPPO平台注册的appsecret
+                XIAOMI_APPKEY : "MI-5811835841457", // 小米平台注册的appkey
+                XIAOMI_APPID : "MI-2882303761518358457", // 小米平台注册的appid
+                OPPO_APPKEY : "OP-94d77d10e7bb4c60bcf18a84c8ca8bdd", // OPPO平台注册的appkey
+                OPPO_APPID : "OP-30260281", // OPPO平台注册的appid
+                OPPO_APPSECRET: "OP-9b7e372f93794593953f93f118619570",//OPPO平台注册的appsecret
 //                VIVO_APPKEY : "5811835841457", // VIVO平台注册的appkey
 //                VIVO_APPKEY : "5811835841457", // VIVO平台注册的appkey
 //                VIVO_APPID : "2882303761518358457", // VIVO平台注册的appid
 //                VIVO_APPID : "2882303761518358457", // VIVO平台注册的appid
         ]
         ]
@@ -113,8 +113,8 @@ dependencies {
     //小米推送
     //小米推送
     implementation 'cn.jiguang.sdk.plugin:xiaomi:3.5.8'
     implementation 'cn.jiguang.sdk.plugin:xiaomi:3.5.8'
 
 
-//    //OPPO推送
-//    implementation 'cn.jiguang.sdk.plugin:oppo:3.5.8'
+    //OPPO推送
+    implementation 'cn.jiguang.sdk.plugin:oppo:3.5.8'
 //
 //
 //    //vivo推送
 //    //vivo推送
 //    implementation 'cn.jiguang.sdk.plugin:vivo:3.5.8'
 //    implementation 'cn.jiguang.sdk.plugin:vivo:3.5.8'

 package com.naji.one_key
 package com.naji.one_key
 
 
-import android.os.Bundle
-import android.os.PersistableBundle
-import android.util.Log
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.FlutterEngine
@@ -10,11 +7,6 @@ import io.flutter.plugins.GeneratedPluginRegistrant
 
 
 class MainActivity: FlutterActivity() {
 class MainActivity: FlutterActivity() {
 
 
-    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
-        super.onCreate(savedInstanceState, persistentState)
-        Log.d("Push-Data",this.intent.data.toString());
-    }
-
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine);
         GeneratedPluginRegistrant.registerWith(flutterEngine);
     }
     }

@@ -103,7 +103,6 @@ class HomePageState extends State<HomePage>{
       LogUtil.v("flutter get registration id : $rid");
       LogUtil.v("flutter get registration id : $rid");
       userTokenInit(rid);
       userTokenInit(rid);
     });
     });
-    jpush.openSettingsForNotification();
     jpush.isNotificationEnabled().then((bool value) {
     jpush.isNotificationEnabled().then((bool value) {
       if (!value) {
       if (!value) {
         //没有打开通知
         //没有打开通知

@@ -94,7 +94,7 @@ class MessageDialogItem extends StatelessWidget {
                     content: "立即处理",
                     content: "立即处理",
                     state: 1,
                     state: 1,
                     onPress: () {
                     onPress: () {
-                      messageDialogModel.removeMessage(message);
+                      messageDialogModel.removeMessage(message.id);
                       NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
                       NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
                     },
                     },
                   ),
                   ),

 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:one_key/provider/message_dialog_model.dart';
 import 'package:one_key/provider/message_model.dart';
 import 'package:one_key/provider/message_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/provider.dart';
@@ -25,6 +26,8 @@ class MessageLeftPageState extends State<MessageLeftPage> {
     bus.on("remove_untreated_message",(args){
     bus.on("remove_untreated_message",(args){
       MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);
       MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);
       messageModel.removeUntreatedMessageByMid(args.toString());
       messageModel.removeUntreatedMessageByMid(args.toString());
+      MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false);
+      messageDialogModel.removeMessage(args.toString());
     });
     });
     _controller=EasyRefreshController();
     _controller=EasyRefreshController();
     WidgetsBinding.instance.addPostFrameCallback((_){
     WidgetsBinding.instance.addPostFrameCallback((_){

@@ -6,7 +6,6 @@ import 'package:one_key/provider/notebook_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/res/colors.dart';
 import 'package:one_key/res/colors.dart';
 import 'package:one_key/utils/dialog_util.dart';
 import 'package:one_key/utils/dialog_util.dart';
-import 'package:one_key/utils/log_util.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:one_key/widgets/MyDivider.dart';
 import 'package:one_key/widgets/MyDivider.dart';
 import 'package:one_key/widgets/app_bar.dart';
 import 'package:one_key/widgets/app_bar.dart';

@@ -39,8 +39,8 @@ class MessageDialogModel extends ChangeNotifier{
   }
   }
 
 
   //添加一条信息
   //添加一条信息
-  removeMessage(Message message){
-    messages.remove(message);
+  removeMessage(String mid){
+    messages.removeWhere((message)=>message.id==mid);
     notifyListeners();
     notifyListeners();
   }
   }