root
/
iFish7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ap连接跳转控制页面后关闭配网页面

This commit is contained in:
jia 2024-10-08 20:59:04 +08:00
parent 2785f950f4
commit 2e95963f3b
5 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java
View File

@ -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();

7
iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java
View File

@ -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();
}
}
}

1
iFish7/src/main/java/com/ifish/basebean/EventBean.java
View File

@ -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;

102
iFish7/src/main/java/com/ifish/push/IIntentService.java
View File

@ -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);
// }
//}

12
iFish7/src/main/java/com/ifish/push/IPushService.java
View File

@ -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 {
//}