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

xx

This commit is contained in:
jia 2024-10-19 13:50:04 +08:00
parent ac180003cb
commit 41abf18f47
11 changed files with 273 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
private Activity act;
private ConnectDevice connectDevice;
private String title=null;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -69,6 +71,9 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
isNext = 0;
String wifiname = getIntent().getStringExtra("wifiname");
String wifipwd = getIntent().getStringExtra("wifipwd");
L.i("jjia----hot--"+wifiname);
L.i("jjia----pwd--"+wifipwd);
new Thread(new ConnectDeviceWifi(wifiname, wifipwd)).start();
}
@ -162,7 +167,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
//System.out.println("接受长度("+length+"):"+ByteUtil.bytesToHexString(dataByte));
String ip = dp.getAddress().getHostAddress();
boolean b = packageData(dataByte, check_code, ip);
Log.i("sssr", b + "---");
Log.i("jjia", b + "---");
if (b) {
isNext = 20;
boolean isSameName = false;
@ -172,6 +177,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();
devicePosition = i;
isSameName = true;
break;
@ -309,6 +315,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
} 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);
AnimationUtil.startAnimation(HotSpotConnentDeviceActivity.this);
@ -333,7 +341,7 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
} else if (object instanceof BackFunctionCode7_11) {
BackFunctionCode7_11 model = (BackFunctionCode7_11) object;
device_mac = ByteUtil.bytesToHexString(model.getSrc());
Log.i("sssr", device_mac);
Log.i("jjia------hot--mac--", device_mac);
//配置域名回复
// if (check_code == 7) {
// EventBus.getDefault().post(object);//告诉Activity 设置tcp域名成功
@ -372,7 +380,10 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
result = baseBean.result;
if (result == NetWork.Success) {
deviceObj = baseBean.data;
L.i("jjia-----------xx-- "+deviceObj.toString());
deviceObj.setMacAddress(device_mac);
title = deviceObj.getShowName();
/**
//当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面
*/
@ -560,6 +571,9 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
} catch (Exception e) {
i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class);
}
i.putExtra("title",title);
i.putExtra("mac",device_mac);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功");
startActivity(i);
@ -607,6 +621,7 @@ 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();
@ -681,6 +696,8 @@ public class HotSpotConnentDeviceActivity extends BaseActivity {
} catch (Exception e) {
i.setClass(HotSpotConnentDeviceActivity.this, MainThreeControlActivity.class);
}
i.putExtra("title",title);
i.putExtra("mac",device_mac);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(HotSpotConnentDeviceActivity.this, "绑定设备成功");
startActivity(i);

45
iFish7/src/main/java/com/ifish/activity/MainSix_4F_ControlActivity.java
View File

@ -96,17 +96,21 @@ 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= "新设备";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main_six_4f_control_activity);
title = getIntent().getStringExtra("title");
initView();
initListener();
init();
LoginDevice();
try {
initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
setAcTitle(title,mac);
// initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
} catch (Exception e) {
e.printStackTrace();
}
@ -125,15 +129,15 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
protected void onResume() {
super.onResume();
try {
setTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
// setTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
} catch (Exception e1) {
Commons.DevicePosition = 0;
sp.putInt(Commons.LoginSPKey.Position, 0);
try {
setTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
} catch (Exception e) {
e.printStackTrace();
}
// try {
// setTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
// } catch (Exception e) {
// e.printStackTrace();
// }
}
Commons.IS_EventBus = true;
if (isFirstAPP) {
@ -324,9 +328,17 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
isToast = true;
isFirstAPP = false;
try {
mac = getIntent().getStringExtra("mac");
L.i("jjia----------------传递过来的mac--"+mac);
if (TextUtils.isEmpty(mac)){
mac = Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0))
.getMacAddress();
Commons.DevicePosition = sp.getInt(Commons.LoginSPKey.Position, 0);
L.i("jjia----------------mac--"+mac);
}
} catch (Exception e) {
try {
mac = Commons.DEVICE.get(0).getMacAddress();
@ -351,7 +363,9 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
}
map.put(Commons.FishKey.Key, Commons.FishKey.Login);//登录
map.put(Commons.FishKey.Mac, mac);
L.i("jjia----socket-" + MainTabActivity.socket.toString());
L.i("jjia----socket-" + MainTabActivity.socket.getLocalPort());
L.i("jjia----mac-Mainxsix-" + mac);
TcpReceiveThread tr = new TcpReceiveThread(MainTabActivity.socket);
Thread thread1 = new Thread(tr);
thread1.start();
@ -448,6 +462,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
//设置温度校准返回
public void onEventMainThread(BackInfoModelSeven_2F_TimeSet event){
L.i("jjia---------c------8");
if (!DeviceOnLine) {
ToastUtil.show(MainSix_4F_ControlActivity.this, Commons.Text.OFFDevice);
return;
@ -456,10 +471,12 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
}
public void onEventMainThread(NetworkChangBean event) {//网络改变
L.i("jjia---------c------9");
StartWifiChangeTimer();
}
public void onEventMainThread(ShareDevice event) {//分享鱼缸
L.i("jjia---------c------10");
Intent i = new Intent(this, ShareActivity.class);
i.putExtra("deviceId", Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getDeviceId());
startActivity(i);
@ -467,6 +484,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
}
public void onEventMainThread(SetDevice event) {
L.i("jjia---------c------11");
if (!DeviceOnLine) {
ToastUtil.show(MainSix_4F_ControlActivity.this, Commons.Text.OFFDevice);
return;
@ -480,6 +498,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
}
public void onEventMainThread(RenameDevice event) {//修改鱼缸名字
L.i("jjia---------c------12");
Intent i = new Intent(this, ChangeDeviceName_2F_Activity.class);
i.putExtra("device", Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)));
i.putExtra("position", sp.getInt(Commons.LoginSPKey.Position, 0));
@ -488,11 +507,13 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
}
public void onEventMainThread(DeleteDevice event) {//删除鱼缸
L.i("jjia---------c------13");
delDevice();
}
//一键喂鱼查询返回
public void onEventMainThread(BackInfoModelSix_4F_FeedFish event){
L.i("jjia---------c------14");
if(isClick_FeedFish){
isClick_FeedFish = false;
if(!event.isLight_select1() && !event.isLight_select2() && !event.isLight_select3() && !event.isLight_select4() && !event.isLight_select5() && !event.isLight_select6()){ //一个设备都没有关联
@ -562,6 +583,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
//接受6控查询返回的指令
public void onEventMainThread(BackInfoModelSix_4F event) {
L.i("jjia---------c------1"+event.toString());
hidegif();
dismissProgressDialog();
dismissProgressDialogCancelble();
@ -676,22 +698,26 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
//接收到发送方出错的指令
public void onEventMainThread(ErrorSendObj event) {
L.i("===========发送方异常=============");
L.i("jjia---------c------2");
errorDevice();
}
//接收到接受方出错的指令
public void onEventMainThread(ErrorReceiveObj event) {
L.i("jjia---------c------3");
L.i("===========接收方异常=============");
errorDevice();
}
//接收到发送方出错的吐司
public void onEventMainThread(ErrorSendToast event) {
L.i("jjia---------c------4");
errorDevice();
}
//接收到接受方出错的吐司
public void onEventMainThread(ErrorReceiveToast event) {
L.i("jjia---------c------5");
errorDevice();
}
@ -706,6 +732,7 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
//收到鱼缸解绑推送
public void onEventMainThread(JpushDeleteDeviceMac event) {
L.i("jjia---------c------6");
if (mac.equals(event.mac)) {
ToastUtil.show(MainSix_4F_ControlActivity.this, "您已失去设备的控制权");
finish();
@ -715,6 +742,8 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
//接收登录返回的指令
public void onEventMainThread(Boolean event) {
L.i("jjia---------c------7");
L.i("jjia-----登录返回--"+event);
if (event) {
checkDevice();
DeviceOnLine = true;

11
iFish7/src/main/java/com/ifish/activity/newbind/AirKissUtil.java
View File

@ -333,6 +333,8 @@ public class AirKissUtil {
* @author Jacky dada
* @date 2015-9-21 下午3:05:01
*/
private String title= "";
private void doPostBindDevice() {
try {
hm.bindDevice(new HttpListener<BaseBean<Device>>() {
@ -345,6 +347,7 @@ public class AirKissUtil {
if (result == Commons.NetWork.Success) {
deviceObj = baseBean.data;
deviceObj.setMacAddress(device_mac);
title = deviceObj.getShowName();
/**
//当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面
*/
@ -417,6 +420,7 @@ public class AirKissUtil {
if (result == Commons.NetWork.Success) {
deviceObj = baseBean.data;
deviceObj.setMacAddress(device_mac);
title = deviceObj.getShowName();
/**
//当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面
*/
@ -483,6 +487,7 @@ public class AirKissUtil {
public void success(BaseBean<Device> baseBean) {
result = baseBean.result;
deviceObj = baseBean.data;
title = deviceObj.getShowName();
}
@Override
@ -527,6 +532,7 @@ 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;
@ -624,6 +630,8 @@ public class AirKissUtil {
} catch (Exception e) {
i.setClass(curActivity, MainThreeControlActivity.class);
}
i.putExtra("mac",device_mac);
i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(curActivity, "绑定设备成功");
curActivity.startActivity(i);
@ -671,6 +679,7 @@ 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;
@ -768,6 +777,8 @@ public class AirKissUtil {
} catch (Exception e) {
i.setClass(curActivity, MainThreeControlActivity.class);
}
i.putExtra("mac",device_mac);
i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(curActivity, "绑定设备成功");
curActivity.startActivity(i);

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

@ -846,6 +846,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
}).start();
}
private String title = "";
private Device deviceObj;
private HttpManager hm = HttpManager.getInstance();
private boolean deviceIsNull = false;///当服务器返回的设备控制器数和定时器数为null的时候 改变标记的值 不跳转进入主界面
@ -861,6 +862,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
if (result == Commons.NetWork.Success) {
deviceObj = baseBean.data;
deviceObj.setMacAddress(device_mac);
title = deviceObj.getShowName();
/**
//当服务器返回的设备控制器数和定时器数为null的时候 不跳转进入主界面
*/
@ -1102,6 +1104,8 @@ public class NewBindDeviceActivity extends AppCompatActivity {
i.setClass(NewBindDeviceActivity.this, MainThreeControlActivity.class);
}
dismissDialog();
i.putExtra("mac",device_mac);
i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
ToastUtil.show(NewBindDeviceActivity.this, "绑定设备成功");
startActivity(i);
@ -1134,6 +1138,7 @@ 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;

37
iFish7/src/main/java/com/ifish/basebean/Device.java
View File

@ -412,8 +412,41 @@ public class Device implements Serializable {
@Override
public String toString() {
return "Device [deviceId=" + deviceId + ", showName=" + showName
+ ", macAddress=" + macAddress + ", type=" + type + "]";
return "Device{" +
"userId='" + userId + '\'' +
", deviceId='" + deviceId + '\'' +
", showName='" + showName + '\'' +
", storeName='" + storeName + '\'' +
", deviceIp='" + deviceIp + '\'' +
", macAddress='" + macAddress + '\'' +
", loginTime='" + loginTime + '\'' +
", isMaster='" + isMaster + '\'' +
", isWorkModel='" + isWorkModel + '\'' +
", isPushWendu='" + isPushWendu + '\'' +
", isCustomIcon='" + isCustomIcon + '\'' +
", customIconName='" + customIconName + '\'' +
", iconLink='" + iconLink + '\'' +
", allIconName='" + allIconName + '\'' +
", defaultIconName='" + defaultIconName + '\'' +
", defaultShowName='" + defaultShowName + '\'' +
", customShowName='" + customShowName + '\'' +
", allShowName='" + allShowName + '\'' +
", updateTime='" + updateTime + '\'' +
", controlAmount=" + controlAmount +
", timerAmount=" + timerAmount +
", venderList=" + venderList +
", click=" + click +
", todayRemind='" + todayRemind + '\'' +
", waterRemind='" + waterRemind + '\'' +
", remindDate='" + remindDate + '\'' +
", remindCycle='" + remindCycle + '\'' +
", isLightness='" + isLightness + '\'' +
", isSarkLamp='" + isSarkLamp + '\'' +
", isEdText=" + isEdText +
", isBind=" + isBind +
", isBlacklist='" + isBlacklist + '\'' +
", type='" + type + '\'' +
'}';
}
public Device(String showName) {

21
iFish7/src/main/java/com/ifish/baseclass/BaseActivity.java
View File

@ -9,6 +9,7 @@ import android.content.pm.ActivityInfo;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
@ -78,6 +79,26 @@ public class BaseActivity extends Activity implements OnClickListener {
}
}
protected void setAcTitle(String title,String mac){
if (!TextUtils.isEmpty(title)){
if (Commons.DEVICE != null) {
if (!Commons.DEVICE.isEmpty()) {
for (int i = 0; i < Commons.DEVICE.size(); i++) {
if (mac.equals(Commons.DEVICE.get(i).getMacAddress())) {
title = Commons.DEVICE.get(i).getShowName();
break;
}
}
}
}
}
if (!TextUtils.isEmpty(title)){
title = Commons.DEVICE.get(Commons.DevicePosition).getShowName();
}
initTitle(title);
}
protected boolean isCompatible(int apiLevel) {
return Build.VERSION.SDK_INT >= apiLevel;
}

10
iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
View File

@ -1150,6 +1150,13 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
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);
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())) {
@ -1166,7 +1173,8 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
String type = Commons.DEVICE.get(Commons.DevicePosition).type;
L.i("jjia----------"+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 {

3
iFish7/src/main/java/com/ifish/tcp/ModelCodec.java
View File

@ -435,6 +435,9 @@ public class ModelCodec {
public static Object deCode(byte[] bys,int len) {
int Check_code = getCheck_code(bys);
int length = bys.length;
Log.i("jjia","-----checkCode="+Check_code);
Log.i("jjia","-----字符串="+ByteUtil.bytesToHexString(bys));
Log.i("---------start", Check_code + "---" + ByteUtil.bytesToHexString(bys));
IoBuffer buf = ByteUtil.byteToIoBuffer(bys, length,len);
if (Check_code == 21) {

2
iFish7/src/main/java/com/ifish/tcp/TcpReceiveThread.java
View File

@ -449,7 +449,7 @@ public class TcpReceiveThread implements Runnable {
}
}
} catch (Exception e) {
L.d("错误=" + e.toString());
L.d("jjia=接收方数据--" + e.toString());
e.printStackTrace();
if (Commons.IS_EventBus) {
EventBus.getDefault().post(new ErrorReceiveObj());

126
iFish7/src/main/java/com/ifish/utils/AppRoute.java Normal file
View File

@ -0,0 +1,126 @@
package com.ifish.utils;
import android.app.Activity;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.widget.Toast;
import com.ifish.activity.BlackListActivity;
import com.ifish.activity.HotSpotConnentDeviceActivity;
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.basebean.Device;
import com.ifish.baseclass.BaseGradeActivity;
public class AppRoute {
public static void toCon(Activity activity,int devicePosition,Device device){
if (device!=null){
toCon(activity,devicePosition,device.getShowName(),device.getMacAddress());
}
}
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);
} 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 (controlAmount == null) {//如果控制器返回空 则默认给三控的页面
i.setClass(activity, MainThreeControlActivity.class);
} else {
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);
}
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;
}
}
}
}
}
} 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);
}
i.putExtra("mac",device_mac);
i.putExtra("title",title);
i.putExtra(BaseGradeActivity.BINDDEVICE, true);//绑定成功增加经验
activity.startActivity(i);
AnimationUtil.startAnimation(activity);
}
}

2
iFish7/src/main/java/com/ifish/utils/Commons.java
View File

@ -61,7 +61,7 @@ public class Commons {
public static List<GoldTasks> GOLDTASKS = null;//金币任务
public static final String NimUIKit_ID = "3";//云信聊天 联系爱鱼奇官方的用户id
public static final int SSID_STEP = 25;
public static final int IoBuffer = 100+ SSID_STEP * 2;
public static final int IoBuffer = 100+ 0 * 2;
public static final int Remote_len = 57+ SSID_STEP * 2;
public static final int SSID_LENGTH = 20+ SSID_STEP ;