月子中心主机增加呼叫功能，修改通话背景等

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -1316,13 +1316,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                     } else {
                         showMessage(R.string.no_custom)
                     }
-                } /*else if (Constant.CALL_STATE == Constant.CALL_INCOMING) {
-                    inCalling()
-                } else if (Constant.CALL_STATE == Constant.CALL_CALLING) {
-                    hangupCall()
-                } else if (Constant.CALL_STATE == Constant.CALL_OUTGOING) {
-                    cancelCall()
-                }*/
+                }
             }
         } else if (buffer[7].toInt() == 1 || buffer[7].toInt() == 2) {
             //卫生间紧急按钮: 一定时间内重复多次按无效

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/fragment/YzMainFragment.kt

@@ -1,5 +1,6 @@
 package com.wdkl.app.ncs.callingdoor.fragment
 
+import android.text.TextUtils
 import androidx.recyclerview.widget.GridLayoutManager
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.JsonObject
@@ -9,6 +10,7 @@ import com.wdkl.app.ncs.callingdoor.adapter.BabyItemAdapter
 import com.wdkl.app.ncs.callingdoor.databinding.MainViewLayoutBinding
 import com.wdkl.app.ncs.callingdoor.helper.AppInfoDialogHelper
 import com.wdkl.app.ncs.callingdoor.helper.AppUpdateHelper
+import com.wdkl.app.ncs.callingdoor.helper.CallTypeDialogHelper
 import com.wdkl.app.ncs.callingdoor.launch.CallingdoorLaunch
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.base.BaseFragment
@@ -21,6 +23,7 @@ import com.wdkl.ncs.android.middleware.common.MessageEvent
 import com.wdkl.ncs.android.middleware.logic.contract.callingdoor.MainFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingdoor.MainFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.FrameBedRelativeVO
+import com.wdkl.ncs.android.middleware.model.vo.FrameBedVO
 import com.wdkl.ncs.android.middleware.model.vo.FrameRoomVO
 import com.wdkl.ncs.android.middleware.utils.AppUtil
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
@@ -35,6 +38,7 @@ class YzMainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>
     private lateinit var gridLayoutManager: OnegoGridLayoutManager
     private lateinit var babyAdapter: BabyItemAdapter
     private var babyItems = ArrayList<FrameBedRelativeVO>()
+    private var bedVO: FrameBedVO? = null
 
     override fun getLayId(): Int {
         return R.layout.yz_main_view_layout
@@ -68,6 +72,28 @@ class YzMainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>
 
             return@setOnLongClickListener true
         }
+
+        btn_call.setOnClickListener {
+            CallTypeDialogHelper.showDialog(activity, object : CallTypeDialogHelper.ClickListener {
+                override fun onCallNurse() {
+                    //呼叫主机
+                    if (!TextUtils.isEmpty(Constant.SIP_ID)) {
+                        (activity as CallingdoorActivity).startCall(Constant.VOICE_CALL)
+                    } else {
+                        showMessage(R.string.no_custom)
+                    }
+                }
+
+                override fun onCallBed() {
+                    //呼叫床位
+                    if (bedVO != null && bedVO!!.bedDeviceId != null) {
+                        (activity as CallingdoorActivity).startCallBed(Constant.VOICE_CALL, bedVO!!.bedDeviceId)
+                    } else {
+                        showMessage("找不到设备!")
+                    }
+                }
+            })
+        }
     }
 
     override fun destory() {
@@ -75,49 +101,12 @@ class YzMainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>
 
     override fun showRoomInfo(roomInfo: FrameRoomVO) {
         if (roomInfo.frameBedList != null && roomInfo.frameBedList.size > 0) {
-            val bedVO = roomInfo.frameBedList[0]
-            //加载责护
-            if (bedVO.customerId != null) {
-                presenter.loadClerk(bedVO.customerId)
-            }
+            bedVO = roomInfo.frameBedList[0]
 
-            if (bedVO.frameBedRelativeVos != null && bedVO.frameBedRelativeVos.size > 0) {
-                if (bedVO.frameBedRelativeVos.size > 1) {
-                    //多胞胎
-                    Constant.babyGirl = true
-                    //红色主题
-                    rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
-                    yz_main_view.setBackgroundResource(R.mipmap.main_bg_girls)
-                    tv_in_date.setTextColor(Constant.colorGirl)
-                    tv_out_date.setTextColor(Constant.colorGirl)
-                    tv_mother_name.setTextColor(Constant.colorGirl)
-                    tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
-                    img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
-                    tv_nurse_name.setTextColor(Constant.colorGirl)
-
-                    /*var babyBoy = 0
-                    for (relative in bedVO.frameBedRelativeVos) {
-                        if (relative.relativeSex != null && relative.relativeSex == 1) {
-                            //男孩
-                            babyBoy++
-                        }
-                    }
-
-                    //多胞胎
-                    if (babyBoy == bedVO.frameBedRelativeVos.size) {
-                        //都是男孩
-                        Constant.babyGirl = false
-                        //蓝色主题
-                        rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_blue)
-                        yz_main_view.setBackgroundResource(R.mipmap.main_bg_boys)
-                        tv_in_date.setTextColor(Constant.colorBoy)
-                        tv_out_date.setTextColor(Constant.colorBoy)
-                        tv_mother_name.setTextColor(Constant.colorBoy)
-                        tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_blue)
-                        img_nurse_icon.setImageResource(R.mipmap.ic_nurse_1)
-                        tv_nurse_name.setTextColor(Constant.colorBoy)
-                    } else if (babyBoy == 0) {
-                        //都是女孩
+            try {
+                if (bedVO!!.frameBedRelativeVos != null && bedVO!!.frameBedRelativeVos.size > 0) {
+                    if (bedVO!!.frameBedRelativeVos.size > 1) {
+                        //多胞胎
                         Constant.babyGirl = true
                         //红色主题
                         rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
@@ -128,91 +117,143 @@ class YzMainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>
                         tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
                         img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
                         tv_nurse_name.setTextColor(Constant.colorGirl)
+
+                        /*var babyBoy = 0
+                        for (relative in bedVO.frameBedRelativeVos) {
+                            if (relative.relativeSex != null && relative.relativeSex == 1) {
+                                //男孩
+                                babyBoy++
+                            }
+                        }
+
+                        //多胞胎
+                        if (babyBoy == bedVO.frameBedRelativeVos.size) {
+                            //都是男孩
+                            Constant.babyGirl = false
+                            //蓝色主题
+                            rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_blue)
+                            yz_main_view.setBackgroundResource(R.mipmap.main_bg_boys)
+                            tv_in_date.setTextColor(Constant.colorBoy)
+                            tv_out_date.setTextColor(Constant.colorBoy)
+                            tv_mother_name.setTextColor(Constant.colorBoy)
+                            tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_blue)
+                            img_nurse_icon.setImageResource(R.mipmap.ic_nurse_1)
+                            tv_nurse_name.setTextColor(Constant.colorBoy)
+                        } else if (babyBoy == 0) {
+                            //都是女孩
+                            Constant.babyGirl = true
+                            //红色主题
+                            rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
+                            yz_main_view.setBackgroundResource(R.mipmap.main_bg_girls)
+                            tv_in_date.setTextColor(Constant.colorGirl)
+                            tv_out_date.setTextColor(Constant.colorGirl)
+                            tv_mother_name.setTextColor(Constant.colorGirl)
+                            tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
+                            img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
+                            tv_nurse_name.setTextColor(Constant.colorGirl)
+                        } else {
+                            //男孩女孩都有
+                            Constant.babyGirl = true
+                            //红色主题
+                            rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
+                            yz_main_view.setBackgroundResource(R.mipmap.main_bg_boy_girl)
+                            tv_in_date.setTextColor(Constant.colorGirl)
+                            tv_out_date.setTextColor(Constant.colorGirl)
+                            tv_mother_name.setTextColor(Constant.colorGirl)
+                            tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
+                            img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
+                            tv_nurse_name.setTextColor(Constant.colorGirl)
+                        }*/
                     } else {
-                        //男孩女孩都有
-                        Constant.babyGirl = true
-                        //红色主题
-                        rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
-                        yz_main_view.setBackgroundResource(R.mipmap.main_bg_boy_girl)
-                        tv_in_date.setTextColor(Constant.colorGirl)
-                        tv_out_date.setTextColor(Constant.colorGirl)
-                        tv_mother_name.setTextColor(Constant.colorGirl)
-                        tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
-                        img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
-                        tv_nurse_name.setTextColor(Constant.colorGirl)
-                    }*/
-                } else {
-                    //单胎
-                    if (bedVO.frameBedRelativeVos[0].relativeSex != null && bedVO.frameBedRelativeVos[0].relativeSex == 1) {
-                        //男孩
-                        Constant.babyGirl = false
-                        //蓝色主题
-                        rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_blue)
-                        yz_main_view.setBackgroundResource(R.mipmap.main_bg_boy)
-                        tv_in_date.setTextColor(Constant.colorBoy)
-                        tv_out_date.setTextColor(Constant.colorBoy)
-                        tv_mother_name.setTextColor(Constant.colorBoy)
-                        tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_blue)
-                        img_nurse_icon.setImageResource(R.mipmap.ic_nurse_1)
-                        tv_nurse_name.setTextColor(Constant.colorBoy)
-                    } else {
-                        //女孩
-                        Constant.babyGirl = true
-                        //红色主题
-                        rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
-                        yz_main_view.setBackgroundResource(R.mipmap.main_bg_girl)
-                        tv_in_date.setTextColor(Constant.colorGirl)
-                        tv_out_date.setTextColor(Constant.colorGirl)
-                        tv_mother_name.setTextColor(Constant.colorGirl)
-                        tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
-                        img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
-                        tv_nurse_name.setTextColor(Constant.colorGirl)
+                        //单胎
+                        if (bedVO!!.frameBedRelativeVos[0].relativeSex != null && bedVO!!.frameBedRelativeVos[0].relativeSex == 1) {
+                            //男孩
+                            Constant.babyGirl = false
+                            //蓝色主题
+                            rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_blue)
+                            yz_main_view.setBackgroundResource(R.mipmap.main_bg_boy)
+                            tv_in_date.setTextColor(Constant.colorBoy)
+                            tv_out_date.setTextColor(Constant.colorBoy)
+                            tv_mother_name.setTextColor(Constant.colorBoy)
+                            tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_blue)
+                            img_nurse_icon.setImageResource(R.mipmap.ic_nurse_1)
+                            tv_nurse_name.setTextColor(Constant.colorBoy)
+                        } else {
+                            //女孩
+                            Constant.babyGirl = true
+                            //红色主题
+                            rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
+                            yz_main_view.setBackgroundResource(R.mipmap.main_bg_girl)
+                            tv_in_date.setTextColor(Constant.colorGirl)
+                            tv_out_date.setTextColor(Constant.colorGirl)
+                            tv_mother_name.setTextColor(Constant.colorGirl)
+                            tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
+                            img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
+                            tv_nurse_name.setTextColor(Constant.colorGirl)
+                        }
                     }
+
+                    babyItems.clear()
+                    babyItems.addAll(bedVO!!.frameBedRelativeVos)
+                    babyAdapter.updateData(babyItems)
+                } else {
+                    //女孩
+                    Constant.babyGirl = true
+                    //红色主题
+                    rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
+                    yz_main_view.setBackgroundResource(R.mipmap.main_bg_girl)
+                    tv_in_date.setTextColor(Constant.colorGirl)
+                    tv_out_date.setTextColor(Constant.colorGirl)
+                    tv_mother_name.setTextColor(Constant.colorGirl)
+                    tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
+                    img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
+                    tv_nurse_name.setTextColor(Constant.colorGirl)
+
+                    babyItems.clear()
+                    babyAdapter.updateData(babyItems)
                 }
 
-                babyItems.clear()
-                babyItems.addAll(bedVO.frameBedRelativeVos)
-                babyAdapter.updateData(babyItems)
-            } else {
-                //女孩
-                Constant.babyGirl = true
-                //红色主题
-                rl_date_view.setBackgroundResource(R.drawable.shape_bottom_bg_red)
-                yz_main_view.setBackgroundResource(R.mipmap.main_bg_girl)
-                tv_in_date.setTextColor(Constant.colorGirl)
-                tv_out_date.setTextColor(Constant.colorGirl)
-                tv_mother_name.setTextColor(Constant.colorGirl)
-                tv_desc.setBackgroundResource(R.drawable.shape_desc_bg_red)
-                img_nurse_icon.setImageResource(R.mipmap.ic_nurse_2)
-                tv_nurse_name.setTextColor(Constant.colorGirl)
-
-                babyItems.clear()
-                babyAdapter.updateData(babyItems)
-            }
+                if (bedVO!!.customerInDate != null) {
+                    val inDate = TimeHandle.getDateTime(bedVO!!.customerInDate * 1000, "yyyy年MM月dd日")
+                    tv_in_date.setText("入住时间: " + inDate)
+                } else {
+                    tv_in_date.setText("入住时间:")
+                }
 
-            if (bedVO.customerInDate != null) {
-                val inDate = TimeHandle.getDateTime(bedVO.customerInDate*1000, "yyyy年MM月dd日")
-                tv_in_date.setText("入住时间: " + inDate)
-            } else {
-                tv_in_date.setText("入住时间:")
-            }
+                if (bedVO!!.customerOutDate != null) {
+                    val outDate = TimeHandle.getDateTime(bedVO!!.customerOutDate * 1000, "yyyy年MM月dd日")
+                    tv_out_date.setText("出所时间: " + outDate)
+                } else {
+                    tv_out_date.setText("出所时间:")
+                }
 
-            if (bedVO.customerOutDate != null) {
-                val outDate = TimeHandle.getDateTime(bedVO.customerOutDate*1000, "yyyy年MM月dd日")
-                tv_out_date.setText("出所时间: " + outDate)
-            } else {
-                tv_out_date.setText("出所时间:")
-            }
+                tv_mother_name.text = bedVO?.customerName
+                tv_desc.text = bedVO?.customerIllnessDesc
 
-            tv_mother_name.text = bedVO.customerName
-            tv_desc.text = bedVO.customerIllnessDesc
+                if (Constant.babyGirl) {
+                    btn_call.setBackgroundResource(R.mipmap.mom_call2)
+                } else {
+                    btn_call.setBackgroundResource(R.mipmap.mom_call1)
+                }
+
+                //加载责护
+                if (bedVO!!.customerId != null) {
+                    presenter.loadClerk(bedVO!!.customerId)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
 
             EventBus.getDefault().post(MessageEvent("updateTitle", Constant.EVENT_UPDATE_TITLE))
         }
     }
 
     override fun showClerkInfo(data: JsonObject) {
-        tv_nurse_name.text = data.get("clerk_name").asString
+        try {
+            tv_nurse_name.text = data.get("clerk_name").asString
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     override fun onError(message: String, type: Int) {

android_door/src/main/h10_3128/java/com/wdkl/app/ncs/callingdoor/helper/CallTypeDialogHelper.java

@@ -0,0 +1,54 @@
+package com.wdkl.app.ncs.callingdoor.helper;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+
+import com.wdkl.app.ncs.callingdoor.R;
+
+public class CallTypeDialogHelper {
+
+    private static AlertDialog alertDialog;
+
+    public static void showDialog(Activity activity, final ClickListener clickListener) {
+        if (alertDialog != null) {
+            alertDialog.dismiss();
+        }
+
+        View contentView = LayoutInflater.from(activity).inflate(R.layout.call_type_dialog, null);
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(contentView);
+        Button callNurse = contentView.findViewById(R.id.call_nurse);
+        Button callBed = contentView.findViewById(R.id.call_bed);
+
+        callNurse.setOnClickListener(v -> {
+            if (clickListener != null) {
+                clickListener.onCallNurse();
+            }
+            if (alertDialog != null) {
+                alertDialog.dismiss();
+            }
+        });
+
+        callBed.setOnClickListener(v -> {
+            if (clickListener != null) {
+                clickListener.onCallBed();
+            }
+            if (alertDialog != null) {
+                alertDialog.dismiss();
+            }
+        });
+
+        alertDialog = builder.create();
+        alertDialog.setCanceledOnTouchOutside(true);
+        alertDialog.setCancelable(true);
+        alertDialog.show();
+    }
+
+    public interface ClickListener{
+        void onCallNurse();
+        void onCallBed();
+    }
+}

android_door/src/main/h10_3128/res/drawable/shape_call_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF"/>
+    <corners
+        android:topLeftRadius="20dp"
+        android:topRightRadius="20dp"/>
+</shape>

android_door/src/main/h10_3128/res/layout/call_type_dialog.xml

@@ -0,0 +1,41 @@
+<?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:layout_width="400dp"
+        android:layout_height="320dp"
+        android:background="@drawable/shape_call_bg"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/call_nurse"
+            android:layout_width="300dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="30dp"
+            android:layout_marginBottom="20dp"
+            android:padding="10dp"
+            android:background="@drawable/shape_main_hos_txt_bg"
+            android:gravity="center"
+            android:text="呼叫主机"
+            android:textColor="@drawable/selector_bottom_btn_text_color"
+            android:textSize="24sp" />
+
+        <Button
+            android:id="@+id/call_bed"
+            android:layout_width="300dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"
+            android:padding="10dp"
+            android:background="@drawable/shape_main_hos_txt_bg"
+            android:gravity="center"
+            android:text="呼叫床位"
+            android:textColor="@drawable/selector_bottom_btn_text_color"
+            android:textSize="24sp" />
+    </LinearLayout>
+</LinearLayout>

android_door/src/main/h10_3128/res/layout/sky_voice_call_layout.xml

@@ -3,7 +3,7 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_deep">
+        android:background="@mipmap/call_bg">
         <!--全屏视频画面-->
         <FrameLayout
             android:id="@+id/fullscreen_video_frame"

android_door/src/main/h10_3128/res/layout/sky_voice_call_layout_rk3288.xml

@@ -3,7 +3,7 @@
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/gray_deep">
+        android:background="@mipmap/call_bg">
         <!--全屏视频画面-->
         <FrameLayout
             android:id="@+id/fullscreen_video_frame"

android_door/src/main/h10_3128/res/layout/yz_main_view_layout.xml

@@ -102,7 +102,7 @@
             android:id="@+id/img_nurse_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="60dp"
+            android:layout_marginTop="40dp"
             android:layout_centerHorizontal="true"
             android:src="@mipmap/ic_nurse_2"/>
 
@@ -110,7 +110,7 @@
             android:id="@+id/tv_nurse_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="10dp"
             android:layout_below="@id/img_nurse_icon"
             android:layout_centerHorizontal="true"
             android:text="责护"
@@ -126,6 +126,15 @@
             android:padding="10dp"
             android:text="V--"/>
 
+        <Button
+            android:id="@+id/btn_call"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_above="@+id/tv_version_no"
+            android:layout_marginBottom="10dp"
+            android:layout_centerHorizontal="true"
+            android:background="@mipmap/mom_call2" />
+
     </RelativeLayout>
 
 </LinearLayout>

resource/src/main/res/drawable/ic_call_out.xml

@@ -0,0 +1,5 @@
+<vector android:height="40dp" android:tint="#FFBDC3"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.01,15.38c-1.23,0 -2.42,-0.2 -3.53,-0.56 -0.35,-0.12 -0.74,-0.03 -1.01,0.24l-1.57,1.97c-2.83,-1.35 -5.48,-3.9 -6.89,-6.83l1.95,-1.66c0.27,-0.28 0.35,-0.67 0.24,-1.02 -0.37,-1.11 -0.56,-2.3 -0.56,-3.53 0,-0.54 -0.45,-0.99 -0.99,-0.99H4.19C3.65,3 3,3.24 3,3.99 3,13.28 10.73,21 20.01,21c0.71,0 0.99,-0.63 0.99,-1.18v-3.45c0,-0.54 -0.45,-0.99 -0.99,-0.99z"/>
+</vector>