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

联网界面逻辑修改

This commit is contained in:
Lihongda 2024-03-10 17:58:27 +08:00
parent bc2b17e963
commit 54efd036e4
4 changed files with 223 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,7 +184,7 @@ public class CheckWifiUtil {
return wifissid;
}
public void checkCurAP(AppCompatActivity activity, String wifiName, String wifiPwd, String devicetype, ProgressBar progressLoading, TextView tvApConnectDevice) {
public void checkCurAP(AppCompatActivity activity, String wifiName, String wifiPwd, String devicetype) {
String wifissid = getCurWifiSsid(activity);
if (TextUtils.isEmpty(wifissid)) {
wifissid = "";
@ -195,7 +195,6 @@ public class CheckWifiUtil {
if ("camera".equals(devicetype)) {
if (!wifissid.startsWith("GW_AP_")) {
ToastUtil.show(activity.getApplicationContext(), "请先连接摄像头设备热点");
resetAPLayout(progressLoading,tvApConnectDevice);
return;
}
//todo 摄像头
@ -203,7 +202,6 @@ public class CheckWifiUtil {
} else if ("pet".equals(devicetype)) {
if (!wifissid.startsWith("ifish-")) {
ToastUtil.show(activity.getApplicationContext(), "请先连接宠物笼设备热点");
resetAPLayout(progressLoading,tvApConnectDevice);
return;
}
//todo 宠物
@ -211,7 +209,6 @@ public class CheckWifiUtil {
} else {
if (!wifissid.startsWith("ifish-")) {
ToastUtil.show(activity.getApplicationContext(), "请先连接设备热点");
resetAPLayout(progressLoading,tvApConnectDevice);
return;
}
//todo 设备
@ -220,7 +217,6 @@ public class CheckWifiUtil {
if (wifissid.equals(wifiName)) {
ToastUtil.show(activity.getApplicationContext(), "WiFi名称不能和热点名称一致");
resetAPLayout(progressLoading,tvApConnectDevice);
return;
}
@ -232,9 +228,4 @@ public class CheckWifiUtil {
}
private void resetAPLayout(ProgressBar progressLoading, TextView tvApConnectDevice) {
progressLoading.setVisibility(View.GONE);
tvApConnectDevice.setVisibility(View.VISIBLE);
}
}

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

@ -1,6 +1,7 @@
package com.ifish.activity.newbind;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
@ -25,9 +26,12 @@ import com.ifish.activity.BindDeviceChoiceActivity;
import com.ifish.activity.BindTankActivity;
import com.ifish.activity.BindTankPetActivity;
import com.ifish.activity.R;
import com.ifish.activity.WebViewActivity;
import com.ifish.basebean.ConnectMessageEvent;
import com.ifish.utils.AnimationUtil;
import com.ifish.utils.ClickUtil;
import com.ifish.utils.Commons;
import com.ifish.utils.HttpManager;
import com.ifish.utils.KVUtil;
import com.ifish.utils.ToastUtil;
import com.ifish.utils.WifiAdmin;
@ -45,17 +49,16 @@ public class NewBindDeviceActivity extends AppCompatActivity {
//----------------控件区--------------------//
private TextView tvConnectType;
private ProgressBar progressLoading;
private LinearLayout llWifiLayout;
private LinearLayout llWifi;
private TextView tvWifiName;
private EditText tvWifiPwd;
private TextView tvTips;
private TextView tvTips2;
private TextView tvTips3;
private LinearLayout lineApTip;
private TextView tvOtherConnect;
private TextView tvClickButton;
private FrameLayout frameAp;
private TextView tvApConnectDevice;
private TextView tvConnectVideo;
//----------------变量区--------------------//
@ -123,15 +126,13 @@ public class NewBindDeviceActivity extends AppCompatActivity {
private void initView() {
tvConnectType = (TextView) findViewById(R.id.tv_connect_type);
frameAp = (FrameLayout) findViewById(R.id.frame_ap);
tvApConnectDevice = (TextView) findViewById(R.id.tv_ap_connect_device);
progressLoading = (ProgressBar) findViewById(R.id.progress_loading);
llWifiLayout = (LinearLayout) findViewById(R.id.ll_wifi_layout);
tvConnectVideo = (TextView) findViewById(R.id.tv_connect_video);
llWifi = (LinearLayout) findViewById(R.id.ll_wifi);
tvWifiName = (TextView) findViewById(R.id.tv_wifi_name);
tvWifiPwd = (EditText) findViewById(R.id.tv_wifi_pwd);
tvTips = (TextView) findViewById(R.id.tv_tips);
tvTips2 = (TextView) findViewById(R.id.tv_tips2);
tvTips3 = (TextView) findViewById(R.id.tv_tips3);
lineApTip = (LinearLayout) findViewById(R.id.line_ap_tip);
tvOtherConnect = (TextView) findViewById(R.id.tv_other_connect);
tvClickButton = (TextView) findViewById(R.id.tv_click_button);
@ -180,20 +181,18 @@ public class NewBindDeviceActivity extends AppCompatActivity {
connectDevice();
}
});
tvApConnectDevice.setOnClickListener(new View.OnClickListener() {
tvConnectVideo.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showProgress(true);
tvApConnectDevice.setVisibility(View.GONE);
//开始AP连接
connectAP();
Intent i = new Intent();
i.setClass(NewBindDeviceActivity.this, WebViewActivity.class);
i.putExtra(WebViewActivity.URL, HttpManager.Explain_URL);
i.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.PRODUCTBOOK);
startActivity(i);
AnimationUtil.startAnimation(NewBindDeviceActivity.this);
}
});
}
public void showProgress(boolean show) {
progressLoading.setVisibility(show ? View.VISIBLE : View.GONE);
}
/**
@ -202,12 +201,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
public void checkAPLayout() {
boolean curIsAP = curConnectType == ConnectType.APConnect;
//AP连接的UI需要特殊处理
//AP连接按钮
frameAp.setVisibility(curIsAP ? View.VISIBLE : View.GONE);
//确定&下一步按钮
tvClickButton.setVisibility(curIsAP ? View.GONE : View.VISIBLE);
//wifi布局
llWifiLayout.setVisibility(curIsAP ? View.GONE : View.VISIBLE);
//ap连接提示布局
lineApTip.setVisibility(curIsAP ? View.VISIBLE : View.GONE);
//todo AP连接的提示要修改
@ -217,12 +210,8 @@ public class NewBindDeviceActivity extends AppCompatActivity {
}
private void resetLayout() {
//AP连接按钮
frameAp.setVisibility(View.GONE);
//确定&下一步按钮
tvClickButton.setVisibility(View.VISIBLE);
//wifi布局
llWifiLayout.setVisibility(View.VISIBLE);
//ap连接提示布局
lineApTip.setVisibility(View.GONE);
//通用提示布局
@ -243,20 +232,26 @@ public class NewBindDeviceActivity extends AppCompatActivity {
// 处理SmartConfig逻辑
tvConnectType.setText("快捷连网");
tvClickButton.setText("确定");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）\n2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁，再点确定按钮。\n3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
tvTips3.setText("3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。");
break;
case APConnect:
// 处理APConnect逻辑
tvConnectType.setText("AP连网");
tvClickButton.setText("下一步");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）\n2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭，只有绿灯偶尔闪烁，再点下一步。");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭，只有绿灯偶尔闪烁，再点下一步。");
tvTips3.setText("3、APP跳转到WLAN后，找到ifish开头的热点，点击连接，密码是12345678，连好以后点击左上角返回箭头，耐心等待连接。");
ToastUtil.show(this, "切换到AP连网");
break;
case AirKiss:
tvConnectType.setText("一键连网");
ToastUtil.show(this, "一键连网");
tvClickButton.setText("确定");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）\n2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁，再点确定按钮。\n3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
tvTips3.setText("3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。");
// 处理AirKiss逻辑
break;
}
@ -301,6 +296,8 @@ public class NewBindDeviceActivity extends AppCompatActivity {
case APConnect:
//开始AP连接
checkAPLayout();
//开始AP连接
connectAP();
break;
case AirKiss:
// 处理AirKiss逻辑
@ -329,7 +326,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
if (isJump) {
String wifiName = tvWifiName.getText().toString();
String wifiPwd = tvWifiPwd.getText().toString();
checkWifiUtil.checkCurAP(this, wifiName, wifiPwd, devicetype,progressLoading,tvApConnectDevice);
checkWifiUtil.checkCurAP(this, wifiName, wifiPwd, devicetype);
isJump = false;
}
}
@ -345,8 +342,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
if (event.getId() == -1){
//绑定失败
if (curConnectType == ConnectType.APConnect){
showProgress(false);
tvApConnectDevice.setVisibility(View.VISIBLE);
ToastUtil.showLongToast(NewBindDeviceActivity.this,"点击右上角联网视频查看联网失败的原因");
return;
}
}

4
iFish7/src/main/java/com/ifish/utils/ToastUtil.java
View File

@ -39,7 +39,7 @@ public class ToastUtil {
}
public static void showLong( Context context,CharSequence text) {
showLongToast(context.getApplicationContext(),text, false);
showLongToast(context.getApplicationContext(),text);
}
/**
@ -97,7 +97,7 @@ public class ToastUtil {
tipToast.show();
}
public static void showLongToast(Context context, CharSequence message, boolean isShowIco) {
public static void showLongToast(Context context, CharSequence message) {
if (tipToast == null) {
tipToast = TipsToast.makeText(context, message, Toast.LENGTH_LONG);
} else {

370
iFish7/src/main/res/layout/activity_new_bind_device_choice.xml
View File

@ -1,222 +1,232 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="LHD"
android:textColor="@color/black" />
<TextView
android:id="@+id/tv_connect_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_marginTop="50dp"
android:text="一键连网"
android:textColor="@color/shoplist_text_item"
android:textSize="17sp"
android:textStyle="bold" />
<!--AP连网-->
<FrameLayout
android:id="@+id/frame_ap"
android:layout_width="match_parent"
android:layout_height="80dp"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/tv_ap_connect_device"
android:layout_width="100dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/connect_device"
android:gravity="center"
android:text="连接设备"
android:textColor="@color/white" />
<ProgressBar
android:id="@+id/progress_loading"
android:layout_width="30dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
<!--选择路由器-->
<LinearLayout
android:id="@+id/ll_wifi_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text="选择路由器WIFI"
android:textColor="#3E3A39" />
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout" />
<View
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
<LinearLayout
android:id="@+id/ll_wifi"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_connect_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="WIFI"
android:textColor="#3E3A39" />
android:layout_marginRight="10dp"
android:textSize="15sp"
android:layout_gravity="right"
android:text="联网视频"
android:textColor="@color/black" />
</FrameLayout>
<TextView
android:id="@+id/tv_connect_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:text="一键连网"
android:textColor="@color/shoplist_text_item"
android:textSize="17sp"
android:textStyle="bold" />
<!--选择路由器-->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_wifi_name"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_weight="1"
android:text="请输入WiFi名称"
android:textColor="#999999"
android:textSize="15sp" />
android:text="选择路由器WIFI"
android:textColor="#3E3A39" />
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
<LinearLayout
android:id="@+id/ll_wifi"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="WIFI"
android:textColor="#3E3A39" />
<TextView
android:id="@+id/tv_wifi_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_weight="1"
android:text="请输入WiFi名称"
android:textColor="#999999"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
<LinearLayout
android:id="@+id/ll_password"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="密码"
android:textColor="#3E3A39" />
<EditText
android:id="@+id/tv_wifi_pwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_weight="1"
android:background="@null"
android:hint="请输入WiFi密码"
android:textColor="#999999"
android:textColorHint="#999999"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
<LinearLayout
android:id="@+id/ll_password"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="密码"
android:textColor="#3E3A39" />
<EditText
android:id="@+id/tv_wifi_pwd"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_weight="1"
android:background="@null"
android:hint="请输入WiFi密码"
android:textColor="#999999"
android:textColorHint="#999999"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.1dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="#efedee" />
</LinearLayout>
<TextView
android:id="@+id/tv_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="30dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）\n2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁，再点确定按钮。
\n3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。"
android:textColor="#999999" />
<LinearLayout
android:id="@+id/line_ap_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/tv_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="30dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="@string/ap_connect_tip1"
android:text="1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）"
android:textColor="#999999" />
<TextView
android:id="@+id/tv_tips2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="@string/ap_connect_tip2"
android:text="2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。"
android:textColor="#E60012" />
<TextView
android:id="@+id/tv_tips3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。"
android:textColor="#999999" />
<LinearLayout
android:id="@+id/line_ap_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="@string/ap_connect_tip1"
android:textColor="#999999" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp"
android:text="@string/ap_connect_tip2"
android:textColor="#999999" />
</LinearLayout>
<TextView
android:id="@+id/tv_other_connect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:padding="6dp"
android:text="其他连网方式"
android:textColor="@color/shoplist_text_item"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_click_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:background="@drawable/login_button_select"
android:gravity="center_horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="确定"
android:textColor="@color/white" />
</LinearLayout>
<TextView
android:id="@+id/tv_other_connect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp"
android:padding="6dp"
android:text="其他连网方式"
android:textColor="@color/shoplist_text_item"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_click_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp"
android:background="@drawable/login_button_select"
android:gravity="center_horizontal"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:text="确定"
android:textColor="@color/white" />
</LinearLayout>
</ScrollView>