From 2e95963f3bf79b5642b5fc5a4b29e956fb909d0f Mon Sep 17 00:00:00 2001 From: jia Date: Tue, 8 Oct 2024 20:59:04 +0800 Subject: [PATCH] =?UTF-8?q?ap=E8=BF=9E=E6=8E=A5=E8=B7=B3=E8=BD=AC=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E9=A1=B5=E9=9D=A2=E5=90=8E=E5=85=B3=E9=97=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=91=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HotSpotConnentDeviceActivity.java | 8 ++ .../newbind/NewBindDeviceActivity.java | 7 ++ .../java/com/ifish/basebean/EventBean.java | 1 + .../java/com/ifish/push/IIntentService.java | 102 +++++++++--------- .../java/com/ifish/push/IPushService.java | 12 +-- 5 files changed, 73 insertions(+), 57 deletions(-) diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 203a89b4e..ecc68fdc1 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -15,6 +15,7 @@ import com.bumptech.glide.Glide; import com.ifish.basebean.BaseBean; import com.ifish.basebean.ConnectMessageEvent; import com.ifish.basebean.Device; +import com.ifish.basebean.EventBean; import com.ifish.baseclass.BaseActivity; import com.ifish.baseclass.BaseGradeActivity; import com.ifish.tcp.BackFunctionCode7_11; @@ -311,6 +312,9 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 startActivity(i); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); + + EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); + EventBus.getDefault().post(eventBean); finish(); } @@ -559,6 +563,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); startActivity(i); + EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); + EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); finish(); L.i("===================绑定设备成功=" + device_mac); @@ -678,6 +684,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); startActivity(i); + EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); + EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); EventBus.getDefault().post(new ConnectMessageEvent(1, "test")); finish(); diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java index 9941e27ad..667308504 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java @@ -59,6 +59,7 @@ import com.ifish.activity.WebViewActivity; import com.ifish.basebean.BaseBean; import com.ifish.basebean.ConnectMessageEvent; import com.ifish.basebean.Device; +import com.ifish.basebean.EventBean; import com.ifish.baseclass.BaseGradeActivity; import com.ifish.tcp.BackFunctionCode7_11; import com.ifish.tcp.ModelCodec; @@ -1275,4 +1276,10 @@ public class NewBindDeviceActivity extends AppCompatActivity { private void dismissDialog(){ layoutLoading.setVisibility(View.GONE); } + + public void onEventMainThread(EventBean eventBean){ + if (eventBean!=null && EventBean.LINK_FINISH.equals(eventBean.name)){ + finish(); + } + } } \ No newline at end of file diff --git a/iFish7/src/main/java/com/ifish/basebean/EventBean.java b/iFish7/src/main/java/com/ifish/basebean/EventBean.java index d1c5fc2a2..8084b92f8 100644 --- a/iFish7/src/main/java/com/ifish/basebean/EventBean.java +++ b/iFish7/src/main/java/com/ifish/basebean/EventBean.java @@ -13,6 +13,7 @@ public class EventBean { public static String BLUETOOTH_START_SCAN = "start_scan"; public static String BLUETOOTH_STOP_SCAN = "stop_scan"; public static String TAB_INDEX = "tab_index"; + public static String LINK_FINISH = "link_finish"; public EventBean(String name){ this.name = name; diff --git a/iFish7/src/main/java/com/ifish/push/IIntentService.java b/iFish7/src/main/java/com/ifish/push/IIntentService.java index 3449efa0d..ce8e771a6 100644 --- a/iFish7/src/main/java/com/ifish/push/IIntentService.java +++ b/iFish7/src/main/java/com/ifish/push/IIntentService.java @@ -1,51 +1,51 @@ -package com.ifish.push; - -import android.content.Context; -import android.content.Intent; - -import com.ifish.activity.PushActivity; -import com.ifish.activity.RecentContactsActivity; -import com.ifish.baseclass.BaseApplication; -import com.ifish.utils.L; -import com.igexin.sdk.GTIntentService; -import com.igexin.sdk.message.GTNotificationMessage; -import com.igexin.sdk.message.GTTransmitMessage; - -public class IIntentService extends GTIntentService { - - @Override - public void onReceiveClientId(Context context, String s) { - super.onReceiveClientId(context, s); - L.i("jjia----------push--cid--"+s); - } - - @Override - public void onReceiveMessageData(Context context, GTTransmitMessage gtTransmitMessage) { - super.onReceiveMessageData(context, gtTransmitMessage); - } - - // cid离线上线通知 - @Override - public void onReceiveOnlineState(Context context, boolean b) { - super.onReceiveOnlineState(context, b); - } - - // 通知到达 - @Override - public void onNotificationMessageArrived(Context context, GTNotificationMessage gtNotificationMessage) { - super.onNotificationMessageArrived(context, gtNotificationMessage); - - L.i("jjia---------通知到达---"); - } - - //通知点击 - @Override - public void onNotificationMessageClicked(Context context, GTNotificationMessage gtNotificationMessage) { - super.onNotificationMessageClicked(context, gtNotificationMessage); - L.i("jjia---------通知点击---"); - Intent intent = new Intent(); - intent.setClass(context, PushActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } -} +//package com.ifish.push; +// +//import android.content.Context; +//import android.content.Intent; +// +//import com.ifish.activity.PushActivity; +//import com.ifish.activity.RecentContactsActivity; +//import com.ifish.baseclass.BaseApplication; +//import com.ifish.utils.L; +//import com.igexin.sdk.GTIntentService; +//import com.igexin.sdk.message.GTNotificationMessage; +//import com.igexin.sdk.message.GTTransmitMessage; +// +//public class IIntentService extends GTIntentService { +// +// @Override +// public void onReceiveClientId(Context context, String s) { +// super.onReceiveClientId(context, s); +// L.i("jjia----------push--cid--"+s); +// } +// +// @Override +// public void onReceiveMessageData(Context context, GTTransmitMessage gtTransmitMessage) { +// super.onReceiveMessageData(context, gtTransmitMessage); +// } +// +// // cid离线上线通知 +// @Override +// public void onReceiveOnlineState(Context context, boolean b) { +// super.onReceiveOnlineState(context, b); +// } +// +// // 通知到达 +// @Override +// public void onNotificationMessageArrived(Context context, GTNotificationMessage gtNotificationMessage) { +// super.onNotificationMessageArrived(context, gtNotificationMessage); +// +// L.i("jjia---------通知到达---"); +// } +// +// //通知点击 +// @Override +// public void onNotificationMessageClicked(Context context, GTNotificationMessage gtNotificationMessage) { +// super.onNotificationMessageClicked(context, gtNotificationMessage); +// L.i("jjia---------通知点击---"); +// Intent intent = new Intent(); +// intent.setClass(context, PushActivity.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); +// context.startActivity(intent); +// } +//} diff --git a/iFish7/src/main/java/com/ifish/push/IPushService.java b/iFish7/src/main/java/com/ifish/push/IPushService.java index 0328ad218..ac4f9f343 100644 --- a/iFish7/src/main/java/com/ifish/push/IPushService.java +++ b/iFish7/src/main/java/com/ifish/push/IPushService.java @@ -1,6 +1,6 @@ -package com.ifish.push; - -import com.igexin.sdk.PushService; - -public class IPushService extends PushService { -} +//package com.ifish.push; +// +//import com.igexin.sdk.PushService; +// +//public class IPushService extends PushService { +//}