From 992dd860d9802c7c8189add843639b7efacb0177 Mon Sep 17 00:00:00 2001
From: Raymond Yang <sdc957@gmail.com>
Date: Thu, 9 Mar 2023 18:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=9C=E4=B8=8AUI=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml   |  15 +-
 app/src/main/res/layout/item_video_view.xml |  11 +
 app/src/main/res/values/colors.xml          |  27 ++-
 app/src/main/res/values/strings.xml         | 219 +++++++++++++++++++-
 4 files changed, 266 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 90f1fab..a6f542c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,7 +23,6 @@
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:text="1"
         app:layout_constraintEnd_toStartOf="@+id/button2"
@@ -47,12 +46,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
         android:text="9"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/button4"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/button2"
         app:layout_constraintTop_toBottomOf="@+id/viewPager" />
 
+    <Button
+        android:id="@+id/button4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="16"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/button3"
+        app:layout_constraintTop_toBottomOf="@+id/viewPager" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_video_view.xml b/app/src/main/res/layout/item_video_view.xml
index 88c88e7..71ff508 100644
--- a/app/src/main/res/layout/item_video_view.xml
+++ b/app/src/main/res/layout/item_video_view.xml
@@ -57,4 +57,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/btnRetry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Retry"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/videoView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/videoView" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..b617e0d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,29 @@
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+    <color name="color_deep_blue">#1B223A</color>
+    <color name="color_light_grey">#F0F0F0</color>
+    <color name="color_grey">#837F7F</color>
+    <color name="color_grey_D3">#D3D3D3</color>
+    <color name="color_grey_70">#707070</color>
+    <color name="color_grey_70_aAB">#707070</color>
+    <color name="color_grey_91">#919191</color>
+    <color name="color_light_blue">#5AA9F4</color>
+    <color name="color_light_blue_a7F">#7F5AA9F4</color>
+    <color name="color_light_blue2">#5BAAF7</color>
+    <color name="color_light_blue3">#5CAAF7</color>
+    <color name="color_light_blue4">#2893FE</color>
+    <color name="color_light_blue5">#347CF9</color>
+    <color name="color_blue">#15457D</color>
+    <color name="color_blue2">#0F3D70</color>
+    <color name="color_darker_blue">#15192F</color>
+    <color name="color_darker_blue2">#1A2239</color>
+    <color name="color_darker_blue3">#1B243E</color>
+    <color name="color_deep_darker_blue">#22283A</color>
+    <color name="color_drawer_menu">#464E65E5</color>
+    <color name="color_very_light_blue">#FAFDFF</color>
+    <color name="color_black">#151A2C</color>
+    <color name="color_orange">#E6761E</color>
+    <color name="color_red">#C30337</color>
+    <color name="color_green">#117E14</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d133fc..4d98bda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,220 @@
 <resources>
-    <string name="app_name">gStreamer Split Video Test</string>
+    <string name="app_name" translatable="false">GStreamer Test</string>
+
+    <string name="drawer_open" translatable="false">open</string>
+    <string name="drawer_close" translatable="false">close</string>
+
+    <!--<editor-fold desc="contentDescription"> -->
+    <string name="text_desc_edit_device">修改設備及群組</string>
+    <string name="text_desc_fullscreen">全螢幕</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="編輯">-->
+    <string name="text_title_add_device">新增設備</string>
+    <string name="text_title_add_by_ip">IP輸入新增</string>
+    <string name="text_title_add_by_serial">序號新增</string>
+    <string name="text_title_add_by_scan">掃描新增</string>
+    <string name="text_title_edit_device">修改設備</string>
+    <string name="text_title_scan_device">雷達掃瞄清單</string>
+    <string name="text_title_scan_qr_code">掃描 QR Code</string>
+    <string name="text_title_select_group">選擇群組</string>
+    <string name="text_title_device_list">設備清單</string>
+    <string name="text_title_group_list">群組清單</string>
+    <string name="text_title_edit_group">修改群組</string>
+
+    <string name="text_label_ip_subtitle">請輸入設備IP位置</string>
+    <string name="text_label_serial_subtitle">請輸入設備序號</string>
+    <string name="text_label_edit_ip_title">修改設備IP位置</string>
+    <string name="text_label_ip_hint">請輸入IP位置</string>
+    <string name="text_label_serial_hint">請輸入序號</string>
+    <string name="text_label_scan_lan">雷達掃描設備</string>
+    <string name="text_label_scan_qr_code">掃描設備QRCODE</string>
+    <string name="text_label_device_name_hint">請輸入設備名稱</string>
+    <string name="text_label_account_hint">請輸入使用者帳號</string>
+    <string name="text_label_password_hint">請輸入使用者密碼</string>
+    <string name="text_label_port_num_hint">HTTP埠 [1~65535]</string>
+    <string name="text_label_rtsp_port_num_hint">RTSP埠 [1~65535]</string>
+    <string name="text_label_stream_hint_1">請輸入串流路徑1</string>
+    <string name="text_label_stream_hint_2">請輸入串流路徑2</string>
+    <string name="text_label_add_favorite">是否此攝影機加入我的最愛</string>
+    <string name="text_label_confirm_delete">確認刪除設備</string>
+    <string name="text_label_add_group">新增群組</string>
+    <string name="text_label_device_list">設備清單 ( %d )</string>
+    <string name="text_label_device_list2">設備清單</string>
+    <string name="text_label_group_list">顯示群組 ( %d )</string>
+    <string name="text_label_please_select_group">請選擇群組</string>
+    <string name="text_label_device_name">設備名稱</string>
+    <string name="text_label_device_name2">輸入設備名稱</string>
+    <string name="text_label_group_name">群組名稱</string>
+    <string name="text_label_group_name2">輸入群組名稱</string>
+
+    <string name="text_message_no_camera_permission">請允許相機權限</string>
+    <string name="text_message_ip_empty">IP位置不可空白</string>
+    <string name="text_message_http_port_empty">HTTP Port不可空白</string>
+    <string name="text_message_rtsp_port_empty">RTSP Port不可空白</string>
+    <string name="text_message_account_empty">帳號不可空白</string>
+    <string name="text_message_password_empty">密碼不可空白</string>
+    <string name="text_message_serial_empty">序號不可空白</string>
+    <string name="text_message_device_name_empty">設備名稱不可空白</string>
+    <string name="text_message_device_name_duplicated">設備名稱不可重複</string>
+    <string name="text_message_add_success">新增成功</string>
+    <string name="text_message_add_failure">新增失敗</string>
+    <string name="text_message_add_group_failure">新增群組失敗</string>
+    <string name="text_message_login_error">帳號或密碼不正確</string>
+    <string name="text_message_mac_duplicated">新增失敗，裝置重複新增</string>
+    <string name="text_message_connect_timeout">%s 連線逾時</string>
+    <string name="text_message_unable_connect_ip">無法連線至 %s 位址</string>
+    <string name="text_message_edit_success">修改成功</string>
+    <string name="text_message_edit_failure">修改失敗</string>
+    <string name="text_message_delete_success">刪除成功</string>
+    <string name="text_message_delete_failure">刪除失敗</string>
+    <string name="text_message_group_empty">群組名稱不可空白</string>
+    <string name="text_message_please_input_device_name">請輸入設備名稱</string>
+    <string name="text_message_please_input_group_name">請輸入群組名稱</string>
+    <string name="text_message_group_name_duplicated">群組名稱不可重複</string>
+    <string name="text_message_please_select_a_device">請選取一個設備</string>
+    <string name="text_message_please_select_a_group">請選取一個群組</string>
+    <string name="text_message_delete_device">刪除設備\n%s</string>
+    <string name="text_message_delete_group">刪除群組\n%s</string>
+    <string name="text_message_delete_group2">是否將 %s 從設備\n%s 中移除</string>
+    <string name="text_message_input_group_name">請輸入群組名稱</string>
+    <string name="text_message_duplicate_group_name">群組名稱重複</string>
+
+    <string name="text_button_add_device">新增設備</string>
+    <string name="text_button_refresh_list">更新裝置清單</string>
+    <string name="text_button_modify_device">修改設備</string>
+    <string name="text_button_change_device">變更設備</string>
+    <string name="text_button_delete_device">刪除設備</string>
+    <string name="text_button_confirm_delete">確認刪除</string>
+    <string name="text_button_modify_group">修改群組</string>
+    <string name="text_button_delete_group">刪除群組</string>
+    <string name="text_button_join_group">加入群組</string>
+    <string name="text_button_next">下一步</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="AboutDialog">-->
+    <string name="text_title_about">關於</string>
+    <string name="text_label_app_version">App Version: %s</string>
+    <string name="text_label_system_version">Android: %s</string>
+    <string name="text_button_terms_of_service">服務條款</string>
+    <string name="text_button_privacy">隱私權政策</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="AnnouncementDialog">-->
+    <string name="text_title_announcement">公告</string>
+    <string name="text_button_media_center">媒體中心</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="TechnicalSupportDialog">-->
+    <string name="text_title_technical_support">技術支援</string>
+    <string name="text_label_service_time">技術服務（周一~周五 10:00 - 17:00）</string>
+    <string name="text_label_telephone">專線：(03)365-3122 LINE ID：@hisharp</string>
+    <string name="text_label_email">業務服務信箱：sales@hisharp.com.tw</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="獨立監控">-->
+    <string name="text_title_independent_monitoring">獨立監控</string>
+    <string name="text_message_save_success">儲存成功</string>
+    <string name="text_message_no_storage_permission">請允許儲存權限</string>
+    <string name="text_button_save_snapshot">儲存快照</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="錄影回放">-->
+    <string name="text_title_playback">錄影回放</string>
+    <!--</editor-fold>-->
+
+    <!--<editor-fold desc="歡迎畫面">-->
+    <string name="text_label_skip_guide">跳過功能介紹</string>
+    <string name="text_button_skip">跳過</string>
+    <!--</editor-fold>-->
+
+    <string-array name="text_spinner_hour">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+    </string-array>
+
+    <string-array name="text_spinner_minute">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>24</item>
+        <item>25</item>
+        <item>26</item>
+        <item>27</item>
+        <item>28</item>
+        <item>29</item>
+        <item>30</item>
+        <item>31</item>
+        <item>32</item>
+        <item>33</item>
+        <item>34</item>
+        <item>35</item>
+        <item>36</item>
+        <item>37</item>
+        <item>38</item>
+        <item>39</item>
+        <item>40</item>
+        <item>41</item>
+        <item>42</item>
+        <item>43</item>
+        <item>44</item>
+        <item>45</item>
+        <item>46</item>
+        <item>47</item>
+        <item>48</item>
+        <item>49</item>
+        <item>50</item>
+        <item>51</item>
+        <item>52</item>
+        <item>53</item>
+        <item>54</item>
+        <item>55</item>
+        <item>56</item>
+        <item>57</item>
+        <item>58</item>
+        <item>59</item>
+    </string-array>
 </resources>
\ No newline at end of file