From c709b2553b3c0cd8509213ed63bd6b896e13ceaa Mon Sep 17 00:00:00 2001 From: jia Date: Sat, 19 Oct 2024 15:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeDeviceName_2F_Activity.java | 7 + .../HotSpotConnentDeviceActivity.java | 468 +++++++++--------- .../activity/MainSix_4F_ControlActivity.java | 27 +- .../ifish/activity/newbind/AirKissUtil.java | 183 +------ .../newbind/NewBindDeviceActivity.java | 160 +----- .../java/com/ifish/basebean/EventBean.java | 6 + .../com/ifish/fragment/DeviceFragment.java | 178 +++---- .../com/ifish/fragment/ThreeFragment.java | 1 - .../main/java/com/ifish/utils/AppRoute.java | 165 +++--- 9 files changed, 458 insertions(+), 737 deletions(-) diff --git a/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java b/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java index 4391fa022..fde383afc 100644 --- a/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java +++ b/iFish7/src/main/java/com/ifish/activity/ChangeDeviceName_2F_Activity.java @@ -20,6 +20,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.ifish.basebean.BaseBean; import com.ifish.basebean.Device; +import com.ifish.basebean.EventBean; import com.ifish.baseclass.BaseActivity; import com.ifish.utils.AnimationUtil; import com.ifish.utils.Commons; @@ -34,6 +35,8 @@ import com.ifish.view.ClearEditText; import java.util.ArrayList; import java.util.List; +import de.greenrobot.event.EventBus; + /** * @ClassName: changeDeviceNameActivity * @Description: 修改设备昵称(睿美四控) @@ -172,6 +175,10 @@ public class ChangeDeviceName_2F_Activity extends BaseActivity { case NetWork.Success: hideKeyboard(); Commons.DEVICE.get(position).setShowName(et_et.getText().toString().replaceAll(" ", "")); + + EventBean eventBean = new EventBean(EventBean.CHANGE_DEVICE_NAME,et_et.getText().toString().replaceAll(" ", "")); + EventBus.getDefault().post(eventBean); + finish(); AnimationUtil.finishAnimation(ChangeDeviceName_2F_Activity.this); break; diff --git a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java index 91089247f..20a5adc90 100644 --- a/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/HotSpotConnentDeviceActivity.java @@ -23,6 +23,7 @@ import com.ifish.tcp.ModelCodec; import com.ifish.tcp.OrderDeviceConnectModel; import com.ifish.tcp.OrderModel; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppRoute; import com.ifish.utils.ByteUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.LoginSPKey; @@ -52,9 +53,6 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { private SPUtil sp; private Activity act; private ConnectDevice connectDevice; - - private String title=null; - @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -177,7 +175,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { if (Commons.DEVICE.size() != 0) { for (int i = 0; i < Commons.DEVICE.size(); i++) { if (device_mac.equals(Commons.DEVICE.get(i).getMacAddress())) { - title = Commons.DEVICE.get(i).getShowName(); + deviceObj = Commons.DEVICE.get(i); devicePosition = i; isSameName = true; break; @@ -243,82 +241,82 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { public void toDevice() { Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(devicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(devicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(devicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(devicePosition).isBlacklist)) {//黑名单 - i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } else { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else {//4控 - i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); - break; - } - default: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - } - } - } - } - } catch (Exception e) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } - i.putExtra("mac",device_mac); - i.putExtra("title",title); +// try { +// Integer controlAmount = Commons.DEVICE.get(devicePosition).getControlAmount(); +// Integer timerAmount = Commons.DEVICE.get(devicePosition).getTimerAmount(); +// String type = Commons.DEVICE.get(devicePosition).type; +// if (Commons.FishKey.On.equals(Commons.DEVICE.get(devicePosition).isBlacklist)) {//黑名单 +// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); +// } else { +// if (Device.TYPE_1C.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); +// } else if (Device.TYPE_AA.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else if (Device.TYPE_BD.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); +// } else if (Device.TYPE_2A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); +// } else if (Device.TYPE_2B.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); +// } else if (Device.TYPE_3A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); +// } else if (Device.TYPE_2F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); +// } else if (Device.TYPE_3F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); +// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); +// } else { +// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } else { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// switch (controlAmount) { +// case 0: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); +// break; +// } +// case 2: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); +// break; +// } +// case 3: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// case 4: { +// if (timerAmount == 6) { // 可丽爱 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else {//4控 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); +// } +// break; +// } +// case 5: { +// if (6 == timerAmount) {//5控六定时器 询多页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); +// } +// break; +// } +// case 8: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); +// break; +// } +// default: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// } +// } +// } +// } +// } catch (Exception e) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } +// i.putExtra("mac",device_mac); +// i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 - startActivity(i); + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); @@ -383,7 +381,6 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { L.i("jjia-----------xx-- "+deviceObj.toString()); deviceObj.setMacAddress(device_mac); - title = deviceObj.getShowName(); /** //当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面 */ @@ -497,86 +494,87 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } else { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else {//4控 - i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); - break; - } - default: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - } - } - } +// try { +// Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); +// Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); +// String type = Commons.DEVICE.get(Commons.DevicePosition).type; +// if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 +// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); +// } else { +// if (Device.TYPE_1C.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); +// } else if (Device.TYPE_AA.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else if (Device.TYPE_BD.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); +// } else if (Device.TYPE_2A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); +// } else if (Device.TYPE_2B.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); +// } else if (Device.TYPE_3A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); +// } else if (Device.TYPE_2F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); +// } else if (Device.TYPE_3F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); +// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); +// } else { +// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } else { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// switch (controlAmount) { +// case 0: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); +// break; +// } +// case 2: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); +// break; +// } +// case 3: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// case 4: { +// if (timerAmount == 6) { // 可丽爱 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else {//4控 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); +// } +// break; +// } +// case 5: { +// if (6 == timerAmount) {//5控六定时器 询多页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); +// } +// break; +// } +// case 8: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); +// break; +// } +// default: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// } +// } +// } +// +// +// } +// } catch (Exception e) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } - - } - } catch (Exception e) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } - - i.putExtra("title",title); - i.putExtra("mac",device_mac); +// i.putExtra("title",title); +// i.putExtra("mac",device_mac); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 + + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); - startActivity(i); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); @@ -621,86 +619,86 @@ public class HotSpotConnentDeviceActivity extends BaseActivity { Commons.IS_CAMERA = false; sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Intent i = new Intent(); - i.putExtra("mac",device_mac); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } else { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); - } else {//4控 - i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); - break; - } - default: { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - break; - } - } - } - } - - - } - } catch (Exception e) { - i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); - } - i.putExtra("title",title); - i.putExtra("mac",device_mac); +// i.putExtra("mac",device_mac); +// try { +// Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); +// Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); +// String type = Commons.DEVICE.get(Commons.DevicePosition).type; +// if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 +// i.setClass(HotSpotConnentDeviceActivity.this, BlackListActivity.class); +// } else { +// if (Device.TYPE_1C.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThree1CControlActivity.class); +// } else if (Device.TYPE_AA.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else if (Device.TYPE_BD.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveBDControlActivity.class); +// } else if (Device.TYPE_2A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_2A_ControlActivity.class); +// } else if (Device.TYPE_2B.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_2B_ControlActivity.class); +// } else if (Device.TYPE_3A.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainHot_3A_ControlActivity.class); +// } else if (Device.TYPE_2F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainSeven_2F_ControlActivity.class); +// } else if (Device.TYPE_3F.equals(type)) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainFour_3F_ControlActivity.class); +// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ +// i.setClass(HotSpotConnentDeviceActivity.this, MainSix_4F_ControlActivity.class); +// } else { +// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } else { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// switch (controlAmount) { +// case 0: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainZeroControlActivity.class); +// break; +// } +// case 2: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainTwoControlActivity.class); +// break; +// } +// case 3: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// case 4: { +// if (timerAmount == 6) { // 可丽爱 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFiveControlActivity.class); +// } else {//4控 +// i.setClass(HotSpotConnentDeviceActivity.this, MainFourControlActivity.class); +// } +// break; +// } +// case 5: { +// if (6 == timerAmount) {//5控六定时器 询多页面 +// i.setClass(HotSpotConnentDeviceActivity.this, MainSixControlActivity.class); +// } +// break; +// } +// case 8: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainEightControlActivity.class); +// break; +// } +// default: { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// break; +// } +// } +// } +// } +// +// +// } +// } catch (Exception e) { +// i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class); +// } +// i.putExtra("title",title); +// i.putExtra("mac",device_mac); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 + AppRoute.newToStart(HotSpotConnentDeviceActivity.this,i,deviceObj); ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功"); - startActivity(i); EventBean eventBean =new EventBean(EventBean.LINK_FINISH,0); EventBus.getDefault().post(eventBean); AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this); diff --git a/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java b/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java index aa033f3cd..dfd48793d 100644 --- a/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java @@ -28,6 +28,7 @@ import com.ifish.basebean.ErrorReceiveToast; import com.ifish.basebean.ErrorSendObj; import com.ifish.basebean.ErrorSendTimeSetting; import com.ifish.basebean.ErrorSendToast; +import com.ifish.basebean.EventBean; import com.ifish.basebean.JpushDeleteDeviceMac; import com.ifish.basebean.NetworkChangBean; import com.ifish.basebean.RenameDevice; @@ -96,24 +97,18 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi private TextView tv_setdian; private boolean isClick_FeedFish = false; private TextView tv_heatWendu; - private String title= "新设备"; + + private Device deviceBean; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main_six_4f_control_activity); - - title = getIntent().getStringExtra("title"); + deviceBean = (Device) getIntent().getSerializableExtra("device"); initView(); initListener(); init(); LoginDevice(); - try { - setAcTitle(title,mac); -// initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName()); - } catch (Exception e) { - e.printStackTrace(); - } ImageView iv_logo = (ImageView) findViewById(R.id.iv_logo); TextView tv_logo = (TextView) findViewById(R.id.tv_logo); try { @@ -125,6 +120,12 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi } + public void onEventMainThread(EventBean eventBean){ + if (eventBean!=null && EventBean.CHANGE_DEVICE_NAME.equals(eventBean.name)){ + setTitle(eventBean.value); + } + } + @Override protected void onResume() { super.onResume(); @@ -328,7 +329,13 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi isToast = true; isFirstAPP = false; try { - mac = getIntent().getStringExtra("mac"); + if (deviceBean!=null){ + mac = deviceBean.getMacAddress(); + setAcTitle(deviceBean.getShowName(),mac); + }else { + initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName()); + } + L.i("jjia----------------传递过来的mac--"+mac); if (TextUtils.isEmpty(mac)){ mac = Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)) diff --git a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java index b9a39b2a6..85ebe835a 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java @@ -10,25 +10,7 @@ import android.util.Log; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; - -import com.ifish.activity.BindTankPetActivity; -import com.ifish.activity.BlackListActivity; import com.ifish.activity.LoadingActivity; -import com.ifish.activity.MainEightControlActivity; -import com.ifish.activity.MainFiveBDControlActivity; -import com.ifish.activity.MainFiveControlActivity; -import com.ifish.activity.MainFourControlActivity; -import com.ifish.activity.MainFour_2B_ControlActivity; -import com.ifish.activity.MainFour_3F_ControlActivity; -import com.ifish.activity.MainHot_3A_ControlActivity; -import com.ifish.activity.MainSeven_2F_ControlActivity; -import com.ifish.activity.MainSixControlActivity; -import com.ifish.activity.MainSix_2A_ControlActivity; -import com.ifish.activity.MainSix_4F_ControlActivity; -import com.ifish.activity.MainThree1CControlActivity; -import com.ifish.activity.MainThreeControlActivity; -import com.ifish.activity.MainTwoControlActivity; -import com.ifish.activity.MainZeroControlActivity; import com.ifish.airkiss.AirKissEncoder; import com.ifish.airkiss.UDPReceiver; import com.ifish.basebean.BaseBean; @@ -39,6 +21,7 @@ import com.ifish.esptouch.EsptouchTask; import com.ifish.esptouch.IEsptouchResult; import com.ifish.esptouch.IEsptouchTask; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppRoute; import com.ifish.utils.Commons; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; @@ -334,7 +317,6 @@ public class AirKissUtil { * @date 2015-9-21 下午3:05:01 */ - private String title= ""; private void doPostBindDevice() { try { hm.bindDevice(new HttpListener>() { @@ -347,7 +329,6 @@ public class AirKissUtil { if (result == Commons.NetWork.Success) { deviceObj = baseBean.data; deviceObj.setMacAddress(device_mac); - title = deviceObj.getShowName(); /** //当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面 */ @@ -420,7 +401,6 @@ public class AirKissUtil { if (result == Commons.NetWork.Success) { deviceObj = baseBean.data; deviceObj.setMacAddress(device_mac); - title = deviceObj.getShowName(); /** //当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面 */ @@ -487,7 +467,6 @@ public class AirKissUtil { public void success(BaseBean baseBean) { result = baseBean.result; deviceObj = baseBean.data; - title = deviceObj.getShowName(); } @Override @@ -532,7 +511,6 @@ public class AirKissUtil { if (Commons.DEVICE.size() != 0) { for (int i = 0; i < Commons.DEVICE.size(); i++) { if (device_mac.equals(Commons.DEVICE.get(i).getMacAddress())) { - title = Commons.DEVICE.get(i).getShowName(); sp.putInt(Commons.LoginSPKey.Position, i); Commons.DevicePosition = i; isSameName = true; @@ -556,85 +534,12 @@ public class AirKissUtil { Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(curActivity, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(curActivity, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(curActivity, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(curActivity, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(curActivity, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(curActivity, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(curActivity, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(curActivity, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(curActivity, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { - i.setClass(curActivity, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(curActivity, MainThreeControlActivity.class); - } else { - i.setClass(curActivity, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(curActivity, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(curActivity, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(curActivity, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(curActivity, MainFiveControlActivity.class); - } else {//4控 - i.setClass(curActivity, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(curActivity, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(curActivity, MainEightControlActivity.class); - break; - } - default: { - i.setClass(curActivity, MainThreeControlActivity.class); - break; - } - } - } - } - - } - } catch (Exception e) { - i.setClass(curActivity, MainThreeControlActivity.class); - } - i.putExtra("mac",device_mac); - i.putExtra("title",title); +// i.putExtra("mac",device_mac); +// i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 + AppRoute.newToStart(curActivity,i,deviceObj); ToastUtil.show(curActivity, "绑定设备成功"); - curActivity.startActivity(i); AnimationUtil.startAnimation(curActivity); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); @@ -679,7 +584,6 @@ public class AirKissUtil { if (Commons.DEVICE.size() != 0) { for (int i = 0; i < Commons.DEVICE.size(); i++) { if (device_mac.equals(Commons.DEVICE.get(i).getMacAddress())) { - title = Commons.DEVICE.get(i).getShowName(); sp.putInt(Commons.LoginSPKey.Position, i); Commons.DevicePosition = i; isSameName = true; @@ -703,86 +607,9 @@ public class AirKissUtil { Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(curActivity, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(curActivity, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(curActivity, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(curActivity, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(curActivity, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(curActivity, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(curActivity, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(curActivity, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(curActivity, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { - i.setClass(curActivity, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(curActivity, MainThreeControlActivity.class); - } else { - i.setClass(curActivity, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(curActivity, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(curActivity, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(curActivity, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(curActivity, MainFiveControlActivity.class); - } else {//4控 - i.setClass(curActivity, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(curActivity, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(curActivity, MainEightControlActivity.class); - break; - } - default: { - i.setClass(curActivity, MainThreeControlActivity.class); - break; - } - } - } - } - - - } - } catch (Exception e) { - i.setClass(curActivity, MainThreeControlActivity.class); - } - i.putExtra("mac",device_mac); - i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 + AppRoute.newToStart(curActivity,i,deviceObj); ToastUtil.show(curActivity, "绑定设备成功"); - curActivity.startActivity(i); - AnimationUtil.startAnimation(curActivity); curActivity.finish(); L.i("===================绑定设备成功=" + device_mac); break; 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 66aa54982..a31018ee4 100644 --- a/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java @@ -72,6 +72,7 @@ import com.ifish.tcp.OrderModel; import com.ifish.tcp.ResetDeviceModel; import com.ifish.utils.ActivityManager; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppRoute; import com.ifish.utils.BlueToothUtil; import com.ifish.utils.ByteUtil; import com.ifish.utils.ClickUtil; @@ -846,7 +847,6 @@ public class NewBindDeviceActivity extends AppCompatActivity { }).start(); } - private String title = ""; private Device deviceObj; private HttpManager hm = HttpManager.getInstance(); private boolean deviceIsNull = false;///当服务器返回的设备控制器数和定时器数为null的时候 改变标记的值 不跳转进入主界面 @@ -862,7 +862,6 @@ public class NewBindDeviceActivity extends AppCompatActivity { if (result == Commons.NetWork.Success) { deviceObj = baseBean.data; deviceObj.setMacAddress(device_mac); - title = deviceObj.getShowName(); /** //当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面 */ @@ -1029,86 +1028,14 @@ public class NewBindDeviceActivity extends AppCompatActivity { private void toIntent(Device device){ Intent i = new Intent(); - try { - Integer controlAmount = device.getControlAmount(); - Integer timerAmount = device.getTimerAmount(); - String type = device.type; - if (Commons.FishKey.On.equals(device.isBlacklist)) {//黑名单 - i.setClass(NewBindDeviceActivity.this, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(NewBindDeviceActivity.this, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - } else { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(NewBindDeviceActivity.this, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(NewBindDeviceActivity.this, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(NewBindDeviceActivity.this, MainFiveControlActivity.class); - } else {//4控 - i.setClass(NewBindDeviceActivity.this, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(NewBindDeviceActivity.this, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(NewBindDeviceActivity.this, MainEightControlActivity.class); - break; - } - default: { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - break; - } - } - } - } - - } - } catch (Exception e) { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - } dismissDialog(); - i.putExtra("mac",device_mac); - i.putExtra("title",title); + +// i.putExtra("mac",device_mac); +// i.putExtra("title",title); i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); - startActivity(i); + AppRoute.newToStart(NewBindDeviceActivity.this,i,deviceObj); AnimationUtil.startAnimation(NewBindDeviceActivity.this); EventBus.getDefault().post(new ConnectMessageEvent(1, "test")); finish(); @@ -1138,7 +1065,6 @@ public class NewBindDeviceActivity extends AppCompatActivity { if (Commons.DEVICE.size() != 0) { for (int i = 0; i < Commons.DEVICE.size(); i++) { if (device_mac.equals(Commons.DEVICE.get(i).getMacAddress())) { - title = Commons.DEVICE.get(i).getShowName(); sp.putInt(Commons.LoginSPKey.Position, i); Commons.DevicePosition = i; isSameName = true; @@ -1162,83 +1088,9 @@ public class NewBindDeviceActivity extends AppCompatActivity { Commons.IS_CAMERA = false; sp.putBoolean(Commons.LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(NewBindDeviceActivity.this, BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(NewBindDeviceActivity.this, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(NewBindDeviceActivity.this, MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - } else { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(NewBindDeviceActivity.this, MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(NewBindDeviceActivity.this, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(NewBindDeviceActivity.this, MainFiveControlActivity.class); - } else {//4控 - i.setClass(NewBindDeviceActivity.this, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(NewBindDeviceActivity.this, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(NewBindDeviceActivity.this, MainEightControlActivity.class); - break; - } - default: { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - break; - } - } - } - } - - - } - } catch (Exception e) { - i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class); - } i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功"); - startActivity(i); + AppRoute.newToStart(NewBindDeviceActivity.this,i,deviceObj); AnimationUtil.startAnimation(NewBindDeviceActivity.this); finish(); L.i("===================绑定设备成功=" + device_mac); diff --git a/iFish7/src/main/java/com/ifish/basebean/EventBean.java b/iFish7/src/main/java/com/ifish/basebean/EventBean.java index 8084b92f8..092eb8a6d 100644 --- a/iFish7/src/main/java/com/ifish/basebean/EventBean.java +++ b/iFish7/src/main/java/com/ifish/basebean/EventBean.java @@ -8,16 +8,22 @@ public class EventBean { } public String name; + public String value; public int index = 0; 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 static String CHANGE_DEVICE_NAME = "change_device_name"; public EventBean(String name){ this.name = name; } + public EventBean(String name,String value){ + this.name = name; + this.value = value; + } diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java index 653f495dc..fbfc55fd9 100644 --- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java @@ -119,6 +119,7 @@ import com.ifish.geewe.SettingListener; import com.ifish.permission.PermissionHelper; import com.ifish.utils.ActivityManager; import com.ifish.utils.AnimationUtil; +import com.ifish.utils.AppRoute; import com.ifish.utils.AppUtil; import com.ifish.utils.Commons; import com.ifish.utils.Commons.LoginSPKey; @@ -1149,14 +1150,12 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi lv_camera.setAdapter(cameraAdapter); return; } - Intent i = new Intent(); - Device clickItem = (Device) lv_device.getItemAtPosition(position); - i.putExtra("mac",clickItem.getMacAddress()); - i.putExtra("title",clickItem.getShowName()); - i.putExtra("type",clickItem.type); +// + Intent intent = new Intent(); - L.i("jjia----x---"+clickItem.toString()); + +// L.i("jjia----x---"+clickItem.toString()); int index = 0; for (int i1 = 0; i1 < Commons.DEVICE.size(); i1++) { if (showDevice.get(position).getDeviceId().equals(Commons.DEVICE.get(i1).getDeviceId())) { @@ -1167,88 +1166,95 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi Commons.IS_CAMERA = false; sp.putInt(LoginSPKey.Position, index); sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA); - try { - Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(Commons.DevicePosition).type; + Device clickItem = (Device) lv_device.getItemAtPosition(position); + if (clickItem!=null){ - - L.i("jjia-------mainclick--type-"+type); - L.i("jjia-------mainclick--"+Commons.DEVICE.get(Commons.DevicePosition).toString()); - if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 - i.setClass(getActivity(), BlackListActivity.class); - } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(getActivity(), MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(getActivity(), MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(getActivity(), MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(getActivity(), MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(getActivity(), MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(getActivity(), MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(getActivity(), MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(getActivity(), MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { - i.setClass(getActivity(), MainSix_4F_ControlActivity.class); - } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(getActivity(), MainThreeControlActivity.class); - } else { - i.setClass(getActivity(), MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(getActivity(), MainZeroControlActivity.class); - break; - } - case 2: { - i.setClass(getActivity(), MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(getActivity(), MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(getActivity(), MainFiveControlActivity.class); - } else {//4控 - i.setClass(getActivity(), MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(getActivity(), MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(getActivity(), MainEightControlActivity.class); - break; - } - default: { - i.setClass(getActivity(), MainThreeControlActivity.class); - break; - } - } - } - } - } - } catch (Exception e) { - ClipboardManager clipboardManager = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData mClipData = ClipData.newPlainText("Label", e.getMessage() + getStackTrace(e)); - clipboardManager.setPrimaryClip(mClipData); - Toast.makeText(getActivity(), "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); - i.setClass(getActivity(), MainThreeControlActivity.class); + AppRoute.newToStart(requireActivity(),intent,clickItem); + }else { + AppRoute.oldToStart(requireActivity(),intent); } - startActivity(i); - AnimationUtil.startAnimation(getActivity()); +// try { +// Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); +// Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); +// String type = Commons.DEVICE.get(Commons.DevicePosition).type; +// +// +// L.i("jjia-------mainclick--type-"+type); +// L.i("jjia-------mainclick--"+Commons.DEVICE.get(Commons.DevicePosition).toString()); +// if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 +// i.setClass(getActivity(), BlackListActivity.class); +// } else { +// if (Device.TYPE_1C.equals(type)) { +// i.setClass(getActivity(), MainThree1CControlActivity.class); +// } else if (Device.TYPE_AA.equals(type)) { +// i.setClass(getActivity(), MainFiveControlActivity.class); +// } else if (Device.TYPE_BD.equals(type)) { +// i.setClass(getActivity(), MainFiveBDControlActivity.class); +// } else if (Device.TYPE_2A.equals(type)) { +// i.setClass(getActivity(), MainSix_2A_ControlActivity.class); +// } else if (Device.TYPE_2B.equals(type)) { +// i.setClass(getActivity(), MainFour_2B_ControlActivity.class); +// } else if (Device.TYPE_3A.equals(type)) { +// i.setClass(getActivity(), MainHot_3A_ControlActivity.class); +// } else if (Device.TYPE_2F.equals(type)) { +// i.setClass(getActivity(), MainSeven_2F_ControlActivity.class); +// } else if (Device.TYPE_3F.equals(type)) { +// i.setClass(getActivity(), MainFour_3F_ControlActivity.class); +// } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { +// i.setClass(getActivity(), MainSix_4F_ControlActivity.class); +// } else { +// if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 +// i.setClass(getActivity(), MainThreeControlActivity.class); +// } else { +// i.setClass(getActivity(), MainThreeControlActivity.class); +// switch (controlAmount) { +// case 0: { +// i.setClass(getActivity(), MainZeroControlActivity.class); +// break; +// } +// case 2: { +// i.setClass(getActivity(), MainTwoControlActivity.class); +// break; +// } +// case 3: { +// i.setClass(getActivity(), MainThreeControlActivity.class); +// break; +// } +// case 4: { +// if (timerAmount == 6) { // 可丽爱 +// i.setClass(getActivity(), MainFiveControlActivity.class); +// } else {//4控 +// i.setClass(getActivity(), MainFourControlActivity.class); +// } +// break; +// } +// case 5: { +// if (6 == timerAmount) {//5控六定时器 询多页面 +// i.setClass(getActivity(), MainSixControlActivity.class); +// } +// break; +// } +// case 8: { +// i.setClass(getActivity(), MainEightControlActivity.class); +// break; +// } +// default: { +// i.setClass(getActivity(), MainThreeControlActivity.class); +// break; +// } +// } +// } +// } +// } +// } catch (Exception e) { +// ClipboardManager clipboardManager = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); +// ClipData mClipData = ClipData.newPlainText("Label", e.getMessage() + getStackTrace(e)); +// clipboardManager.setPrimaryClip(mClipData); +// Toast.makeText(getActivity(), "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); +// i.setClass(getActivity(), MainThreeControlActivity.class); +// } +// startActivity(i); +// AnimationUtil.startAnimation(getActivity()); } }); lv_camera.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/iFish7/src/main/java/com/ifish/fragment/ThreeFragment.java b/iFish7/src/main/java/com/ifish/fragment/ThreeFragment.java index 2a82415b2..31058b871 100644 --- a/iFish7/src/main/java/com/ifish/fragment/ThreeFragment.java +++ b/iFish7/src/main/java/com/ifish/fragment/ThreeFragment.java @@ -21,7 +21,6 @@ import android.widget.TextView; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.ifish.activity.MainSix_4F_ControlActivity; import com.ifish.activity.MainTabActivity; import com.ifish.activity.R; import com.ifish.activity.R.drawable; diff --git a/iFish7/src/main/java/com/ifish/utils/AppRoute.java b/iFish7/src/main/java/com/ifish/utils/AppRoute.java index ab1ef49ec..84c2da00d 100644 --- a/iFish7/src/main/java/com/ifish/utils/AppRoute.java +++ b/iFish7/src/main/java/com/ifish/utils/AppRoute.java @@ -7,6 +7,8 @@ import android.content.Context; import android.content.Intent; import android.widget.Toast; +import androidx.annotation.Nullable; + import com.ifish.activity.BlackListActivity; import com.ifish.activity.HotSpotConnentDeviceActivity; import com.ifish.activity.MainEightControlActivity; @@ -25,91 +27,111 @@ import com.ifish.activity.MainThreeControlActivity; import com.ifish.activity.MainTwoControlActivity; import com.ifish.activity.MainZeroControlActivity; import com.ifish.basebean.Device; -import com.ifish.baseclass.BaseGradeActivity; public class AppRoute { - public static void toCon(Activity activity,int devicePosition,Device device){ - + public static void newToStart( Activity activity,Intent i ,Device device){ if (device!=null){ - toCon(activity,devicePosition,device.getShowName(),device.getMacAddress()); + try { + ToastUtil.show(activity,"xxxxss"); + i.putExtra("device",device); + L.i("jjia----deviceBean---"+device.toString()); + toAction(activity,i,device.getControlAmount(),device.getTimerAmount(),device.type); + }catch (Exception e) { + ClipboardManager clipboardManager = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE); + ClipData mClipData = ClipData.newPlainText("Label", e.getMessage()); + clipboardManager.setPrimaryClip(mClipData); + Toast.makeText(activity, "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); + i.setClass(activity, MainThreeControlActivity.class); + } + activity.startActivity(i); + AnimationUtil.startAnimation(activity); + + }else { + oldToStart( activity, i ); } } - - public static void toCon(Activity activity,int devicePosition,String title,String device_mac){ - Intent i = new Intent(); - try { - Integer controlAmount = Commons.DEVICE.get(devicePosition).getControlAmount(); - Integer timerAmount = Commons.DEVICE.get(devicePosition).getTimerAmount(); - String type = Commons.DEVICE.get(devicePosition).type; - L.i("jjia-------------devicePosition---"+devicePosition); - L.i("jjia-------------type---"+type); - if (Commons.FishKey.On.equals(Commons.DEVICE.get(devicePosition).isBlacklist)) {//黑名单 - i.setClass(activity, BlackListActivity.class); + public static void toAction(Activity activity,Intent i,Integer controlAmount,Integer timerAmount, String type) { + + if (Commons.FishKey.On.equals(Commons.DEVICE.get(Commons.DevicePosition).isBlacklist)) {//黑名单 + i.setClass(activity, BlackListActivity.class); + } else { + if (Device.TYPE_1C.equals(type)) { + i.setClass(activity, MainThree1CControlActivity.class); + } else if (Device.TYPE_AA.equals(type)) { + i.setClass(activity, MainFiveControlActivity.class); + } else if (Device.TYPE_BD.equals(type)) { + i.setClass(activity, MainFiveBDControlActivity.class); + } else if (Device.TYPE_2A.equals(type)) { + i.setClass(activity, MainSix_2A_ControlActivity.class); + } else if (Device.TYPE_2B.equals(type)) { + i.setClass(activity, MainFour_2B_ControlActivity.class); + } else if (Device.TYPE_3A.equals(type)) { + i.setClass(activity, MainHot_3A_ControlActivity.class); + } else if (Device.TYPE_2F.equals(type)) { + i.setClass(activity, MainSeven_2F_ControlActivity.class); + } else if (Device.TYPE_3F.equals(type)) { + i.setClass(activity, MainFour_3F_ControlActivity.class); + } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)) { + i.setClass(activity, MainSix_4F_ControlActivity.class); } else { - if (Device.TYPE_1C.equals(type)) { - i.setClass(activity, MainThree1CControlActivity.class); - } else if (Device.TYPE_AA.equals(type)) { - i.setClass(activity, MainFiveControlActivity.class); - } else if (Device.TYPE_BD.equals(type)) { - i.setClass(activity, MainFiveBDControlActivity.class); - } else if (Device.TYPE_2A.equals(type)) { - i.setClass(activity, MainSix_2A_ControlActivity.class); - } else if (Device.TYPE_2B.equals(type)) { - i.setClass(activity, MainFour_2B_ControlActivity.class); - } else if (Device.TYPE_3A.equals(type)) { - i.setClass(activity, MainHot_3A_ControlActivity.class); - } else if (Device.TYPE_2F.equals(type)) { - i.setClass(activity, MainSeven_2F_ControlActivity.class); - } else if (Device.TYPE_3F.equals(type)) { - i.setClass(activity, MainFour_3F_ControlActivity.class); - } else if (Device.TYPE_4F.equals(type) || Device.TYPE_5F.equals(type)){ - i.setClass(activity, MainSix_4F_ControlActivity.class); + if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 + i.setClass(activity, MainThreeControlActivity.class); } else { - if (controlAmount == null) {//如果控制器返回空 则默认给三控的页面 - i.setClass(activity, MainThreeControlActivity.class); - } else { - i.setClass(activity, MainThreeControlActivity.class); - switch (controlAmount) { - case 0: { - i.setClass(activity, MainZeroControlActivity.class); - break; + i.setClass(activity, MainThreeControlActivity.class); + switch (controlAmount) { + case 0: { + i.setClass(activity, MainZeroControlActivity.class); + break; + } + case 2: { + i.setClass(activity, MainTwoControlActivity.class); + break; + } + case 3: { + i.setClass(activity, MainThreeControlActivity.class); + break; + } + case 4: { + if (timerAmount == 6) { // 可丽爱 + i.setClass(activity, MainFiveControlActivity.class); + } else {//4控 + i.setClass(activity, MainFourControlActivity.class); } - case 2: { - i.setClass(activity, MainTwoControlActivity.class); - break; - } - case 3: { - i.setClass(activity, MainThreeControlActivity.class); - break; - } - case 4: { - if (timerAmount == 6) { // 可丽爱 - i.setClass(activity, MainFiveControlActivity.class); - } else {//4控 - i.setClass(activity, MainFourControlActivity.class); - } - break; - } - case 5: { - if (6 == timerAmount) {//5控六定时器 询多页面 - i.setClass(activity, MainSixControlActivity.class); - } - break; - } - case 8: { - i.setClass(activity, MainEightControlActivity.class); - break; - } - default: { - i.setClass(activity, MainThreeControlActivity.class); - break; + break; + } + case 5: { + if (6 == timerAmount) {//5控六定时器 询多页面 + i.setClass(activity, MainSixControlActivity.class); } + break; + } + case 8: { + i.setClass(activity, MainEightControlActivity.class); + break; + } + default: { + i.setClass(activity, MainThreeControlActivity.class); + break; } } } } + } + } + + public static void oldToStart(Activity activity,Intent i ){ + try { + Integer controlAmount = Commons.DEVICE.get(Commons.DevicePosition).getControlAmount(); + Integer timerAmount = Commons.DEVICE.get(Commons.DevicePosition).getTimerAmount(); + String type = Commons.DEVICE.get(Commons.DevicePosition).type; + + + toAction(activity,i,controlAmount,timerAmount,type); + L.i("jjia-------mainclick--type-"+type); + L.i("jjia-------mainclick--"+Commons.DEVICE.get(Commons.DevicePosition).toString()); + } catch (Exception e) { ClipboardManager clipboardManager = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE); ClipData mClipData = ClipData.newPlainText("Label", e.getMessage()); @@ -117,9 +139,6 @@ public class AppRoute { Toast.makeText(activity, "错误日志复制到剪贴板!", Toast.LENGTH_SHORT).show(); i.setClass(activity, MainThreeControlActivity.class); } - i.putExtra("mac",device_mac); - i.putExtra("title",title); - i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验 activity.startActivity(i); AnimationUtil.startAnimation(activity); }