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

UI调整

This commit is contained in:
Lihongda 2024-03-12 13:29:11 +08:00
parent 5126bb1ec8
commit ec35beb407
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,8 +184,13 @@ public class NewBindDeviceActivity extends AppCompatActivity {
public void onClick(View v) {
Intent i = new Intent();
i.setClass(NewBindDeviceActivity.this, WebViewActivity.class);
i.putExtra(WebViewActivity.URL, HttpManager.Explain_URL);
i.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.PRODUCTBOOK);
if (curConnectType == ConnectType.AirKiss){
i.putExtra(WebViewActivity.URL, HttpManager.AirKissConnectVideoUrl);
i.putExtra(WebViewActivity.WEBVIEWTITLE, HttpManager.AirKissConnectVideoTitle);
}else {
i.putExtra(WebViewActivity.URL, HttpManager.APConnectVideoUrl);
i.putExtra(WebViewActivity.WEBVIEWTITLE, HttpManager.APConnectVideoTitle);
}
startActivity(i);
AnimationUtil.startAnimation(NewBindDeviceActivity.this);
}
@ -196,6 +201,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
private void resetLayout() {
//确定&下一步按钮
tvClickButton.setVisibility(View.VISIBLE);
tvConnectVideo.setVisibility(View.VISIBLE);
airKissUtil.stopAirKiss();
}
@ -213,6 +219,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
// 处理SmartConfig逻辑
tvConnectType.setText("快捷联网");
tvClickButton.setText("确定");
tvConnectVideo.setVisibility(View.INVISIBLE);
tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
tvTips3.setText("3、如多次尝试一键联网都不成功，可切换其他联网方式，每次重新连接时插座需断一次电然后重新复位连接。");

5
iFish7/src/main/java/com/ifish/utils/HttpManager.java
View File

@ -121,6 +121,11 @@ public class HttpManager {
public static String Company_PhoneNum = "18667812003";// 公司电话
public static String BuyCameraTaobao_URL = "http://h5.m.taobao.com/awp/core/detail.htm?id=535991514644";// 购买摄像头淘宝网址
public static final String AirKissConnectVideoTitle = "一键联网";
public static String AirKissConnectVideoUrl = "https://www.ifish7.com/download/s1.mp4"; //安卓版本的一键联网的视频
public static final String APConnectVideoTitle = "AP联网";
public static String APConnectVideoUrl = "https://www.ifish7.com/download/s2.mp4"; //安卓版本的 AP联网视频
private String user_URL = "user/";
private String users_URL = "users/";
public static String Room_URL = "room/";

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

@ -36,7 +36,7 @@
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:text="联网视频"
android:textColor="@color/black"
android:textColor="#E60012"
android:textSize="15sp" />
</FrameLayout>
@ -47,10 +47,10 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginTop="18dp"
android:text="一键联网"
android:textColor="@color/shoplist_text_item"
android:textSize="17sp"
android:textSize="22sp"
android:textStyle="bold" />
<!--选择路由器-->