xunchuanzhi 1 год назад
Родитель
Сommit
de17dfbab7

+ 10 - 0
android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/fragment/QrCodeFragment.kt

@@ -105,12 +105,21 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
         }
 
         tv_device_test.setOnClickListener {
+//            ZhylManager.getInstance(BaseApplication.appContext).disp_setScreenSleep ()
+//            ZhylManager.getInstance(BaseApplication.appContext).sys_setTimeFormat("America/Houston")
+//            ZhylManager.getInstance(BaseApplication.appContext).sys_setTime(getActivity(),Integer.parseInt("2022"), Integer.parseInt("08"), Integer.parseInt("11"), Integer.parseInt("10"), Integer.parseInt("11"));
+
             (activity as CallingdoorActivity).resetSleepTime()
             PasswordDialogHelper.showPasswordDialog(activity) {
                 (activity as CallingdoorActivity).startTestMode()
             }
         }
 
+        tv_device_call.setOnClickListener {
+            (activity as CallingdoorActivity).resetSleepTime()
+            CallConfigDialogHelper.showDialog(activity)
+        }
+
         view_qr_code.setOnClickListener {
             val time = System.currentTimeMillis()
             if (time - clickTime < 1500) {
@@ -123,6 +132,7 @@ class QrCodeFragment : BaseFragment<QrCodeFragmentPresenter, QrCodeLayBinding>()
                 showMessage("show navbar")
                 //显示虚拟导航栏
                 ZhylManager.getInstance(BaseApplication.appContext).disp_setNavigationBar(true)
+                ZhylManager.getInstance(BaseApplication.appContext).disp_setStatusBar(true)
                 clickTimes = 1
             }
             clickTime = time

+ 90 - 0
android_door/src/main/h10_a133_chile/java/com/wdkl/app/ncs/callingdoor/helper/CallConfigDialogHelper.java

@@ -0,0 +1,90 @@
+package com.wdkl.app.ncs.callingdoor.helper;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.zhyl.ZhylManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import com.wdkl.app.ncs.callingdoor.R;
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+
+import java.util.HashMap;
+
+import static com.wdkl.ncs.android.lib.utils.ExtendMethodsKt.showMessage;
+
+
+public class CallConfigDialogHelper {
+
+    private static AlertDialog alertDialog;
+    private static String network="";
+
+    public static void showDialog(Activity activity) {
+
+        View contentView = LayoutInflater.from(activity).inflate(R.layout.call_config_dialog, null);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(contentView);
+        LinearLayout layout = contentView.findViewById(R.id.ll_net_config_view);
+        EditText call_config_mic = contentView.findViewById(R.id.call_config_mic);
+        EditText call_config_horn = contentView.findViewById(R.id.call_config_horn);
+        Button call_config_cancel_button = contentView.findViewById(R.id.call_config_cancel_button);
+        Button call_config_determine_button = contentView.findViewById(R.id.call_config_determine_button);
+
+        layout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    Utils.hideInputKeyboard(alertDialog.getWindow().getDecorView().getWindowToken());
+                } catch (Exception e) {
+                    //
+                }
+            }
+        });
+
+
+        try {
+
+            int mic1 =ZhylManager.getInstance(BaseApplication.appContext).sys_getMic1gain(BaseApplication.appContext);
+            int yl2 = ZhylManager.getInstance(BaseApplication.appContext).sys_getDacVolume(BaseApplication.appContext);
+//
+            call_config_mic.setText(mic1);
+            call_config_horn.setText(yl2);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        call_config_cancel_button.setOnClickListener(v -> {
+            if (alertDialog != null && alertDialog.isShowing()) {
+                alertDialog.dismiss();
+
+            }
+        });
+        call_config_determine_button.setOnClickListener(v -> {
+            if (alertDialog != null && alertDialog.isShowing()) {
+                int mic = Integer.parseInt(call_config_mic.getText().toString());
+                int yl =  Integer.parseInt(call_config_horn.getText().toString());
+                    alertDialog.dismiss();
+                    try {
+                        //设置静态网络
+                        if (ZhylManager.getInstance(BaseApplication.appContext).sys_setDacVolume(BaseApplication.appContext,yl) == 1 &&
+                                ZhylManager.getInstance(BaseApplication.appContext).sys_setMic1gain(BaseApplication.appContext,mic) == 1) {
+                            showMessage("Success");
+                        } else {
+                            showMessage("Failed");
+                        }
+                    } catch (Exception e) {
+                        showMessage("Failed");
+                    }
+                }
+
+        });
+        alertDialog = builder.create();
+        alertDialog.setCanceledOnTouchOutside(true);
+        alertDialog.setCancelable(true);
+        alertDialog.show();
+
+    }
+}

+ 11 - 0
android_door/src/main/h10_a133_chile/res/drawable/shape_callconfig_bt_bg.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#97A2BE"
+        />
+    <corners
+        android:topLeftRadius="18dp"
+        android:topRightRadius="18dp"
+        android:bottomLeftRadius="18dp"
+        android:bottomRightRadius="18dp"
+        />
+</shape>

+ 117 - 0
android_door/src/main/h10_a133_chile/res/layout/call_config_dialog.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:id="@+id/ll_net_config_view"
+        android:layout_width="480dp"
+        android:layout_height="448dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="23dp"
+            android:gravity="center"
+            android:text="@string/call_config"
+            android:textColor="@color/black"
+            android:textSize="@dimen/font_size_18"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="24dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="mic"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/call_config_mic"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="20dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="horn"
+                android:textColor="@color/black"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+            <EditText
+                android:id="@+id/call_config_horn"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="15dp"
+                android:background="@drawable/selector_nuser_ed_d"
+                android:paddingLeft="30dp"
+                android:textSize="@dimen/font_size_18"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+
+
+
+
+
+
+        <LinearLayout
+            android:layout_width="380dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginBottom="40dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/call_config_cancel_button"
+                android:layout_width="176dp"
+                android:layout_height="48dp"
+                android:background="@drawable/shape_callconfig_bt_bg"
+                android:gravity="center"
+                android:text="@string/str_cancel"
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:textSize="16sp" />
+
+            <Button
+                android:id="@+id/call_config_determine_button"
+                android:layout_width="176dp"
+                android:layout_height="48dp"
+                android:layout_marginLeft="30dp"
+                android:background="@drawable/shape_main_hos_txt_bg"
+                android:gravity="center"
+                android:text="@string/str_confirm"
+                android:textColor="@drawable/selector_bottom_btn_text_color"
+                android:textSize="16sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

+ 12 - 1
android_door/src/main/h10_a133_chile/res/layout/qr_code_lay.xml

@@ -252,7 +252,18 @@
                     android:text="@string/server_config"
                     android:textColor="@drawable/selector_bottom_btn_text_color"
                     android:textSize="24sp" />
-
+                <TextView
+                    android:id="@+id/tv_device_call"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:padding="10dp"
+                    android:background="@color/main_color"
+                    android:gravity="center_horizontal"
+                    android:singleLine="true"
+                    android:text="@string/call_config"
+                    android:textColor="@drawable/selector_bottom_btn_text_color"
+                    android:textSize="24sp" />
                 <TextView
                     android:id="@+id/tv_device_test"
                     android:layout_width="match_parent"

+ 2 - 0
resource/src/main/res/values-es/strings.xml

@@ -223,6 +223,7 @@
     <string name="broadcast_playing">Reproduciendo emisón…</string>
     <string name="broadcast_pause">Pausa en emisión…</string>
     <string name="broadcast_stop">Parar emisión</string>
+    <string name="call_config">Configuración de llamada</string>
     <string name="test_mode">Modo pruebas</string>
     <string name="wait_moment">Por favor, espere</string>
     <string name="enter_nursing">Presència</string>
@@ -231,6 +232,7 @@
     <string name="room_null_bed">Sin cama</string>
     <string name="nursing_light_color">Color:</string>
 
+
     <string name="voice_call">Voz</string>
     <string name="video_call">Vídeo</string>
     <string name="str_reset">Reseteo</string>

+ 1 - 0
resource/src/main/res/values-ru/strings.xml

@@ -211,6 +211,7 @@
     <string name="broadcast_pause">Приостановка трансляции…</string>
     <string name="broadcast_stop">Остановка трансляции</string>
     <string name="test_mode">Тестовый режим</string>
+    <string name="call_config">Параметры вызова</string>
     <string name="wait_moment">Подождите</string>
     <string name="enter_nursing">Уход</string>
     <string name="nursing_title">Уход…</string>

+ 1 - 0
resource/src/main/res/values-zh/strings.xml

@@ -223,6 +223,7 @@
     <string name="broadcast_playing">广播正在播放…</string>
     <string name="broadcast_pause">广播暂停播放…</string>
     <string name="broadcast_stop">广播停止</string>
+    <string name="call_config">通话设置</string>
     <string name="test_mode">测试模式</string>
     <string name="wait_moment">请稍后</string>
     <string name="enter_nursing">进入护理</string>

+ 1 - 0
resource/src/main/res/values/strings.xml

@@ -222,6 +222,7 @@
     <string name="broadcast_playing">Broadcast playing…</string>
     <string name="broadcast_pause">Broadcast pause…</string>
     <string name="broadcast_stop">Broadcast stop</string>
+    <string name="call_config">Call setup</string>
     <string name="test_mode">Test mode</string>
     <string name="wait_moment">Please wait</string>
     <string name="enter_nursing">Nursing</string>