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

跳转

This commit is contained in:
jia 2024-10-19 16:01:05 +08:00
parent c709b2553b
commit a8b137b4fe
4 changed files with 24 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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: 修改设备昵称(绚多六)
@ -165,6 +168,8 @@ public class ChangeDeviceName_0F_Activity extends BaseActivity {
hideKeyboard();
try {
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);
} catch (Exception e) {
e.printStackTrace();
}

40
iFish7/src/main/java/com/ifish/activity/MainSixControlActivity.java
View File

@ -32,6 +32,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.RenameDevice;
import com.ifish.basebean.ShareDevice;
@ -87,22 +88,19 @@ public class MainSixControlActivity extends BaseGradeActivity implements SwipeRe
private ImageView title_img_right;
private TextView tv_1,tv_2,tv_3,tv_4,tv_5,tv_6;
private ImageView iv_img;
private Device deviceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.six_control_xunduo_activity);
deviceBean = (Device) getIntent().getSerializableExtra("device");
init();
initView();
initListener();
L.i( "---3-------------onCreate"+HttpManager.Store_URL+Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0)).getVenderList().getLogo());
try {
initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
} catch (Exception e) {
e.printStackTrace();
}
ReviewBrand();
LoginDevice();
}
@ -346,17 +344,6 @@ public class MainSixControlActivity extends BaseGradeActivity implements SwipeRe
@Override
protected void onResume() {
super.onResume();
try {
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 {
Commons.IS_EventBus=true;
if (isFirstAPP) {
@ -513,16 +500,27 @@ public class MainSixControlActivity extends BaseGradeActivity implements SwipeRe
// showProgressDialogCancelble();
// startLoadingTimer();
// }
public void onEventMainThread(EventBean eventBean){
if (eventBean!=null && EventBean.CHANGE_DEVICE_NAME.equals(eventBean.name)){
setTitle(eventBean.value);
}
}
private void init() {
sp = SPUtil.getInstance(this);
EventBus.getDefault().register(this);
isToast = true;
isFirstAPP=false;
try {
mac = Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0))
.getMacAddress();
Commons.DevicePosition = sp.getInt(Commons.LoginSPKey.Position, 0);
if (deviceBean!=null){
mac = deviceBean.getMacAddress();
setAcTitle(deviceBean.getShowName(),mac);
}else {
initTitle(Commons.DEVICE.get(Commons.DevicePosition).getShowName());
mac = Commons.DEVICE.get(sp.getInt(Commons.LoginSPKey.Position, 0))
.getMacAddress();
Commons.DevicePosition = sp.getInt(Commons.LoginSPKey.Position, 0);
}
} catch (Exception e) {
try {
mac = Commons.DEVICE.get(0).getMacAddress();

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

@ -129,17 +129,6 @@ public class MainSix_4F_ControlActivity extends BaseGradeActivity implements Swi
@Override
protected void onResume() {
super.onResume();
try {
// 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();
// }
}
Commons.IS_EventBus = true;
if (isFirstAPP) {
if (DeviceOnLine) {

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

@ -47,41 +47,18 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import com.bumptech.glide.Glide;
import com.clj.fastble.BleManager;
import com.clj.fastble.callback.BleGattCallback;
import com.clj.fastble.callback.BleMtuChangedCallback;
import com.clj.fastble.callback.BleNotifyCallback;
import com.clj.fastble.callback.BleScanCallback;
import com.clj.fastble.callback.BleWriteCallback;
import com.clj.fastble.data.BleDevice;
import com.clj.fastble.data.BleScanState;
import com.clj.fastble.exception.BleException;
import com.ifish.activity.BindTwoDeviceActivity;
import com.ifish.activity.BlackListActivity;
import com.ifish.activity.DeviceInstructionActivity;
import com.ifish.activity.InformationListActivity;
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.activity.MonitorActivity;
import com.ifish.activity.MyGoldActivity;
import com.ifish.activity.MyLevelValueActivity;
@ -90,7 +67,6 @@ import com.ifish.activity.RecentContactsActivity;
import com.ifish.activity.SignActivity;
import com.ifish.activity.WebViewMessageActivity;
import com.ifish.activity.WebViewTaobaoActivity;
import com.ifish.activity.newbind.ConnectType;
import com.ifish.activity.newbind.NewBindDeviceActivity;
import com.ifish.adapter.CameraFragmentAdapter;
import com.ifish.adapter.DeviceFragmentAdapter;
@ -1150,12 +1126,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
lv_camera.setAdapter(cameraAdapter);
return;
}
//
Intent intent = new Intent();
// 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())) {
@ -1168,7 +1139,6 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
sp.putBoolean(LoginSPKey.IS_CAMERA, Commons.IS_CAMERA);
Device clickItem = (Device) lv_device.getItemAtPosition(position);
if (clickItem!=null){
AppRoute.newToStart(requireActivity(),intent,clickItem);
}else {
AppRoute.oldToStart(requireActivity(),intent);