feat#415-蓝牙视频

gradle.properties

@@ -26,6 +26,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true
 
-versionCode=105
-versionName=4.12.05
+versionCode=106
+versionName=4.12.06
 

iFish7/src/main/java/com/ifish/activity/newbind/NewBindDeviceActivity.java

@@ -327,6 +327,10 @@ public class NewBindDeviceActivity extends AppCompatActivity {
             public void onClick(View v) {
                 Intent i = new Intent();
                 i.setClass(NewBindDeviceActivity.this, WebViewActivity.class);
+                if (curConnectType ==ConnectType.BlueTooth){
+                    i.putExtra(WebViewActivity.URL, HttpManager.BlueConnectVideoUrl);
+                    i.putExtra(WebViewActivity.WEBVIEWTITLE, HttpManager.BlueConnectVideoTitle);
+                }else
                 if (curConnectType == ConnectType.AirKiss){
                     i.putExtra(WebViewActivity.URL, HttpManager.AirKissConnectVideoUrl);
                     i.putExtra(WebViewActivity.WEBVIEWTITLE, HttpManager.AirKissConnectVideoTitle);
@@ -385,7 +389,7 @@ public class NewBindDeviceActivity extends AppCompatActivity {
                 // 处理SmartConfig逻辑
                 tvConnectType.setText("蓝牙联网");
                 tvClickButton.setText("确定");
-                tvConnectVideo.setVisibility(View.INVISIBLE);
+//                tvConnectVideo.setVisibility(View.INVISIBLE);
                 tvTips.setText("1、插座仅支持2.4G的WiFi网络，不支持5G及双频合一的网络（需在路由器设置中分开）");
                 tvTips2.setText("2、先长按插座复位键3秒，松手后红灯绿灯同时闪烁以后，再点确定按钮。");
                 tvTips3.setText("3、如多次尝试一键联网都不成功，可切换其他联网方式，每次重新连接时插座需断一次电然后重新复位连接。");

iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java

@@ -1980,6 +1980,7 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
             isShowEd = true;
 
             alertDialog =  new IosAlertDialog(requireContext(), Gravity.BOTTOM).builder();
+            alertDialog.showBottom(true);
             alertDialog.setTextColor(R.color.danghao_color);
             alertDialog.setCancelable(false);
             alertDialog.setTitle("发现设备");

iFish7/src/main/java/com/ifish/utils/HttpManager.java

@@ -126,6 +126,9 @@ public class HttpManager {
     public static final String APConnectVideoTitle = "AP联网";
     public static String APConnectVideoUrl = "https://www.ifish7.com/download/s2.mp4"; //安卓版本的 AP联网视频
 
+    public static final String BlueConnectVideoTitle = "蓝牙联网";
+    public static String BlueConnectVideoUrl = "https://www.ifish7.com/download/bluetooth_device.mp4"; //安卓版本的蓝牙联网视频
+
     private String user_URL = "user/";
     private String users_URL = "users/";
     public static String Room_URL = "room/";

iFish7/src/main/java/com/ifish/view/IosAlertDialog.java

@@ -33,6 +33,7 @@ public class IosAlertDialog {
     private Button btn_neg;
     private Button btn_pos;
     private ImageView img_line;
+    private View bottom;
     private Display display;
     private boolean showTitle = false;
     private boolean showMsg = false;
@@ -48,6 +49,17 @@ public class IosAlertDialog {
         display = windowManager.getDefaultDisplay();
     }
 
+    public void showBottom(boolean show) {
+        if (bottom!=null){
+            if (show){
+                bottom.setVisibility(View.VISIBLE);
+            }else {
+                bottom.setVisibility(View.GONE);
+            }
+
+        }
+    }
+
     public IosAlertDialog(Context context, int gravity) {
         this.context = context;
         WindowManager windowManager = (WindowManager) context
@@ -65,6 +77,7 @@ public class IosAlertDialog {
         // 获取自定义Dialog布局中的控件
         lLayout_bg = view.findViewById(R.id.lLayout_bg);
         txt_title = view.findViewById(R.id.txt_title);
+        bottom = view.findViewById(R.id.bottom);
         txt_title.setVisibility(View.GONE);
         txt_msg = view.findViewById(R.id.txt_msg);
         txt_msg.setVisibility(View.GONE);

iFish7/src/main/res/layout/ios_dialog_layout.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
     android:id="@+id/lLayout_bg"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_height="wrap_content">
+<LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/ios_dialog_bg"
@@ -70,4 +75,10 @@
             />
     </LinearLayout>
 
+</LinearLayout>
+    <View
+        android:id="@+id/bottom"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"/>
 </LinearLayout>