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

UI调整

This commit is contained in:
Lihongda 2024-03-10 23:05:52 +08:00
parent 69d4d65f24
commit 0c90c61598
2 changed files with 15 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
private TextView tvTips; private TextView tvTips;
private TextView tvTips2; private TextView tvTips2;
private TextView tvTips3; private TextView tvTips3;
private LinearLayout lineApTip;
private TextView tvOtherConnect; private TextView tvOtherConnect;
private TextView tvClickButton; private TextView tvClickButton;
private TextView tvConnectVideo; private TextView tvConnectVideo;
@ -84,7 +83,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
airKissUtil = new AirKissUtil(); airKissUtil = new AirKissUtil();
airKissUtil.init(this); airKissUtil.init(this);
devicetype = getIntent().getStringExtra("devicetype"); devicetype = getIntent().getStringExtra("devicetype");
//默认AP连网 //默认AP联网
curConnectType = ConnectType.AirKiss; curConnectType = ConnectType.AirKiss;
switchUIConnectType(curConnectType); switchUIConnectType(curConnectType);
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
@ -133,7 +132,6 @@ public class NewBindDeviceActivity extends AppCompatActivity {
tvTips = (TextView) findViewById(R.id.tv_tips); tvTips = (TextView) findViewById(R.id.tv_tips);
tvTips2 = (TextView) findViewById(R.id.tv_tips2); tvTips2 = (TextView) findViewById(R.id.tv_tips2);
tvTips3 = (TextView) findViewById(R.id.tv_tips3); tvTips3 = (TextView) findViewById(R.id.tv_tips3);
lineApTip = (LinearLayout) findViewById(R.id.line_ap_tip);
tvOtherConnect = (TextView) findViewById(R.id.tv_other_connect); tvOtherConnect = (TextView) findViewById(R.id.tv_other_connect);
tvClickButton = (TextView) findViewById(R.id.tv_click_button); tvClickButton = (TextView) findViewById(R.id.tv_click_button);
@ -195,27 +193,9 @@ public class NewBindDeviceActivity extends AppCompatActivity {
} }
/**
* 根据当前是不是AP连接更新布局
*/
public void checkAPLayout() {
boolean curIsAP = curConnectType == ConnectType.APConnect;
//AP连接的UI需要特殊处理
//ap连接提示布局
lineApTip.setVisibility(curIsAP ? View.VISIBLE : View.GONE);
//todo AP连接的提示要修改
//通用提示布局
tvTips.setVisibility(curIsAP ? View.GONE : View.VISIBLE);
}
private void resetLayout() { private void resetLayout() {
//确定&下一步按钮 //确定&下一步按钮
tvClickButton.setVisibility(View.VISIBLE); tvClickButton.setVisibility(View.VISIBLE);
//ap连接提示布局
lineApTip.setVisibility(View.GONE);
//通用提示布局
tvTips.setVisibility(View.VISIBLE);
airKissUtil.stopAirKiss(); airKissUtil.stopAirKiss();
} }
@ -230,28 +210,28 @@ public class NewBindDeviceActivity extends AppCompatActivity {
switch (connectType) { switch (connectType) {
case SmartConfig: case SmartConfig:
// 处理SmartConfig逻辑 // 处理SmartConfig逻辑
tvConnectType.setText("快捷连网"); tvConnectType.setText("快捷联网");
tvClickButton.setText("确定"); tvClickButton.setText("确定");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）"); tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。"); tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
tvTips3.setText("3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。"); tvTips3.setText("3、如多次尝试一键联网都不成功，可切换其他联网方式，每次重新连接时插座需断一次电然后重新复位连接。");
break; break;
case APConnect: case APConnect:
// 处理APConnect逻辑 // 处理APConnect逻辑
tvConnectType.setText("AP连网"); tvConnectType.setText("AP联网");
tvClickButton.setText("下一步"); tvClickButton.setText("下一步");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）"); tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭，只有绿灯偶尔闪烁，再点下一步。"); tvTips2.setText("2、先长按插座复位键13秒左右，松手后红灯绿灯同时熄灭，只有绿灯偶尔闪烁，再点下一步。");
tvTips3.setText("3、APP跳转到WLAN后，找到ifish开头的热点，点击连接，密码是12345678，连好以后点击左上角返回箭头，耐心等待连接。"); tvTips3.setText("3、APP跳转到WLAN后，选择ifish-xxxx的网络，点击连接，密码是12345678，连好以后点击左上角返回箭头，耐心等待连接。");
ToastUtil.show(this, "切换到AP连网"); ToastUtil.show(this, "切换到AP联网");
break; break;
case AirKiss: case AirKiss:
tvConnectType.setText("一键连网"); tvConnectType.setText("一键联网");
ToastUtil.show(this, "一键连网"); ToastUtil.show(this, "一键联网");
tvClickButton.setText("确定"); tvClickButton.setText("确定");
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）"); tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。"); tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
tvTips3.setText("3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。"); tvTips3.setText("3、如多次尝试一键联网都不成功，可切换其他联网方式，每次重新连接时插座需断一次电然后重新复位连接。");
// 处理AirKiss逻辑 // 处理AirKiss逻辑
break; break;
} }
@ -262,7 +242,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
*/ */
public void connectDevice() { public void connectDevice() {
airKissUtil.stopAirKiss(); airKissUtil.stopAirKiss();
//根据选择的连网类型跳转不同的逻辑 //根据选择的联网类型跳转不同的逻辑
String ssid = tvWifiName.getText().toString(); String ssid = tvWifiName.getText().toString();
String pwd = tvWifiPwd.getText().toString(); String pwd = tvWifiPwd.getText().toString();
//一系列判断逻辑 //一系列判断逻辑
@ -288,20 +268,18 @@ public class NewBindDeviceActivity extends AppCompatActivity {
} }
//新页面跳转 //新页面跳转
intent.putExtra("wifiPassword", pwd); intent.putExtra("wifiPassword", pwd);
ToastUtil.show(NewBindDeviceActivity.this, "开始SmartConfig连网..."); ToastUtil.show(NewBindDeviceActivity.this, "开始快捷联网...");
startActivity(intent); startActivity(intent);
AnimationUtil.startAnimation(NewBindDeviceActivity.this); AnimationUtil.startAnimation(NewBindDeviceActivity.this);
finish(); finish();
break; break;
case APConnect: case APConnect:
//开始AP连接
checkAPLayout();
//开始AP连接 //开始AP连接
connectAP(); connectAP();
break; break;
case AirKiss: case AirKiss:
// 处理AirKiss逻辑 // 处理AirKiss逻辑
ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss连网..."); ToastUtil.show(NewBindDeviceActivity.this, "开始AirKiss联网...");
airKissUtil.connectDeviceByAirKiss(this, ssid, bssid, pwd); airKissUtil.connectDeviceByAirKiss(this, ssid, bssid, pwd);
break; break;
} }

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

@ -48,7 +48,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="一键连网" android:text="一键联网"
android:textColor="@color/shoplist_text_item" android:textColor="@color/shoplist_text_item"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" /> android:textStyle="bold" />
@ -180,37 +180,9 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:lineSpacingExtra="5dp" android:lineSpacingExtra="5dp"
android:text="3、如多次尝试一键连网都不成功，可切换其他连网方式，每次重新连接时插座需断一次电然后重新复位连接。" android:text="3、如多次尝试一键联网都不成功，可切换其他联网方式，每次重新联接时插座需断一次电然后重新复位联接。"
android:textColor="#999999" /> 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 <TextView
android:id="@+id/tv_other_connect" android:id="@+id/tv_other_connect"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -218,7 +190,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
android:padding="6dp" android:padding="6dp"
android:text="其他连网方式" android:text="其他联网方式"
android:textColor="@color/shoplist_text_item" android:textColor="@color/shoplist_text_item"
android:textStyle="bold" /> android:textStyle="bold" />