Merge pull request #3 from sergejey/master

Updates pull request
Galakart · Mar 16, 2015 · 537684a · 537684a
2 parents a568479 + 29d012c
commit 537684a
Show file tree

Hide file tree

Showing 17 changed files with 1,413 additions and 79 deletions.
diff --git a/.classpath b/.classpath
@@ -2,8 +2,12 @@
 <classpath>
  <classpathentry kind="src" path="src"/>
  <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
  <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES">
+ <accessrules>
+ <accessrule kind="nonaccessible" pattern="org/apache/http**"/>
+ </accessrules>
+ </classpathentry>
  <classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,49 +2,61 @@
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
  package="ru.galakart.majordroid"
  android:versionCode="4"
- android:versionName="1.3" >
+ android:versionName="1.4" >
 
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
  <uses-sdk
  android:minSdkVersion="8"
  android:targetSdkVersion="18" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="android.permission.RECORD_AUDIO"/>
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
- <uses-permission android:name="android.permission.CAMERA"/>
+
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.RECORD_AUDIO" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-feature android:name="android.hardware.camera" />
+ <uses-feature android:name="android.hardware.camera.autofocus" />
 
  <application
  android:allowBackup="true"
  android:icon="@drawable/ic_launcher"
  android:label="@string/app_name"
  android:theme="@android:style/Theme.Black.NoTitleBar" >
  <service android:name=".GpsTimerService" />
+
  <activity
- android:name="ru.galakart.majordroid.MainActivity"
- android:label="@string/app_name" 
- android:configChanges="keyboardHidden|orientation|screenSize" >
+ android:name=".MainActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:label="@string/app_name" >
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
 
  <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
  </activity>
  <activity
- android:name="ru.galakart.majordroid.ControsActivity"
+ android:name=".ControsActivity"
  android:label="@string/title_activity_contros" >
  </activity>
  <activity
- android:name="ru.galakart.majordroid.Prefs"
- android:label="@string/action_settings">
+ android:name=".Prefs"
+ android:label="@string/action_settings" >
  </activity>
  <activity
- android:name="ru.galakart.majordroid.AboutActivity"
+ android:name=".AboutActivity"
  android:label="@string/title_activity_about" >
  </activity>
+ <activity
+ android:name=".VideoRecordingActivity"
+ android:label="@string/title_activity_video_recording" >
+ </activity>
+ <activity
+ android:name=".VideoRecordActivity"
+ android:label="@string/title_activity_video_record" >
+ </activity>
  </application>
 
 </manifest>
diff --git a/MajorDroid.apk b/MajorDroid.apk
diff --git a/project.properties b/project.properties
@@ -12,3 +12,4 @@
 
 # Project target.
 target=android-16
+android.library.reference.1=../appcompat_v7
diff --git a/res/drawable-hdpi/ic_action_qr.png b/res/drawable-hdpi/ic_action_qr.png
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -38,6 +38,13 @@
  android:layout_height="wrap_content"
  android:onClick="imgb_pult_click"
  android:src="@drawable/ic_action_pult" />
+
+ <ImageView
+ android:id="@+id/imgb_qr"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="imgb_qr_click"
+ android:src="@drawable/ic_action_qr" /> 
 
  <ImageView
  android:id="@+id/imgb_settings"

diff --git a/res/layout/activity_video_record.xml b/res/layout/activity_video_record.xml
@@ -0,0 +1,39 @@
+<RelativeLayout xmlns:android="https://schemas.android.com/apk/res/android"
+ xmlns:tools="https://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="${relativePackage}.${activityClass}" >
+
+<SurfaceView
+ android:id="@+id/surface_camera"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
+<Button
+ android:id="@+id/buttonstart"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:text="@string/btnRecordStartTitle" />
+
+<Button
+ android:id="@+id/buttoncancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:text="@string/btnCancelTitle" />
+
+<TextView
+ android:id="@+id/txtTimer"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/buttonstart"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="6dp"
+ android:text="00:00" />
+
+
+</RelativeLayout>
diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -14,6 +14,11 @@
  android:id="@+id/action_settings"
  android:orderInCategory="100"
  android:showAsAction="never"
- android:title="@string/action_settings"/> 
+ android:title="@string/action_settings"/> 
+ <item
+ android:id="@+id/action_videorecord"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_videorecord"/> 
 
 </menu>
diff --git a/res/values-w820dp/dimens.xml b/res/values-w820dp/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+
+ <!--
+ Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+ -->
+ <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -23,10 +23,37 @@
  <string-array name="proximitylist">
  <item>Выкл</item>
  <item>Вкл</item>
+ </string-array>
+ <string-array name="cameraturn">
+ <item>0</item>
+ <item>90</item>
+ <item>270</item>
+ </string-array>
+ <string-array name="cameralist">
+ <item>0</item>
+ <item>1</item>
+ </string-array>
+ <string-array name="cameralist_titles">
+ <item>Основная</item>
+ <item>Дополнительная</item>
  </string-array> 
+ <string-array name="onofflist">
+ <item>off</item>
+ <item>on</item>
+ </string-array>
+ <string-array name="onofflist_titles">
+ <item>Выкл</item>
+ <item>Вкл</item>
+ </string-array> 
  <string-array name="voicelist">
  <item>проснись</item> 
  <item>умный дом</item> 
  <item>дом проснись</item>
- </string-array> 
+ </string-array>
+ <string-array name="qualitylist">
+ <item>Low</item> 
+ <item>High</item> 
+ <item>480P</item>
+ <item>720P</item> 
+ </string-array> 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -3,6 +3,7 @@
 
  <string name="app_name">MajorDroid</string>
  <string name="action_settings">Настройки</string>
+ <string name="action_videorecord">Видео-сообщение</string>
  <string name="action_quit">Выход</string>
  <string name="hello_world">Hello world!</string>
  <string name="title_activity_contros">Пульт управления</string>
@@ -23,13 +24,16 @@
  <string name="gps_switch">GPS-трекер</string>
  <string name="voice_switch">Голосовая активация</string>
  <string name="voice_phrase">Фраза активации</string>
- <string name="voice_proximity">Активация при приближении</string> 
+ <string name="voice_proximity">Активация при приближении</string>
  <string name="gps_period_title">Периодичность отправки координат (в мин.)</string>
  <string name="gps_period">Периодичность</string>
  <string name="path_homepage">Домашняя страница</string>
- <string name="path_scripts">Скрипты</string>
- <string name="path_voice">Голосовые команды</string>
- <string name="path_tracker">Трекер</string>
+ <string name="path_scripts">Обработчик скриптов</string>
+ <string name="path_voice">Обработчик голосовых команд</string>
+ <string name="path_tracker">Обработчик GPS</string>
+ <string name="path_qr">Обработчик QR-кодов</string>
+ <string name="path_video">Обработчик видео-сообщений</string>
+ <string name="path_face">Обработчик детектора лиц</string>
  <string name="scriptdialog">Название скрипта в MajorDomo:</string>
  <string name="script_summary">Задайте название скрипта</string>
  <string name="scriptname1">Скрипт 1</string>
@@ -43,9 +47,33 @@
  <string name="scriptname9">Скрипт 9</string>
  <string name="title_activity_about">О программе</string>
  <string name="title_btn_rate">Оценить в маркете</string>
- <string name="about_url">v1.3b https://smartliving.ru</string>
+ <string name="about_url">v1.4b https://smartliving.ru</string>
  <string name="about_donate">Приложение для управления сервером умного дома MajorDomo.\n\nЛицензия Beerware - каждый довольный пользователь может выпить пива в честь автора android-приложения, или поддержать материально:\nWebMoney: R052376421830</string>
- <string name="wifihomenet">Wifi домашняя сеть</string>
- <string name="hotword">проснись</string>
+ <string name="wifihomenet">Wifi домашняя сеть</string>
+ <string name="hotword">проснись</string>
+ <string name="title_activity_video_recording">VideoRecordingActivity</string>
+ <string name="title_activity_video_record">VideoRecordActivity</string>
+ <string name="btnRecordStartTitle">Начать запись</string>
+ <string name="btnRecordStopTitle">Закончить запись</string>
+ <string name="btnCancelTitle">Отменить запись</string>
+ <string name="qrcamera_switch">Камера для сканера штрих-кодов</string>
+ <string name="msgcamera_switch">Камера для видео-сообщений</string>
+ <string name="facecamera_switch">Камера для распознавания лиц</string>
+ <string name="turncamera_switch">Поворот камеры для видео-сообщений</string>
+ <string name="turnvideo_switch">Поворот видео</string>
+ <string name="quality_switch">Качество видео</string> 
+
+ <string name="maxlenght">Длительность сообщения, сек</string>
+ <string name="maxlenght_summary">Максимальная длительность видео-сообщения</string> 
+
+ <string name="maxsize">Размер сообщение, Мб</string>
+ <string name="maxsize_summary">Максимальный размер видео-сообщения</string> 
+
+ <string name="homeaftervideo">Обновление страницы</string>
+ <string name="homeaftervideo_summary">Переходить на домашнюю страницу после записи видео</string> 
+
+ <string name="facedetection">Распознавание лиц</string>
+ <string name="facedetection_summary">Сервис распознавания лица в кадре</string> 
+
 
 </resources>