2020-1-capstone-design1 / RIT_Project3

Go to a project
Toggle navigation Toggle navigation pinning
이수민
31a19b4b 1 parent 699b4832

최종보고서 수정

Expand all
Inline Side-by-side
Showing 86 changed files with 1273 additions and 1273 deletions
No preview for this file type
1 -*.iml 1 +*.iml
2 -.gradle 2 +.gradle
3 -/local.properties 3 +/local.properties
4 -/.idea/caches/build_file_checksums.ser 4 +/.idea/caches/build_file_checksums.ser
5 -/.idea/libraries 5 +/.idea/libraries
6 -/.idea/modules.xml 6 +/.idea/modules.xml
7 -/.idea/workspace.xml 7 +/.idea/workspace.xml
8 -.DS_Store 8 +.DS_Store
9 -/build 9 +/build
10 -/captures 10 +/captures
11 -.externalNativeBuild 11 +.externalNativeBuild
......
1 -<component name="ProjectCodeStyleConfiguration"> 1 +<component name="ProjectCodeStyleConfiguration">
2 - <code_scheme name="Project" version="173"> 2 + <code_scheme name="Project" version="173">
3 - <Objective-C-extensions> 3 + <Objective-C-extensions>
4 - <file> 4 + <file>
5 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> 5 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
6 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> 6 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
7 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> 7 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
8 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> 8 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
9 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> 9 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
10 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> 10 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
11 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> 11 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
12 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> 12 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
13 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> 13 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
14 - </file> 14 + </file>
15 - <class> 15 + <class>
16 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> 16 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
17 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> 17 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
18 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> 18 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
19 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> 19 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
20 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> 20 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
21 - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> 21 + <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
22 - </class> 22 + </class>
23 - <extensions> 23 + <extensions>
24 - <pair source="cpp" header="h" fileNamingConvention="NONE" /> 24 + <pair source="cpp" header="h" fileNamingConvention="NONE" />
25 - <pair source="c" header="h" fileNamingConvention="NONE" /> 25 + <pair source="c" header="h" fileNamingConvention="NONE" />
26 - </extensions> 26 + </extensions>
27 - </Objective-C-extensions> 27 + </Objective-C-extensions>
28 - </code_scheme> 28 + </code_scheme>
29 </component> 29 </component>
...\ No newline at end of file ...\ No newline at end of file
......
1 -apply plugin: 'com.android.application' 1 +apply plugin: 'com.android.application'
2 - 2 +
3 -android { 3 +android {
4 - compileSdkVersion 26 4 + compileSdkVersion 26
5 - defaultConfig { 5 + defaultConfig {
6 - applicationId "com.example.suemin.smartwindow" 6 + applicationId "com.example.suemin.smartwindow"
7 - minSdkVersion 24 7 + minSdkVersion 24
8 - targetSdkVersion 26 8 + targetSdkVersion 26
9 - versionCode 1 9 + versionCode 1
10 - versionName "1.0" 10 + versionName "1.0"
11 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" 11 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12 - } 12 + }
13 - buildTypes { 13 + buildTypes {
14 - release { 14 + release {
15 - minifyEnabled false 15 + minifyEnabled false
16 - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 16 + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17 - } 17 + }
18 - } 18 + }
19 -} 19 +}
20 - 20 +
21 -dependencies { 21 +dependencies {
22 - implementation fileTree(dir: 'libs', include: ['*.jar']) 22 + implementation fileTree(dir: 'libs', include: ['*.jar'])
23 - implementation 'com.android.support:appcompat-v7:26.+' 23 + implementation 'com.android.support:appcompat-v7:26.+'
24 - implementation 'com.android.support:design:26.+' 24 + implementation 'com.android.support:design:26.+'
25 - implementation 'com.android.support.constraint:constraint-layout:1.1.3' 25 + implementation 'com.android.support.constraint:constraint-layout:1.1.3'
26 - implementation 'com.android.support:support-v4:26.1.0' 26 + implementation 'com.android.support:support-v4:26.1.0'
27 - implementation 'com.android.support:recyclerview-v7:26.1.0' 27 + implementation 'com.android.support:recyclerview-v7:26.1.0'
28 - testImplementation 'junit:junit:4.12' 28 + testImplementation 'junit:junit:4.12'
29 - androidTestImplementation 'com.android.support.test:runner:1.0.2' 29 + androidTestImplementation 'com.android.support.test:runner:1.0.2'
30 - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' 30 + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
31 -} 31 +}
......
1 -# Add project specific ProGuard rules here. 1 +# Add project specific ProGuard rules here.
2 -# You can control the set of applied configuration files using the 2 +# You can control the set of applied configuration files using the
3 -# proguardFiles setting in build.gradle. 3 +# proguardFiles setting in build.gradle.
4 -# 4 +#
5 -# For more details, see 5 +# For more details, see
6 -# http://developer.android.com/guide/developing/tools/proguard.html 6 +# http://developer.android.com/guide/developing/tools/proguard.html
7 - 7 +
8 -# If your project uses WebView with JS, uncomment the following 8 +# If your project uses WebView with JS, uncomment the following
9 -# and specify the fully qualified class name to the JavaScript interface 9 +# and specify the fully qualified class name to the JavaScript interface
10 -# class: 10 +# class:
11 -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { 11 +#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12 -# public *; 12 +# public *;
13 -#} 13 +#}
14 - 14 +
15 -# Uncomment this to preserve the line number information for 15 +# Uncomment this to preserve the line number information for
16 -# debugging stack traces. 16 +# debugging stack traces.
17 -#-keepattributes SourceFile,LineNumberTable 17 +#-keepattributes SourceFile,LineNumberTable
18 - 18 +
19 -# If you keep the line number information, uncomment this to 19 +# If you keep the line number information, uncomment this to
20 -# hide the original source file name. 20 +# hide the original source file name.
21 -#-renamesourcefileattribute SourceFile 21 +#-renamesourcefileattribute SourceFile
......
1 -package com.example.suemin.smartwindow; 1 +package com.example.suemin.smartwindow;
2 - 2 +
3 -import android.content.Context; 3 +import android.content.Context;
4 -import android.support.test.InstrumentationRegistry; 4 +import android.support.test.InstrumentationRegistry;
5 -import android.support.test.runner.AndroidJUnit4; 5 +import android.support.test.runner.AndroidJUnit4;
6 - 6 +
7 -import org.junit.Test; 7 +import org.junit.Test;
8 -import org.junit.runner.RunWith; 8 +import org.junit.runner.RunWith;
9 - 9 +
10 -import static org.junit.Assert.*; 10 +import static org.junit.Assert.*;
11 - 11 +
12 -/** 12 +/**
13 - * Instrumented test, which will execute on an Android device. 13 + * Instrumented test, which will execute on an Android device.
14 - * 14 + *
15 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> 15 + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
16 - */ 16 + */
17 -@RunWith(AndroidJUnit4.class) 17 +@RunWith(AndroidJUnit4.class)
18 -public class ExampleInstrumentedTest { 18 +public class ExampleInstrumentedTest {
19 - @Test 19 + @Test
20 - public void useAppContext() { 20 + public void useAppContext() {
21 - // Context of the app under test. 21 + // Context of the app under test.
22 - Context appContext = InstrumentationRegistry.getTargetContext(); 22 + Context appContext = InstrumentationRegistry.getTargetContext();
23 - 23 +
24 - assertEquals("com.example.suemin.smartwindow", appContext.getPackageName()); 24 + assertEquals("com.example.suemin.smartwindow", appContext.getPackageName());
25 - } 25 + }
26 -} 26 +}
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 +<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 - package="com.example.suemin.smartwindow"> 3 + package="com.example.suemin.smartwindow">
4 - 4 +
5 - <uses-permission android:name="android.permission.INTERNET" /> 5 + <uses-permission android:name="android.permission.INTERNET" />
6 - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 6 + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
7 - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 7 + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
8 - <uses-permission android:name="android.permission.BLUETOOTH" /> 8 + <uses-permission android:name="android.permission.BLUETOOTH" />
9 - <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> 9 + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
10 - 10 +
11 - <uses-feature 11 + <uses-feature
12 - android:name="android.hardware.bluetooth_le" 12 + android:name="android.hardware.bluetooth_le"
13 - android:required="true" /> 13 + android:required="true" />
14 - 14 +
15 - <application 15 + <application
16 - android:allowBackup="true" 16 + android:allowBackup="true"
17 - android:icon="@mipmap/ic_launcher" 17 + android:icon="@mipmap/ic_launcher"
18 - android:label="@string/app_name" 18 + android:label="@string/app_name"
19 - android:roundIcon="@mipmap/ic_launcher_round" 19 + android:roundIcon="@mipmap/ic_launcher_round"
20 - android:supportsRtl="true" 20 + android:supportsRtl="true"
21 - android:theme="@style/AppTheme"> 21 + android:theme="@style/AppTheme">
22 - <activity 22 + <activity
23 - android:name="com.example.suemin.smartwindow.view.MainActivity" 23 + android:name="com.example.suemin.smartwindow.view.MainActivity"
24 - android:label="@string/app_name"> 24 + android:label="@string/app_name">
25 - <intent-filter> 25 + <intent-filter>
26 - <action android:name="android.intent.action.MAIN" /> 26 + <action android:name="android.intent.action.MAIN" />
27 - 27 +
28 - <category android:name="android.intent.category.LAUNCHER" /> 28 + <category android:name="android.intent.category.LAUNCHER" />
29 - </intent-filter> 29 + </intent-filter>
30 - </activity> 30 + </activity>
31 - <service android:name="com.example.suemin.smartwindow.view.bluetooth.BluetoothLeService"/> 31 + <service android:name="com.example.suemin.smartwindow.view.bluetooth.BluetoothLeService"/>
32 - </application> 32 + </application>
33 - 33 +
34 </manifest> 34 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 -# Created by .ignore support plugin (hsz.mobi) 1 +# Created by .ignore support plugin (hsz.mobi)
2 -### Android template 2 +### Android template
3 -# Built application files 3 +# Built application files
4 -*.apk 4 +*.apk
5 -*.ap_ 5 +*.ap_
6 -*.aab 6 +*.aab
7 - 7 +
8 -# Files for the ART/Dalvik VM 8 +# Files for the ART/Dalvik VM
9 -*.dex 9 +*.dex
10 - 10 +
11 -# Java class files 11 +# Java class files
12 -*.class 12 +*.class
13 - 13 +
14 -# Generated files 14 +# Generated files
15 -bin/ 15 +bin/
16 -gen/ 16 +gen/
17 -out/ 17 +out/
18 -release/ 18 +release/
19 - 19 +
20 -# Gradle files 20 +# Gradle files
21 -.gradle/ 21 +.gradle/
22 -build/ 22 +build/
23 - 23 +
24 -# Local configuration file (sdk path, etc) 24 +# Local configuration file (sdk path, etc)
25 -local.properties 25 +local.properties
26 - 26 +
27 -# Proguard folder generated by Eclipse 27 +# Proguard folder generated by Eclipse
28 -proguard/ 28 +proguard/
29 - 29 +
30 -# Log Files 30 +# Log Files
31 -*.log 31 +*.log
32 - 32 +
33 -# Android Studio Navigation editor temp files 33 +# Android Studio Navigation editor temp files
34 -.navigation/ 34 +.navigation/
35 - 35 +
36 -# Android Studio captures folder 36 +# Android Studio captures folder
37 -captures/ 37 +captures/
38 - 38 +
39 -# IntelliJ 39 +# IntelliJ
40 -*.iml 40 +*.iml
41 -.idea/workspace.xml 41 +.idea/workspace.xml
42 -.idea/tasks.xml 42 +.idea/tasks.xml
43 -.idea/gradle.xml 43 +.idea/gradle.xml
44 -.idea/assetWizardSettings.xml 44 +.idea/assetWizardSettings.xml
45 -.idea/dictionaries 45 +.idea/dictionaries
46 -.idea/libraries 46 +.idea/libraries
47 -# Android Studio 3 in .gitignore file. 47 +# Android Studio 3 in .gitignore file.
48 -.idea/caches 48 +.idea/caches
49 -.idea/modules.xml 49 +.idea/modules.xml
50 -# Comment next line if keeping position of elements in Navigation Editor is relevant for you 50 +# Comment next line if keeping position of elements in Navigation Editor is relevant for you
51 -.idea/navEditor.xml 51 +.idea/navEditor.xml
52 - 52 +
53 -# Keystore files 53 +# Keystore files
54 -# Uncomment the following lines if you do not want to check your keystore files in. 54 +# Uncomment the following lines if you do not want to check your keystore files in.
55 -#*.jks 55 +#*.jks
56 -#*.keystore 56 +#*.keystore
57 - 57 +
58 -# External native build folder generated in Android Studio 2.2 and later 58 +# External native build folder generated in Android Studio 2.2 and later
59 -.externalNativeBuild 59 +.externalNativeBuild
60 - 60 +
61 -# Google Services (e.g. APIs or Firebase) 61 +# Google Services (e.g. APIs or Firebase)
62 -# google-services.json 62 +# google-services.json
63 - 63 +
64 -# Freeline 64 +# Freeline
65 -freeline.py 65 +freeline.py
66 -freeline/ 66 +freeline/
67 -freeline_project_description.json 67 +freeline_project_description.json
68 - 68 +
69 -# fastlane 69 +# fastlane
70 -fastlane/report.xml 70 +fastlane/report.xml
71 -fastlane/Preview.html 71 +fastlane/Preview.html
72 -fastlane/screenshots 72 +fastlane/screenshots
73 -fastlane/test_output 73 +fastlane/test_output
74 -fastlane/readme.md 74 +fastlane/readme.md
75 - 75 +
76 -# Version control 76 +# Version control
77 -vcs.xml 77 +vcs.xml
78 - 78 +
79 -# lint 79 +# lint
80 -lint/intermediates/ 80 +lint/intermediates/
81 -lint/generated/ 81 +lint/generated/
82 -lint/outputs/ 82 +lint/outputs/
83 -lint/tmp/ 83 +lint/tmp/
84 -# lint/reports/ 84 +# lint/reports/
85 - 85 +
......
1 -package com.example.suemin.smartwindow.view.bluetooth; 1 +package com.example.suemin.smartwindow.view.bluetooth;
2 - 2 +
3 -import java.util.HashMap; 3 +import java.util.HashMap;
4 - 4 +
5 -/** 5 +/**
6 - * This class includes a small subset of standard GATT attributes for demonstration purposes. 6 + * This class includes a small subset of standard GATT attributes for demonstration purposes.
7 - */ 7 + */
8 -public class SampleAttributes { 8 +public class SampleAttributes {
9 - private static HashMap<String, String> attributes = new HashMap(); 9 + private static HashMap<String, String> attributes = new HashMap();
10 - public static String HM_10 = "0000ffe1-0000-1000-8000-00805f9b34fb"; 10 + public static String HM_10 = "0000ffe1-0000-1000-8000-00805f9b34fb";
11 - public static String CLIENT_CHARACTERISTIC_CONFIG = "00002902-0000-1000-8000-00805f9b34fb"; 11 + public static String CLIENT_CHARACTERISTIC_CONFIG = "00002902-0000-1000-8000-00805f9b34fb";
12 - 12 +
13 - static { 13 + static {
14 - // Sample Services. 14 + // Sample Services.
15 - attributes.put("0000ffe0-0000-1000-8000-00805f9b34fb", "HM-10 Service"); 15 + attributes.put("0000ffe0-0000-1000-8000-00805f9b34fb", "HM-10 Service");
16 - attributes.put("0000180a-0000-1000-8000-00805f9b34fb", "Device Information Service"); 16 + attributes.put("0000180a-0000-1000-8000-00805f9b34fb", "Device Information Service");
17 - // Sample Characteristics. 17 + // Sample Characteristics.
18 - attributes.put(HM_10, "HM-10 Module"); 18 + attributes.put(HM_10, "HM-10 Module");
19 - attributes.put("00002a29-0000-1000-8000-00805f9b34fb", "Manufacturer Name String"); 19 + attributes.put("00002a29-0000-1000-8000-00805f9b34fb", "Manufacturer Name String");
20 - } 20 + }
21 - 21 +
22 - public static String lookup(String uuid, String defaultName) { 22 + public static String lookup(String uuid, String defaultName) {
23 - String name = attributes.get(uuid); 23 + String name = attributes.get(uuid);
24 - return name == null ? defaultName : name; 24 + return name == null ? defaultName : name;
25 - } 25 + }
26 } 26 }
...\ No newline at end of file ...\ No newline at end of file
......
1 -package com.example.suemin.smartwindow.view.environment.listview; 1 +package com.example.suemin.smartwindow.view.environment.listview;
2 - 2 +
3 -import android.app.Dialog; 3 +import android.app.Dialog;
4 -import android.content.Context; 4 +import android.content.Context;
5 -import android.os.Bundle; 5 +import android.os.Bundle;
6 -import android.support.annotation.NonNull; 6 +import android.support.annotation.NonNull;
7 -import android.view.View; 7 +import android.view.View;
8 -import android.view.WindowManager; 8 +import android.view.WindowManager;
9 -import android.widget.Button; 9 +import android.widget.Button;
10 -import android.widget.TextView; 10 +import android.widget.TextView;
11 - 11 +
12 -import com.example.suemin.smartwindow.R; 12 +import com.example.suemin.smartwindow.R;
13 -import com.example.suemin.smartwindow.view.bluetooth.SensorResult; 13 +import com.example.suemin.smartwindow.view.bluetooth.SensorResult;
14 - 14 +
15 -public class CustomDialog extends Dialog { 15 +public class CustomDialog extends Dialog {
16 - 16 +
17 - private Button mPositiveButton; 17 + private Button mPositiveButton;
18 - 18 +
19 - private View.OnClickListener mPositiveListener; 19 + private View.OnClickListener mPositiveListener;
20 - private TextView AlertTitle, AlertNum, AlertState; 20 + private TextView AlertTitle, AlertNum, AlertState;
21 - 21 +
22 - @Override 22 + @Override
23 - protected void onCreate(Bundle savedInstanceState) { 23 + protected void onCreate(Bundle savedInstanceState) {
24 - super.onCreate(savedInstanceState); 24 + super.onCreate(savedInstanceState);
25 - 25 +
26 - WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(); 26 + WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
27 - layoutParams.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND; 27 + layoutParams.flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND;
28 - layoutParams.dimAmount = 0.8f; 28 + layoutParams.dimAmount = 0.8f;
29 - 29 +
30 - getWindow().setAttributes(layoutParams); 30 + getWindow().setAttributes(layoutParams);
31 - 31 +
32 - setContentView(R.layout.custom_dialog); 32 + setContentView(R.layout.custom_dialog);
33 - 33 +
34 - mPositiveButton=(Button)findViewById(R.id.pbutton); 34 + mPositiveButton=(Button)findViewById(R.id.pbutton);
35 - 35 +
36 - mPositiveButton.setOnClickListener(mPositiveListener); 36 + mPositiveButton.setOnClickListener(mPositiveListener);
37 - 37 +
38 - AlertTitle = (TextView) findViewById(R.id.dialog_title); 38 + AlertTitle = (TextView) findViewById(R.id.dialog_title);
39 - AlertNum = (TextView) findViewById(R.id.dialog_num); 39 + AlertNum = (TextView) findViewById(R.id.dialog_num);
40 - AlertState= (TextView) findViewById(R.id.dialog_state); 40 + AlertState= (TextView) findViewById(R.id.dialog_state);
41 - } 41 + }
42 - 42 +
43 - public CustomDialog(@NonNull Context context, View.OnClickListener positiveListener) { 43 + public CustomDialog(@NonNull Context context, View.OnClickListener positiveListener) {
44 - super(context); 44 + super(context);
45 - this.mPositiveListener = positiveListener; 45 + this.mPositiveListener = positiveListener;
46 - } 46 + }
47 - public boolean setText(int position) 47 + public boolean setText(int position)
48 - { 48 + {
49 - switch (position) { 49 + switch (position) {
50 - case 0: 50 + case 0:
51 - AlertTitle.setText("현재 비"); 51 + AlertTitle.setText("현재 비");
52 - AlertNum.setText(SensorResult.getRainResult()); 52 + AlertNum.setText(SensorResult.getRainResult());
53 - break; 53 + break;
54 - case 1: 54 + case 1:
55 - AlertTitle.setText("현재 실외 미세먼지"); 55 + AlertTitle.setText("현재 실외 미세먼지");
56 - AlertNum.setText(Finedust.getFineDustResult()+""); 56 + AlertNum.setText(Finedust.getFineDustResult()+"");
57 - AlertState.setText("상태 : "+ SensorResult.getOuterFineDustState()); 57 + AlertState.setText("상태 : "+ SensorResult.getOuterFineDustState());
58 - break; 58 + break;
59 - case 2: 59 + case 2:
60 - AlertTitle.setText("현재 실내 미세먼지"); 60 + AlertTitle.setText("현재 실내 미세먼지");
61 - AlertNum.setText("51"); 61 + AlertNum.setText("51");
62 - AlertState.setText("상태 : " + SensorResult.getInnerFineDustState()); 62 + AlertState.setText("상태 : " + SensorResult.getInnerFineDustState());
63 - break; 63 + break;
64 - case 3: 64 + case 3:
65 - AlertTitle.setText("현재 실내 온도"); 65 + AlertTitle.setText("현재 실내 온도");
66 - AlertNum.setText(SensorResult.getTemperatureResult() + "℃"); 66 + AlertNum.setText(SensorResult.getTemperatureResult() + "℃");
67 - AlertState.setText("상태 : " + SensorResult.getTemperatureState()); 67 + AlertState.setText("상태 : " + SensorResult.getTemperatureState());
68 - break; 68 + break;
69 - case 4: 69 + case 4:
70 - AlertTitle.setText("현재 실내 습도"); 70 + AlertTitle.setText("현재 실내 습도");
71 - AlertNum.setText(SensorResult.getHumidResult()+ "%"); 71 + AlertNum.setText(SensorResult.getHumidResult()+ "%");
72 - AlertState.setText("상태 : " + SensorResult.getHumidState()); 72 + AlertState.setText("상태 : " + SensorResult.getHumidState());
73 - break; 73 + break;
74 - case 5: 74 + case 5:
75 - AlertTitle.setText("현재 침입자"); 75 + AlertTitle.setText("현재 침입자");
76 - AlertNum.setText(SensorResult.getIntruderResult()); 76 + AlertNum.setText(SensorResult.getIntruderResult());
77 - break; 77 + break;
78 - } 78 + }
79 - return true; 79 + return true;
80 - } 80 + }
81 - 81 +
82 -} 82 +}
83 - 83 +
......
1 -package com.example.suemin.smartwindow.view.environment.listview; 1 +package com.example.suemin.smartwindow.view.environment.listview;
2 - 2 +
3 -import android.os.StrictMode; 3 +import android.os.StrictMode;
4 - 4 +
5 -import com.example.suemin.smartwindow.view.environment.Env; 5 +import com.example.suemin.smartwindow.view.environment.Env;
6 - 6 +
7 -import org.xmlpull.v1.XmlPullParser; 7 +import org.xmlpull.v1.XmlPullParser;
8 -import org.xmlpull.v1.XmlPullParserException; 8 +import org.xmlpull.v1.XmlPullParserException;
9 -import org.xmlpull.v1.XmlPullParserFactory; 9 +import org.xmlpull.v1.XmlPullParserFactory;
10 - 10 +
11 -import java.io.IOException; 11 +import java.io.IOException;
12 -import java.net.MalformedURLException; 12 +import java.net.MalformedURLException;
13 -import java.net.URL; 13 +import java.net.URL;
14 - 14 +
15 -public class Finedust { 15 +public class Finedust {
16 - 16 +
17 - public static String getFineDustResult(){ 17 + public static String getFineDustResult(){
18 - String Key = "rqkQD0pLMXekuhOonOeI0xpbtEMtgBjTtMD5DZRWhDwQCezQGQsJ8bhg76N8YuihCKhY76QEWgsaZifSyupTDQ%3D%3D"; 18 + String Key = "rqkQD0pLMXekuhOonOeI0xpbtEMtgBjTtMD5DZRWhDwQCezQGQsJ8bhg76N8YuihCKhY76QEWgsaZifSyupTDQ%3D%3D";
19 - StrictMode.enableDefaults(); 19 + StrictMode.enableDefaults();
20 - String currentLocation = Env.subaddr2; 20 + String currentLocation = Env.subaddr2;
21 - boolean inPm10Value = false; 21 + boolean inPm10Value = false;
22 - String pm10Value = null; 22 + String pm10Value = null;
23 - try{ 23 + try{
24 - URL url = new URL("http://openapi.airkorea.or.kr/openapi/services/rest/ArpltnInforInqireSvc/getMsrstnAcctoRltmMesureDnsty?numOfRows=1&pageNo=1&stationName=" 24 + URL url = new URL("http://openapi.airkorea.or.kr/openapi/services/rest/ArpltnInforInqireSvc/getMsrstnAcctoRltmMesureDnsty?numOfRows=1&pageNo=1&stationName="
25 - + currentLocation +"&dataTerm=DAILY&ver=1.3&ServiceKey="+Key); 25 + + currentLocation +"&dataTerm=DAILY&ver=1.3&ServiceKey="+Key);
26 - XmlPullParserFactory parserCreator = XmlPullParserFactory.newInstance(); 26 + XmlPullParserFactory parserCreator = XmlPullParserFactory.newInstance();
27 - XmlPullParser parser = parserCreator.newPullParser(); 27 + XmlPullParser parser = parserCreator.newPullParser();
28 - parser.setInput(url.openStream(),null); 28 + parser.setInput(url.openStream(),null);
29 - int parserEvent = parser.getEventType(); 29 + int parserEvent = parser.getEventType();
30 - while(parserEvent != XmlPullParser.END_DOCUMENT){ 30 + while(parserEvent != XmlPullParser.END_DOCUMENT){
31 - switch(parserEvent){ 31 + switch(parserEvent){
32 - case XmlPullParser.START_TAG: 32 + case XmlPullParser.START_TAG:
33 - if(parser.getName().equals("pm10Value")){ 33 + if(parser.getName().equals("pm10Value")){
34 - inPm10Value= true; 34 + inPm10Value= true;
35 - } 35 + }
36 - break; 36 + break;
37 - case XmlPullParser.TEXT: 37 + case XmlPullParser.TEXT:
38 - if(inPm10Value){ 38 + if(inPm10Value){
39 - pm10Value = parser.getText(); 39 + pm10Value = parser.getText();
40 - inPm10Value = false; 40 + inPm10Value = false;
41 - } 41 + }
42 - break; 42 + break;
43 - case XmlPullParser.END_TAG: 43 + case XmlPullParser.END_TAG:
44 - if(parser.getName().equals("item")){ 44 + if(parser.getName().equals("item")){
45 - } 45 + }
46 - break; 46 + break;
47 - } 47 + }
48 - parserEvent= parser.next(); 48 + parserEvent= parser.next();
49 - 49 +
50 - } 50 + }
51 - } catch (XmlPullParserException e) { 51 + } catch (XmlPullParserException e) {
52 - e.printStackTrace(); 52 + e.printStackTrace();
53 - } catch (MalformedURLException e) { 53 + } catch (MalformedURLException e) {
54 - e.printStackTrace(); 54 + e.printStackTrace();
55 - } catch (IOException e) { 55 + } catch (IOException e) {
56 - e.printStackTrace(); 56 + e.printStackTrace();
57 - } 57 + }
58 - return pm10Value; 58 + return pm10Value;
59 - } 59 + }
60 -} 60 +}
......
1 -package com.example.suemin.smartwindow.view.environment.listview; 1 +package com.example.suemin.smartwindow.view.environment.listview;
2 - 2 +
3 -import android.content.Context; 3 +import android.content.Context;
4 -import android.graphics.drawable.Drawable; 4 +import android.graphics.drawable.Drawable;
5 -import android.view.LayoutInflater; 5 +import android.view.LayoutInflater;
6 -import android.view.View; 6 +import android.view.View;
7 -import android.view.ViewGroup; 7 +import android.view.ViewGroup;
8 -import android.widget.BaseAdapter; 8 +import android.widget.BaseAdapter;
9 -import android.widget.ImageView; 9 +import android.widget.ImageView;
10 -import android.widget.TextView; 10 +import android.widget.TextView;
11 - 11 +
12 -import com.example.suemin.smartwindow.R; 12 +import com.example.suemin.smartwindow.R;
13 - 13 +
14 -import java.util.ArrayList; 14 +import java.util.ArrayList;
15 - 15 +
16 -public class ListViewAdapter extends BaseAdapter { 16 +public class ListViewAdapter extends BaseAdapter {
17 - 17 +
18 - private ArrayList<ListViewItem> listViewItemList= new ArrayList<ListViewItem>(); 18 + private ArrayList<ListViewItem> listViewItemList= new ArrayList<ListViewItem>();
19 - 19 +
20 - public ListViewAdapter(){} 20 + public ListViewAdapter(){}
21 - 21 +
22 - @Override 22 + @Override
23 - public int getCount() { 23 + public int getCount() {
24 - return listViewItemList.size(); 24 + return listViewItemList.size();
25 - } 25 + }
26 - 26 +
27 - @Override 27 + @Override
28 - public Object getItem(int position) { 28 + public Object getItem(int position) {
29 - return listViewItemList.get(position); 29 + return listViewItemList.get(position);
30 - } 30 + }
31 - 31 +
32 - @Override 32 + @Override
33 - public long getItemId(int position) { 33 + public long getItemId(int position) {
34 - return position; 34 + return position;
35 - } 35 + }
36 - 36 +
37 - @Override 37 + @Override
38 - public View getView(int position, View convertView, ViewGroup parent) { 38 + public View getView(int position, View convertView, ViewGroup parent) {
39 - final int pos = position; 39 + final int pos = position;
40 - final Context context = parent.getContext(); 40 + final Context context = parent.getContext();
41 - 41 +
42 - if(convertView == null){ 42 + if(convertView == null){
43 - LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); 43 + LayoutInflater inflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
44 - convertView = inflater.inflate(R.layout.listview_item, parent, false); 44 + convertView = inflater.inflate(R.layout.listview_item, parent, false);
45 - } 45 + }
46 - 46 +
47 - TextView titleTextView = (TextView) convertView.findViewById(R.id.textView1); 47 + TextView titleTextView = (TextView) convertView.findViewById(R.id.textView1);
48 - ImageView iconImageView = (ImageView) convertView.findViewById(R.id.imageView1); 48 + ImageView iconImageView = (ImageView) convertView.findViewById(R.id.imageView1);
49 - 49 +
50 - ListViewItem listViewItem = listViewItemList.get(position); 50 + ListViewItem listViewItem = listViewItemList.get(position);
51 - 51 +
52 - titleTextView.setText(listViewItem.getTitle()); 52 + titleTextView.setText(listViewItem.getTitle());
53 - iconImageView.setImageDrawable(listViewItem.getIcon()); 53 + iconImageView.setImageDrawable(listViewItem.getIcon());
54 - 54 +
55 - return convertView; 55 + return convertView;
56 - } 56 + }
57 - public void addItem(String title, Drawable icon){ 57 + public void addItem(String title, Drawable icon){
58 - ListViewItem item = new ListViewItem(); 58 + ListViewItem item = new ListViewItem();
59 - item.setTitle(title); 59 + item.setTitle(title);
60 - item.setIcon(icon); 60 + item.setIcon(icon);
61 - listViewItemList.add(item); 61 + listViewItemList.add(item);
62 - } 62 + }
63 -} 63 +}
......
1 -package com.example.suemin.smartwindow.view.environment.listview; 1 +package com.example.suemin.smartwindow.view.environment.listview;
2 - 2 +
3 -import android.graphics.drawable.Drawable; 3 +import android.graphics.drawable.Drawable;
4 - 4 +
5 -public class ListViewItem { 5 +public class ListViewItem {
6 - private String titleStr ; 6 + private String titleStr ;
7 - private Drawable iconDrawable ; 7 + private Drawable iconDrawable ;
8 - 8 +
9 - public void setIcon(Drawable icon) { 9 + public void setIcon(Drawable icon) {
10 - iconDrawable = icon ; 10 + iconDrawable = icon ;
11 - } 11 + }
12 - public void setTitle(String title) { 12 + public void setTitle(String title) {
13 - titleStr = title ; 13 + titleStr = title ;
14 - } 14 + }
15 - 15 +
16 - public Drawable getIcon() { 16 + public Drawable getIcon() {
17 - return this.iconDrawable ; 17 + return this.iconDrawable ;
18 - } 18 + }
19 - public String getTitle() { 19 + public String getTitle() {
20 - return this.titleStr ; 20 + return this.titleStr ;
21 - } 21 + }
22 -} 22 +}
......
1 -package com.example.suemin.smartwindow.view.home; 1 +package com.example.suemin.smartwindow.view.home;
2 - 2 +
3 - 3 +
4 -import android.content.Context; 4 +import android.content.Context;
5 -import android.os.Bundle; 5 +import android.os.Bundle;
6 -import android.support.v4.app.Fragment; 6 +import android.support.v4.app.Fragment;
7 -import android.view.LayoutInflater; 7 +import android.view.LayoutInflater;
8 -import android.view.View; 8 +import android.view.View;
9 -import android.view.ViewGroup; 9 +import android.view.ViewGroup;
10 -import android.widget.CompoundButton; 10 +import android.widget.CompoundButton;
11 -import android.widget.ImageView; 11 +import android.widget.ImageView;
12 -import android.widget.Switch; 12 +import android.widget.Switch;
13 -import android.widget.TextView; 13 +import android.widget.TextView;
14 - 14 +
15 -import com.example.suemin.smartwindow.R; 15 +import com.example.suemin.smartwindow.R;
16 - 16 +
17 -import static com.example.suemin.smartwindow.view.bluetooth.Bluetooth.WindowState; 17 +import static com.example.suemin.smartwindow.view.bluetooth.Bluetooth.WindowState;
18 -import static com.example.suemin.smartwindow.view.bluetooth.Bluetooth.setWindowState; 18 +import static com.example.suemin.smartwindow.view.bluetooth.Bluetooth.setWindowState;
19 - 19 +
20 - 20 +
21 - 21 +
22 -public class Home extends Fragment { 22 +public class Home extends Fragment {
23 - 23 +
24 - 24 +
25 - int num = 0; 25 + int num = 0;
26 - 26 +
27 - public Home() { 27 + public Home() {
28 - // Required empty public constructor 28 + // Required empty public constructor
29 - } 29 + }
30 - 30 +
31 - @Override 31 + @Override
32 - public void onCreate(Bundle savedInstanceState) { 32 + public void onCreate(Bundle savedInstanceState) {
33 - super.onCreate(savedInstanceState); 33 + super.onCreate(savedInstanceState);
34 - 34 +
35 - } 35 + }
36 - @Override 36 + @Override
37 - public View onCreateView(LayoutInflater inflater, ViewGroup container, 37 + public View onCreateView(LayoutInflater inflater, ViewGroup container,
38 - Bundle savedInstanceState) { 38 + Bundle savedInstanceState) {
39 - View view = inflater.inflate(R.layout.fragment_home, container, false); 39 + View view = inflater.inflate(R.layout.fragment_home, container, false);
40 - final TextView optionState= (TextView) view.findViewById(R.id.textView_switch); 40 + final TextView optionState= (TextView) view.findViewById(R.id.textView_switch);
41 - final ImageView imgState = (ImageView) view.findViewById(R.id.imageView2); 41 + final ImageView imgState = (ImageView) view.findViewById(R.id.imageView2);
42 - Switch sw = (Switch) view.findViewById(R.id.switch1); 42 + Switch sw = (Switch) view.findViewById(R.id.switch1);
43 - sw.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { 43 + sw.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
44 - @Override 44 + @Override
45 - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { 45 + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
46 - if(isChecked) { 46 + if(isChecked) {
47 - optionState.setText("“ 열림 ”"); 47 + optionState.setText("“ 열림 ”");
48 - imgState.setImageResource(R.drawable.window_open); 48 + imgState.setImageResource(R.drawable.window_open);
49 - if (!WindowState) { 49 + if (!WindowState) {
50 - setWindowState("n", getString(R.string.addr_m)); 50 + setWindowState("n", getString(R.string.addr_m));
51 - } 51 + }
52 - } 52 + }
53 - else{ 53 + else{
54 - num = num+1; 54 + num = num+1;
55 - optionState.setText("“ 닫힘 ”"); 55 + optionState.setText("“ 닫힘 ”");
56 - imgState.setImageResource(R.drawable.window_closed); 56 + imgState.setImageResource(R.drawable.window_closed);
57 - if(WindowState) {setWindowState("y", getString(R.string.addr_m)); 57 + if(WindowState) {setWindowState("y", getString(R.string.addr_m));
58 - } 58 + }
59 - } 59 + }
60 - } 60 + }
61 - }); 61 + });
62 - return view; 62 + return view;
63 - } 63 + }
64 - 64 +
65 - 65 +
66 - 66 +
67 - @Override 67 + @Override
68 - public void onAttach(Context context) { 68 + public void onAttach(Context context) {
69 - super.onAttach(context); 69 + super.onAttach(context);
70 - } 70 + }
71 - 71 +
72 - @Override 72 + @Override
73 - public void onDetach() { 73 + public void onDetach() {
74 - super.onDetach(); 74 + super.onDetach();
75 - } 75 + }
76 - 76 +
77 -} 77 +}
......
1 -<vector xmlns:android="http://schemas.android.com/apk/res/android" 1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
2 - xmlns:aapt="http://schemas.android.com/aapt" 2 + xmlns:aapt="http://schemas.android.com/aapt"
3 - android:width="108dp" 3 + android:width="108dp"
4 - android:height="108dp" 4 + android:height="108dp"
5 - android:viewportWidth="108" 5 + android:viewportWidth="108"
6 - android:viewportHeight="108"> 6 + android:viewportHeight="108">
7 - <path 7 + <path
8 - android:fillType="evenOdd" 8 + android:fillType="evenOdd"
9 - android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" 9 + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10 - android:strokeWidth="1" 10 + android:strokeWidth="1"
11 - android:strokeColor="#00000000"> 11 + android:strokeColor="#00000000">
12 - <aapt:attr name="android:fillColor"> 12 + <aapt:attr name="android:fillColor">
13 - <gradient 13 + <gradient
14 - android:endX="78.5885" 14 + android:endX="78.5885"
15 - android:endY="90.9159" 15 + android:endY="90.9159"
16 - android:startX="48.7653" 16 + android:startX="48.7653"
17 - android:startY="61.0927" 17 + android:startY="61.0927"
18 - android:type="linear"> 18 + android:type="linear">
19 - <item 19 + <item
20 - android:color="#44000000" 20 + android:color="#44000000"
21 - android:offset="0.0" /> 21 + android:offset="0.0" />
22 - <item 22 + <item
23 - android:color="#00000000" 23 + android:color="#00000000"
24 - android:offset="1.0" /> 24 + android:offset="1.0" />
25 - </gradient> 25 + </gradient>
26 - </aapt:attr> 26 + </aapt:attr>
27 - </path> 27 + </path>
28 - <path 28 + <path
29 - android:fillColor="#FFFFFF" 29 + android:fillColor="#FFFFFF"
30 - android:fillType="nonZero" 30 + android:fillType="nonZero"
31 - android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" 31 + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32 - android:strokeWidth="1" 32 + android:strokeWidth="1"
33 - android:strokeColor="#00000000" /> 33 + android:strokeColor="#00000000" />
34 -</vector> 34 +</vector>
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<shape xmlns:android="http://schemas.android.com/apk/res/android" 2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:padding="10dp" 3 + android:padding="10dp"
4 - android:shape="rectangle" > 4 + android:shape="rectangle" >
5 - <solid android:color="@color/colorPrimary" /> 5 + <solid android:color="@color/colorPrimary" />
6 - <gradient 6 + <gradient
7 - android:startColor="@color/colorPrimary" 7 + android:startColor="@color/colorPrimary"
8 - android:endColor="#FFFFFF" 8 + android:endColor="#FFFFFF"
9 - android:angle= "270"> 9 + android:angle= "270">
10 - </gradient> 10 + </gradient>
11 </shape> 11 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<shape xmlns:android="http://schemas.android.com/apk/res/android" 2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:padding="10dp" 3 + android:padding="10dp"
4 - android:shape="rectangle" 4 + android:shape="rectangle"
5 - > 5 + >
6 - <solid android:color="#FFFFFF"></solid> 6 + <solid android:color="#FFFFFF"></solid>
7 - <corners 7 + <corners
8 - android:bottomLeftRadius="30dp" 8 + android:bottomLeftRadius="30dp"
9 - android:bottomRightRadius="30dp" 9 + android:bottomRightRadius="30dp"
10 - android:topLeftRadius="30dp" 10 + android:topLeftRadius="30dp"
11 - android:topRightRadius="30dp" /> 11 + android:topRightRadius="30dp" />
12 - <stroke 12 + <stroke
13 - android:width="2dp" 13 + android:width="2dp"
14 - android:color="@color/colorPrimaryDark" /> 14 + android:color="@color/colorPrimaryDark" />
15 </shape> 15 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<shape xmlns:android="http://schemas.android.com/apk/res/android" 2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:padding="10dp" 3 + android:padding="10dp"
4 - android:shape="rectangle" > 4 + android:shape="rectangle" >
5 - <solid android:color="@color/colorPrimaryDark" /> 5 + <solid android:color="@color/colorPrimaryDark" />
6 - <corners 6 + <corners
7 - android:bottomLeftRadius="20dp" 7 + android:bottomLeftRadius="20dp"
8 - android:bottomRightRadius="20dp" 8 + android:bottomRightRadius="20dp"
9 - android:topLeftRadius="20dp" 9 + android:topLeftRadius="20dp"
10 - android:topRightRadius="20dp" /> 10 + android:topRightRadius="20dp" />
11 - <stroke 11 + <stroke
12 - android:width="1dp" 12 + android:width="1dp"
13 - android:color="@color/colorPrimaryDark" /> 13 + android:color="@color/colorPrimaryDark" />
14 </shape> 14 </shape>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<font-family xmlns:android="http://schemas.android.com/apk/res/android"> 2 +<font-family xmlns:android="http://schemas.android.com/apk/res/android">
3 - <font 3 + <font
4 - android:fontStyle = "normal" 4 + android:fontStyle = "normal"
5 - android:fontWeight="400" 5 + android:fontWeight="400"
6 - android:font = "@font/noto"/> 6 + android:font = "@font/noto"/>
7 - <font 7 + <font
8 - android:fontStyle = "normal" 8 + android:fontStyle = "normal"
9 - android:fontWeight = "400" 9 + android:fontWeight = "400"
10 - android:font = "@font/beba"/> 10 + android:font = "@font/beba"/>
11 </font-family> 11 </font-family>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto" 3 + xmlns:app="http://schemas.android.com/apk/res-auto"
4 - xmlns:tools="http://schemas.android.com/tools" 4 + xmlns:tools="http://schemas.android.com/tools"
5 - android:id="@+id/container" 5 + android:id="@+id/container"
6 - android:layout_width="match_parent" 6 + android:layout_width="match_parent"
7 - android:layout_height="match_parent" 7 + android:layout_height="match_parent"
8 - tools:context="com.example.suemin.smartwindow.view.MainActivity" 8 + tools:context="com.example.suemin.smartwindow.view.MainActivity"
9 - > 9 + >
10 - 10 +
11 - 11 +
12 - <android.support.v7.widget.Toolbar 12 + <android.support.v7.widget.Toolbar
13 - android:id="@+id/tb" 13 + android:id="@+id/tb"
14 - android:layout_width="match_parent" 14 + android:layout_width="match_parent"
15 - android:layout_height="wrap_content" 15 + android:layout_height="wrap_content"
16 - android:background="@color/colorPrimaryDark"> 16 + android:background="@color/colorPrimaryDark">
17 - <ImageView 17 + <ImageView
18 - android:layout_width="32dp" 18 + android:layout_width="32dp"
19 - android:layout_height="30dp" 19 + android:layout_height="30dp"
20 - android:src="@drawable/icon" 20 + android:src="@drawable/icon"
21 - android:paddingTop="8dp" 21 + android:paddingTop="8dp"
22 - android:layout_marginRight="5dp"/> 22 + android:layout_marginRight="5dp"/>
23 - 23 +
24 - <TextView 24 + <TextView
25 - android:layout_width="match_parent" 25 + android:layout_width="match_parent"
26 - android:layout_height="match_parent" 26 + android:layout_height="match_parent"
27 - android:gravity="left" 27 + android:gravity="left"
28 - android:text="@string/app_name" 28 + android:text="@string/app_name"
29 - android:fontFamily="@font/beba" 29 + android:fontFamily="@font/beba"
30 - android:textColor="@color/colorAccent" 30 + android:textColor="@color/colorAccent"
31 - android:textSize="21dp" 31 + android:textSize="21dp"
32 - android:textStyle="bold" 32 + android:textStyle="bold"
33 - /> 33 + />
34 - 34 +
35 - </android.support.v7.widget.Toolbar> 35 + </android.support.v7.widget.Toolbar>
36 - 36 +
37 - <FrameLayout 37 + <FrameLayout
38 - android:id="@+id/frameLayout" 38 + android:id="@+id/frameLayout"
39 - android:layout_width="match_parent" 39 + android:layout_width="match_parent"
40 - android:layout_height="match_parent" 40 + android:layout_height="match_parent"
41 - android:layout_marginTop="?attr/actionBarSize" 41 + android:layout_marginTop="?attr/actionBarSize"
42 - android:layout_marginBottom="?attr/actionBarSize" 42 + android:layout_marginBottom="?attr/actionBarSize"
43 - /> 43 + />
44 - 44 +
45 - <android.support.design.widget.BottomNavigationView 45 + <android.support.design.widget.BottomNavigationView
46 - android:id="@+id/navigation" 46 + android:id="@+id/navigation"
47 - android:layout_width="0dp" 47 + android:layout_width="0dp"
48 - android:layout_height="wrap_content" 48 + android:layout_height="wrap_content"
49 - android:layout_marginStart="0dp" 49 + android:layout_marginStart="0dp"
50 - android:layout_marginEnd="0dp" 50 + android:layout_marginEnd="0dp"
51 - android:background="@color/colorPrimaryDark" 51 + android:background="@color/colorPrimaryDark"
52 - app:layout_constraintBottom_toBottomOf="parent" 52 + app:layout_constraintBottom_toBottomOf="parent"
53 - app:layout_constraintLeft_toLeftOf="parent" 53 + app:layout_constraintLeft_toLeftOf="parent"
54 - app:layout_constraintRight_toRightOf="parent" 54 + app:layout_constraintRight_toRightOf="parent"
55 - app:menu="@menu/navigation" /> 55 + app:menu="@menu/navigation" />
56 - 56 +
57 </android.support.constraint.ConstraintLayout> 57 </android.support.constraint.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:layout_width="match_parent" 3 + android:layout_width="match_parent"
4 - android:layout_height="wrap_content" 4 + android:layout_height="wrap_content"
5 - > 5 + >
6 - <TextView 6 + <TextView
7 - android:id="@+id/bt_textView" 7 + android:id="@+id/bt_textView"
8 - android:layout_width="wrap_content" 8 + android:layout_width="wrap_content"
9 - android:layout_height="wrap_content" 9 + android:layout_height="wrap_content"
10 - android:layout_marginLeft="16dp" 10 + android:layout_marginLeft="16dp"
11 - android:gravity="left" 11 + android:gravity="left"
12 - android:text="name" 12 + android:text="name"
13 - android:textColor="@color/colorAccent" 13 + android:textColor="@color/colorAccent"
14 - android:fontFamily="@font/noto" 14 + android:fontFamily="@font/noto"
15 - android:textSize="21dp" 15 + android:textSize="21dp"
16 - /> 16 + />
17 - <TextView 17 + <TextView
18 - android:id="@+id/bt_textView_addr" 18 + android:id="@+id/bt_textView_addr"
19 - android:layout_width="wrap_content" 19 + android:layout_width="wrap_content"
20 - android:layout_height="wrap_content" 20 + android:layout_height="wrap_content"
21 - android:layout_marginLeft="16dp" 21 + android:layout_marginLeft="16dp"
22 - android:gravity="left" 22 + android:gravity="left"
23 - android:text="addr" 23 + android:text="addr"
24 - android:textColor="@color/colorAccent" 24 + android:textColor="@color/colorAccent"
25 - android:textSize="14dp" 25 + android:textSize="14dp"
26 - android:layout_below="@+id/bt_textView" 26 + android:layout_below="@+id/bt_textView"
27 - /> 27 + />
28 </RelativeLayout> 28 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:layout_width="match_parent" 3 + android:layout_width="match_parent"
4 - android:layout_height="match_parent" 4 + android:layout_height="match_parent"
5 - android:gravity="center" 5 + android:gravity="center"
6 - android:orientation="vertical" 6 + android:orientation="vertical"
7 - > 7 + >
8 - 8 +
9 - <LinearLayout 9 + <LinearLayout
10 - android:layout_width="250dp" 10 + android:layout_width="250dp"
11 - android:layout_height="wrap_content" 11 + android:layout_height="wrap_content"
12 - android:paddingBottom="15dp" 12 + android:paddingBottom="15dp"
13 - android:paddingTop="15dp" 13 + android:paddingTop="15dp"
14 - android:gravity="center" 14 + android:gravity="center"
15 - android:orientation="vertical" 15 + android:orientation="vertical"
16 - android:background="@drawable/dialog_background"> 16 + android:background="@drawable/dialog_background">
17 - 17 +
18 - <TextView 18 + <TextView
19 - android:id="@+id/dialog_title" 19 + android:id="@+id/dialog_title"
20 - android:layout_width="wrap_content" 20 + android:layout_width="wrap_content"
21 - android:layout_height="wrap_content" 21 + android:layout_height="wrap_content"
22 - android:layout_marginTop="10dp" 22 + android:layout_marginTop="10dp"
23 - android:layout_marginBottom="10dp" 23 + android:layout_marginBottom="10dp"
24 - android:textSize="20dp" /> 24 + android:textSize="20dp" />
25 - 25 +
26 - <TextView 26 + <TextView
27 - android:id="@+id/dialog_num" 27 + android:id="@+id/dialog_num"
28 - android:layout_width="wrap_content" 28 + android:layout_width="wrap_content"
29 - android:layout_height="wrap_content" 29 + android:layout_height="wrap_content"
30 - android:layout_marginTop="5dp" 30 + android:layout_marginTop="5dp"
31 - android:layout_marginBottom="5dp" 31 + android:layout_marginBottom="5dp"
32 - android:textSize="60dp" /> 32 + android:textSize="60dp" />
33 - <TextView 33 + <TextView
34 - android:id="@+id/dialog_state" 34 + android:id="@+id/dialog_state"
35 - android:layout_width="wrap_content" 35 + android:layout_width="wrap_content"
36 - android:layout_height="wrap_content" 36 + android:layout_height="wrap_content"
37 - android:layout_marginBottom="15dp" 37 + android:layout_marginBottom="15dp"
38 - android:textSize="15dp" /> 38 + android:textSize="15dp" />
39 - <Button 39 + <Button
40 - android:id="@+id/pbutton" 40 + android:id="@+id/pbutton"
41 - android:layout_width="50dp" 41 + android:layout_width="50dp"
42 - android:layout_height="25dp" 42 + android:layout_height="25dp"
43 - android:layout_marginBottom="10dp" 43 + android:layout_marginBottom="10dp"
44 - android:background="@drawable/dialog_button_background" 44 + android:background="@drawable/dialog_button_background"
45 - android:text="OK" 45 + android:text="OK"
46 - android:textColor="@color/colorAccent"/> 46 + android:textColor="@color/colorAccent"/>
47 - </LinearLayout> 47 + </LinearLayout>
48 - 48 +
49 - 49 +
50 - 50 +
51 -</LinearLayout> 51 +</LinearLayout>
52 - 52 +
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:tools="http://schemas.android.com/tools" 3 + xmlns:tools="http://schemas.android.com/tools"
4 - android:layout_width="match_parent" 4 + android:layout_width="match_parent"
5 - android:layout_height="match_parent" 5 + android:layout_height="match_parent"
6 - tools:context="com.example.suemin.smartwindow.view.bluetooth.Bluetooth" 6 + tools:context="com.example.suemin.smartwindow.view.bluetooth.Bluetooth"
7 - android:background="@color/colorPrimaryDark"> 7 + android:background="@color/colorPrimaryDark">
8 - 8 +
9 - <TextView 9 + <TextView
10 - android:layout_width="wrap_content" 10 + android:layout_width="wrap_content"
11 - android:layout_height="22dp" 11 + android:layout_height="22dp"
12 - android:layout_marginLeft="10dp" 12 + android:layout_marginLeft="10dp"
13 - android:layout_marginTop="5dp" 13 + android:layout_marginTop="5dp"
14 - android:text="검색된 기기" 14 + android:text="검색된 기기"
15 - android:textSize="12dp" 15 + android:textSize="12dp"
16 - android:textStyle="bold" 16 + android:textStyle="bold"
17 - android:textColor="#a04e4e4e"/> 17 + android:textColor="#a04e4e4e"/>
18 - <ListView 18 + <ListView
19 - android:id="@android:id/list" 19 + android:id="@android:id/list"
20 - android:layout_width="match_parent" 20 + android:layout_width="match_parent"
21 - android:layout_height="wrap_content" 21 + android:layout_height="wrap_content"
22 - android:layout_marginTop="24dp"> 22 + android:layout_marginTop="24dp">
23 - 23 +
24 - </ListView> 24 + </ListView>
25 - <RelativeLayout 25 + <RelativeLayout
26 - android:layout_width="wrap_content" 26 + android:layout_width="wrap_content"
27 - android:layout_height="60dp" 27 + android:layout_height="60dp"
28 - android:layout_gravity="bottom" 28 + android:layout_gravity="bottom"
29 - android:paddingBottom="15dp"> 29 + android:paddingBottom="15dp">
30 - 30 +
31 - <Button 31 + <Button
32 - android:id="@+id/bt_find_btn" 32 + android:id="@+id/bt_find_btn"
33 - android:layout_width="50dp" 33 + android:layout_width="50dp"
34 - android:layout_height="50dp" 34 + android:layout_height="50dp"
35 - android:layout_alignParentRight="true" 35 + android:layout_alignParentRight="true"
36 - android:layout_alignParentBottom="true" 36 + android:layout_alignParentBottom="true"
37 - android:layout_marginRight="20dp" 37 + android:layout_marginRight="20dp"
38 - android:background="@drawable/sync" 38 + android:background="@drawable/sync"
39 - /> 39 + />
40 - </RelativeLayout> 40 + </RelativeLayout>
41 - 41 +
42 - 42 +
43 - 43 +
44 </FrameLayout> 44 </FrameLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:tools="http://schemas.android.com/tools" 3 + xmlns:tools="http://schemas.android.com/tools"
4 - android:layout_width="match_parent" 4 + android:layout_width="match_parent"
5 - android:layout_height="match_parent" 5 + android:layout_height="match_parent"
6 - xmlns:app="http://schemas.android.com/apk/res-auto" 6 + xmlns:app="http://schemas.android.com/apk/res-auto"
7 - tools:context="com.example.suemin.smartwindow.view.environment.Env" 7 + tools:context="com.example.suemin.smartwindow.view.environment.Env"
8 - android:background="@color/colorPrimaryDark"> 8 + android:background="@color/colorPrimaryDark">
9 - 9 +
10 - <LinearLayout 10 + <LinearLayout
11 - android:layout_width="match_parent" 11 + android:layout_width="match_parent"
12 - android:layout_height="wrap_content" 12 + android:layout_height="wrap_content"
13 - android:orientation="vertical" 13 + android:orientation="vertical"
14 - > 14 + >
15 - <!-- TODO: Update blank fragment layout --> 15 + <!-- TODO: Update blank fragment layout -->
16 - <RelativeLayout 16 + <RelativeLayout
17 - android:layout_width="wrap_content" 17 + android:layout_width="wrap_content"
18 - android:layout_height="20dp" 18 + android:layout_height="20dp"
19 - android:layout_marginTop="10dp" 19 + android:layout_marginTop="10dp"
20 - > 20 + >
21 - <ImageView 21 + <ImageView
22 - android:layout_width="10dp" 22 + android:layout_width="10dp"
23 - android:layout_height="10dp" 23 + android:layout_height="10dp"
24 - android:layout_marginStart="7dp" 24 + android:layout_marginStart="7dp"
25 - android:id="@+id/imageView1" 25 + android:id="@+id/imageView1"
26 - android:layout_centerVertical="true" 26 + android:layout_centerVertical="true"
27 - android:src="@drawable/icon_loca" 27 + android:src="@drawable/icon_loca"
28 - /> 28 + />
29 - 29 +
30 - <TextView 30 + <TextView
31 - android:id="@+id/location_text" 31 + android:id="@+id/location_text"
32 - android:layout_width="wrap_content" 32 + android:layout_width="wrap_content"
33 - android:layout_height="wrap_content" 33 + android:layout_height="wrap_content"
34 - android:layout_marginTop="1dp" 34 + android:layout_marginTop="1dp"
35 - android:layout_marginStart="2dp" 35 + android:layout_marginStart="2dp"
36 - android:layout_toRightOf="@+id/imageView1" 36 + android:layout_toRightOf="@+id/imageView1"
37 - android:text="위치 확인중..." 37 + android:text="위치 확인중..."
38 - android:textColor="@color/colorAccent" 38 + android:textColor="@color/colorAccent"
39 - android:textSize="12dp"/> 39 + android:textSize="12dp"/>
40 - 40 +
41 - </RelativeLayout> 41 + </RelativeLayout>
42 - <ListView 42 + <ListView
43 - android:id="@+id/list" 43 + android:id="@+id/list"
44 - android:layout_width="match_parent" 44 + android:layout_width="match_parent"
45 - android:layout_height="wrap_content" 45 + android:layout_height="wrap_content"
46 - /> 46 + />
47 - </LinearLayout> 47 + </LinearLayout>
48 - 48 +
49 </FrameLayout> 49 </FrameLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:tools="http://schemas.android.com/tools" 3 + xmlns:tools="http://schemas.android.com/tools"
4 - android:layout_width="match_parent" 4 + android:layout_width="match_parent"
5 - android:layout_height="match_parent" 5 + android:layout_height="match_parent"
6 - xmlns:app="http://schemas.android.com/apk/res-auto" 6 + xmlns:app="http://schemas.android.com/apk/res-auto"
7 - tools:context="com.example.suemin.smartwindow.view.home.Home" 7 + tools:context="com.example.suemin.smartwindow.view.home.Home"
8 - android:background="@color/colorPrimaryDark"> 8 + android:background="@color/colorPrimaryDark">
9 - 9 +
10 - 10 +
11 - <RelativeLayout 11 + <RelativeLayout
12 - android:layout_width="match_parent" 12 + android:layout_width="match_parent"
13 - android:layout_height="match_parent" 13 + android:layout_height="match_parent"
14 - android:orientation="vertical"> 14 + android:orientation="vertical">
15 - 15 +
16 - <ImageView 16 + <ImageView
17 - android:id="@+id/imageView2" 17 + android:id="@+id/imageView2"
18 - android:layout_width="197dp" 18 + android:layout_width="197dp"
19 - android:layout_height="200dp" 19 + android:layout_height="200dp"
20 - android:layout_marginTop="80dp" 20 + android:layout_marginTop="80dp"
21 - android:layout_marginBottom="50dp" 21 + android:layout_marginBottom="50dp"
22 - android:adjustViewBounds="true" 22 + android:adjustViewBounds="true"
23 - android:src="@drawable/window_closed" 23 + android:src="@drawable/window_closed"
24 - android:layout_centerHorizontal="true" 24 + android:layout_centerHorizontal="true"
25 - /> 25 + />
26 - 26 +
27 - <RelativeLayout 27 + <RelativeLayout
28 - android:layout_width="wrap_content" 28 + android:layout_width="wrap_content"
29 - android:layout_height="wrap_content" 29 + android:layout_height="wrap_content"
30 - android:layout_marginStart="100dp" 30 + android:layout_marginStart="100dp"
31 - android:layout_below="@id/imageView2" 31 + android:layout_below="@id/imageView2"
32 - android:layout_centerHorizontal="true" 32 + android:layout_centerHorizontal="true"
33 - > 33 + >
34 - 34 +
35 - <Switch 35 + <Switch
36 - android:id="@+id/switch1" 36 + android:id="@+id/switch1"
37 - android:layout_width="wrap_content" 37 + android:layout_width="wrap_content"
38 - android:layout_height="wrap_content" 38 + android:layout_height="wrap_content"
39 - android:layout_marginBottom="10dp" 39 + android:layout_marginBottom="10dp"
40 - android:layout_alignParentTop="true" 40 + android:layout_alignParentTop="true"
41 - android:layout_centerHorizontal="true" 41 + android:layout_centerHorizontal="true"
42 - /> 42 + />
43 - 43 +
44 - <TextView 44 + <TextView
45 - android:id="@+id/textView2" 45 + android:id="@+id/textView2"
46 - android:layout_width="wrap_content" 46 + android:layout_width="wrap_content"
47 - android:layout_height="wrap_content" 47 + android:layout_height="wrap_content"
48 - android:layout_below="@id/switch1" 48 + android:layout_below="@id/switch1"
49 - android:layout_centerHorizontal="true" 49 + android:layout_centerHorizontal="true"
50 - android:textColor="@color/colorAccent" 50 + android:textColor="@color/colorAccent"
51 - android:text="현재 창문 상태는" 51 + android:text="현재 창문 상태는"
52 - android:textSize="17dp" /> 52 + android:textSize="17dp" />
53 - 53 +
54 - <TextView 54 + <TextView
55 - android:id="@+id/textView_switch" 55 + android:id="@+id/textView_switch"
56 - android:layout_width="wrap_content" 56 + android:layout_width="wrap_content"
57 - android:layout_height="wrap_content" 57 + android:layout_height="wrap_content"
58 - android:fontFamily="@font/noto" 58 + android:fontFamily="@font/noto"
59 - android:text="“ 닫힘 ”" 59 + android:text="“ 닫힘 ”"
60 - android:textSize="25dp" 60 + android:textSize="25dp"
61 - android:textStyle="bold" 61 + android:textStyle="bold"
62 - android:textColor="@color/colorAccent" 62 + android:textColor="@color/colorAccent"
63 - android:layout_below="@id/textView2" 63 + android:layout_below="@id/textView2"
64 - android:layout_centerHorizontal="true" 64 + android:layout_centerHorizontal="true"
65 - /> 65 + />
66 - </RelativeLayout> 66 + </RelativeLayout>
67 - </RelativeLayout> 67 + </RelativeLayout>
68 - 68 +
69 </FrameLayout> 69 </FrameLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<!-- Copyright (C) 2013 The Android Open Source Project 2 +<!-- Copyright (C) 2013 The Android Open Source Project
3 - Licensed under the Apache License, Version 2.0 (the "License"); 3 + Licensed under the Apache License, Version 2.0 (the "License");
4 - you may not use this file except in compliance with the License. 4 + you may not use this file except in compliance with the License.
5 - You may obtain a copy of the License at 5 + You may obtain a copy of the License at
6 - http://www.apache.org/licenses/LICENSE-2.0 6 + http://www.apache.org/licenses/LICENSE-2.0
7 - Unless required by applicable law or agreed to in writing, software 7 + Unless required by applicable law or agreed to in writing, software
8 - distributed under the License is distributed on an "AS IS" BASIS, 8 + distributed under the License is distributed on an "AS IS" BASIS,
9 - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 9 + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10 - See the License for the specific language governing permissions and 10 + See the License for the specific language governing permissions and
11 - limitations under the License. 11 + limitations under the License.
12 ---> 12 +-->
13 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 13 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
14 - android:orientation="vertical" 14 + android:orientation="vertical"
15 - android:layout_width="match_parent" 15 + android:layout_width="match_parent"
16 - android:layout_height="wrap_content" 16 + android:layout_height="wrap_content"
17 - android:layout_margin="10dp"> 17 + android:layout_margin="10dp">
18 - <LinearLayout android:orientation="horizontal" 18 + <LinearLayout android:orientation="horizontal"
19 - android:layout_width="match_parent" 19 + android:layout_width="match_parent"
20 - android:layout_height="wrap_content" 20 + android:layout_height="wrap_content"
21 - android:layout_margin="10dp"> 21 + android:layout_margin="10dp">
22 - <TextView android:layout_width="wrap_content" 22 + <TextView android:layout_width="wrap_content"
23 - android:layout_height="wrap_content" 23 + android:layout_height="wrap_content"
24 - android:text="State : " 24 + android:text="State : "
25 - android:textSize="18sp"/> 25 + android:textSize="18sp"/>
26 - <Space android:layout_width="5dp" 26 + <Space android:layout_width="5dp"
27 - android:layout_height="wrap_content"/> 27 + android:layout_height="wrap_content"/>
28 - <TextView android:id="@+id/connection_state" 28 + <TextView android:id="@+id/connection_state"
29 - android:layout_width="match_parent" 29 + android:layout_width="match_parent"
30 - android:layout_height="wrap_content" 30 + android:layout_height="wrap_content"
31 - android:text="no_data" 31 + android:text="no_data"
32 - android:textSize="18sp"/> 32 + android:textSize="18sp"/>
33 - </LinearLayout> 33 + </LinearLayout>
34 - <LinearLayout android:orientation="horizontal" 34 + <LinearLayout android:orientation="horizontal"
35 - android:layout_width="match_parent" 35 + android:layout_width="match_parent"
36 - android:layout_height="wrap_content" 36 + android:layout_height="wrap_content"
37 - android:layout_margin="10dp"> 37 + android:layout_margin="10dp">
38 - <TextView android:layout_width="wrap_content" 38 + <TextView android:layout_width="wrap_content"
39 - android:layout_height="wrap_content" 39 + android:layout_height="wrap_content"
40 - android:text="Data : " 40 + android:text="Data : "
41 - android:id="@+id/device_name" 41 + android:id="@+id/device_name"
42 - android:textSize="18sp"/> 42 + android:textSize="18sp"/>
43 - <Space android:layout_width="5dp" 43 + <Space android:layout_width="5dp"
44 - android:layout_height="wrap_content"/> 44 + android:layout_height="wrap_content"/>
45 - <TextView android:id="@+id/data_value" 45 + <TextView android:id="@+id/data_value"
46 - android:layout_width="match_parent" 46 + android:layout_width="match_parent"
47 - android:layout_height="wrap_content" 47 + android:layout_height="wrap_content"
48 - android:text="no_data" 48 + android:text="no_data"
49 - android:textSize="18sp"/> 49 + android:textSize="18sp"/>
50 - </LinearLayout> 50 + </LinearLayout>
51 - <ExpandableListView android:id="@+id/gatt_services_list" 51 + <ExpandableListView android:id="@+id/gatt_services_list"
52 - android:layout_width="match_parent" 52 + android:layout_width="match_parent"
53 - android:layout_height="wrap_content"/> 53 + android:layout_height="wrap_content"/>
54 -</LinearLayout> 54 +</LinearLayout>
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:layout_width="match_parent" 3 + android:layout_width="match_parent"
4 - android:layout_height="wrap_content" 4 + android:layout_height="wrap_content"
5 - > 5 + >
6 - <RelativeLayout 6 + <RelativeLayout
7 - android:layout_width="wrap_content" 7 + android:layout_width="wrap_content"
8 - android:layout_height="wrap_content" 8 + android:layout_height="wrap_content"
9 - android:gravity="start"> 9 + android:gravity="start">
10 - 10 +
11 - <TextView 11 + <TextView
12 - android:id="@+id/textView1" 12 + android:id="@+id/textView1"
13 - android:layout_width="wrap_content" 13 + android:layout_width="wrap_content"
14 - android:layout_height="wrap_content" 14 + android:layout_height="wrap_content"
15 - android:paddingLeft="15dp" 15 + android:paddingLeft="15dp"
16 - android:layout_marginTop="10dp" 16 + android:layout_marginTop="10dp"
17 - android:layout_marginBottom="10dp" 17 + android:layout_marginBottom="10dp"
18 - android:gravity="fill_horizontal" 18 + android:gravity="fill_horizontal"
19 - android:fontFamily="@font/noto" 19 + android:fontFamily="@font/noto"
20 - android:text="New Text" 20 + android:text="New Text"
21 - android:layout_toRightOf="@id/imageView1" 21 + android:layout_toRightOf="@id/imageView1"
22 - android:textColor="@color/colorAccent" 22 + android:textColor="@color/colorAccent"
23 - android:textSize="21dp" /> 23 + android:textSize="21dp" />
24 - 24 +
25 - <ImageView 25 + <ImageView
26 - android:layout_width="50dp" 26 + android:layout_width="50dp"
27 - android:layout_height="50dp" 27 + android:layout_height="50dp"
28 - android:id="@+id/imageView1" 28 + android:id="@+id/imageView1"
29 - android:layout_marginLeft="5dp" 29 + android:layout_marginLeft="5dp"
30 - android:layout_centerVertical="true" 30 + android:layout_centerVertical="true"
31 - android:src="@drawable/ic_cloud_queue_black_24dp" 31 + android:src="@drawable/ic_cloud_queue_black_24dp"
32 - /> 32 + />
33 - </RelativeLayout> 33 + </RelativeLayout>
34 - 34 +
35 - 35 +
36 -</RelativeLayout> 36 +</RelativeLayout>
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 - android:layout_width="match_parent" 3 + android:layout_width="match_parent"
4 - android:layout_height="wrap_content" 4 + android:layout_height="wrap_content"
5 - > 5 + >
6 - <TextView 6 + <TextView
7 - android:id="@+id/sv_textView" 7 + android:id="@+id/sv_textView"
8 - android:layout_width="wrap_content" 8 + android:layout_width="wrap_content"
9 - android:layout_height="wrap_content" 9 + android:layout_height="wrap_content"
10 - android:layout_marginLeft="16dp" 10 + android:layout_marginLeft="16dp"
11 - android:gravity="left" 11 + android:gravity="left"
12 - android:text="name" 12 + android:text="name"
13 - android:textColor="@color/colorAccent" 13 + android:textColor="@color/colorAccent"
14 - android:fontFamily="@font/noto" 14 + android:fontFamily="@font/noto"
15 - android:textSize="21dp" 15 + android:textSize="21dp"
16 - /> 16 + />
17 - <TextView 17 + <TextView
18 - android:id="@+id/sv_uuid" 18 + android:id="@+id/sv_uuid"
19 - android:layout_width="wrap_content" 19 + android:layout_width="wrap_content"
20 - android:layout_height="wrap_content" 20 + android:layout_height="wrap_content"
21 - android:layout_marginLeft="16dp" 21 + android:layout_marginLeft="16dp"
22 - android:gravity="left" 22 + android:gravity="left"
23 - android:text="addr" 23 + android:text="addr"
24 - android:textColor="@color/colorAccent" 24 + android:textColor="@color/colorAccent"
25 - android:textSize="14dp" 25 + android:textSize="14dp"
26 - android:layout_below="@+id/sv_textView" 26 + android:layout_below="@+id/sv_textView"
27 - /> 27 + />
28 </RelativeLayout> 28 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<menu xmlns:android="http://schemas.android.com/apk/res/android" 2 +<menu xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"> 3 + xmlns:app="http://schemas.android.com/apk/res-auto">
4 - <item 4 + <item
5 - android:id="@+id/navigation_bt" 5 + android:id="@+id/navigation_bt"
6 - android:title="BT" 6 + android:title="BT"
7 - android:icon="@drawable/ic_bluetooth_black_24dp" 7 + android:icon="@drawable/ic_bluetooth_black_24dp"
8 - app:showAsAction="always" 8 + app:showAsAction="always"
9 - /> 9 + />
10 - 10 +
11 </menu> 11 </menu>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<menu xmlns:android="http://schemas.android.com/apk/res/android" 2 +<menu xmlns:android="http://schemas.android.com/apk/res/android"
3 - xmlns:app="http://schemas.android.com/apk/res-auto"> 3 + xmlns:app="http://schemas.android.com/apk/res-auto">
4 - <item 4 + <item
5 - android:id="@+id/navigation_home" 5 + android:id="@+id/navigation_home"
6 - android:icon="@drawable/ic_home_black_24dp" 6 + android:icon="@drawable/ic_home_black_24dp"
7 - android:title="@string/title_home" 7 + android:title="@string/title_home"
8 - /> 8 + />
9 - 9 +
10 - <item 10 + <item
11 - android:id="@+id/navigation_env" 11 + android:id="@+id/navigation_env"
12 - android:icon="@drawable/ic_cloud_queue_black_24dp" 12 + android:icon="@drawable/ic_cloud_queue_black_24dp"
13 - android:title="@string/title_activity_main2" /> 13 + android:title="@string/title_activity_main2" />
14 - 14 +
15 - <item 15 + <item
16 - android:id="@+id/navigation_bt" 16 + android:id="@+id/navigation_bt"
17 - android:icon="@drawable/ic_bluetooth_black_24dp" 17 + android:icon="@drawable/ic_bluetooth_black_24dp"
18 - android:title="@string/title_activity_main33" /> 18 + android:title="@string/title_activity_main33" />
19 - 19 +
20 -</menu> 20 +</menu>
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background" /> 3 + <background android:drawable="@drawable/ic_launcher_background" />
4 - <foreground android:drawable="@drawable/ic_launcher_foreground" /> 4 + <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 </adaptive-icon> 5 </adaptive-icon>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background" /> 3 + <background android:drawable="@drawable/ic_launcher_background" />
4 - <foreground android:drawable="@drawable/ic_launcher_foreground" /> 4 + <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 </adaptive-icon> 5 </adaptive-icon>
...\ No newline at end of file ...\ No newline at end of file
......
1 -<?xml version="1.0" encoding="utf-8"?> 1 +<?xml version="1.0" encoding="utf-8"?>
2 -<resources> 2 +<resources>
3 - <color name="colorPrimary">#000000</color> 3 + <color name="colorPrimary">#000000</color>
4 - <color name="colorPrimaryDark">#7899ddff</color> 4 + <color name="colorPrimaryDark">#7899ddff</color>
5 - <color name="colorAccent">#f0646a71</color> 5 + <color name="colorAccent">#f0646a71</color>
6 -</resources> 6 +</resources>
......
1 -<resources> 1 +<resources>
2 - <!-- Default screen margins, per the Android Design guidelines. --> 2 + <!-- Default screen margins, per the Android Design guidelines. -->
3 - <dimen name="activity_horizontal_margin">16dp</dimen> 3 + <dimen name="activity_horizontal_margin">16dp</dimen>
4 - <dimen name="activity_vertical_margin">16dp</dimen> 4 + <dimen name="activity_vertical_margin">16dp</dimen>
5 - <dimen name="text_margin">16dp</dimen> 5 + <dimen name="text_margin">16dp</dimen>
6 -</resources> 6 +</resources>
......
1 -<resources> 1 +<resources>
2 - <string name="app_name">SMART WINDOW</string> 2 + <string name="app_name">SMART WINDOW</string>
3 - <string name="title_home">Home</string> 3 + <string name="title_home">Home</string>
4 - <string name="title_activity_main2">Environment</string> 4 + <string name="title_activity_main2">Environment</string>
5 - <string name="title_activity_main33">Bluetooth</string> 5 + <string name="title_activity_main33">Bluetooth</string>
6 - <string name="connected">Connected</string> 6 + <string name="connected">Connected</string>
7 - <string name="disconnected">Disconnected</string> 7 + <string name="disconnected">Disconnected</string>
8 - <string name="addr_m">90:E2:02:8F:36:70</string> 8 + <string name="addr_m">90:E2:02:8F:36:70</string>
9 - <string name="addr_d">90:E2:02:8E:1F:21</string> 9 + <string name="addr_d">90:E2:02:8E:1F:21</string>
10 - <string name="addr_r">90:E2:02:92:A9:0E</string> 10 + <string name="addr_r">90:E2:02:92:A9:0E</string>
11 -</resources> 11 +</resources>
......
1 -<resources> 1 +<resources>
2 - 2 +
3 - <!-- Base application theme. --> 3 + <!-- Base application theme. -->
4 - <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> 4 + <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
5 - <!-- Customize your theme here. --> 5 + <!-- Customize your theme here. -->
6 - <item name="colorPrimary">@color/colorPrimary</item> 6 + <item name="colorPrimary">@color/colorPrimary</item>
7 - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> 7 + <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8 - <item name="colorAccent">@color/colorAccent</item> 8 + <item name="colorAccent">@color/colorAccent</item>
9 - </style> 9 + </style>
10 - 10 +
11 -</resources> 11 +</resources>
......
1 -package com.example.suemin.smartwindow; 1 +package com.example.suemin.smartwindow;
2 - 2 +
3 -import org.junit.Test; 3 +import org.junit.Test;
4 - 4 +
5 -import static org.junit.Assert.*; 5 +import static org.junit.Assert.*;
6 - 6 +
7 -/** 7 +/**
8 - * Example local unit test, which will execute on the development machine (host). 8 + * Example local unit test, which will execute on the development machine (host).
9 - * 9 + *
10 - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> 10 + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
11 - */ 11 + */
12 -public class ExampleUnitTest { 12 +public class ExampleUnitTest {
13 - @Test 13 + @Test
14 - public void addition_isCorrect() { 14 + public void addition_isCorrect() {
15 - assertEquals(4, 2 + 2); 15 + assertEquals(4, 2 + 2);
16 - } 16 + }
17 } 17 }
...\ No newline at end of file ...\ No newline at end of file
......
1 -// Top-level build file where you can add configuration options common to all sub-projects/modules. 1 +// Top-level build file where you can add configuration options common to all sub-projects/modules.
2 - 2 +
3 -buildscript { 3 +buildscript {
4 - 4 +
5 - repositories { 5 + repositories {
6 - google() 6 + google()
7 - jcenter() 7 + jcenter()
8 - } 8 + }
9 - dependencies { 9 + dependencies {
10 - classpath 'com.android.tools.build:gradle:3.2.1' 10 + classpath 'com.android.tools.build:gradle:3.2.1'
11 - 11 +
12 - 12 +
13 - // NOTE: Do not place your application dependencies here; they belong 13 + // NOTE: Do not place your application dependencies here; they belong
14 - // in the individual module build.gradle files 14 + // in the individual module build.gradle files
15 - } 15 + }
16 -} 16 +}
17 - 17 +
18 -allprojects { 18 +allprojects {
19 - repositories { 19 + repositories {
20 - google() 20 + google()
21 - jcenter() 21 + jcenter()
22 - } 22 + }
23 -} 23 +}
24 - 24 +
25 -task clean(type: Delete) { 25 +task clean(type: Delete) {
26 - delete rootProject.buildDir 26 + delete rootProject.buildDir
27 -} 27 +}
......
1 -# Project-wide Gradle settings. 1 +# Project-wide Gradle settings.
2 -# IDE (e.g. Android Studio) users: 2 +# IDE (e.g. Android Studio) users:
3 -# Gradle settings configured through the IDE *will override* 3 +# Gradle settings configured through the IDE *will override*
4 -# any settings specified in this file. 4 +# any settings specified in this file.
5 -# For more details on how to configure your build environment visit 5 +# For more details on how to configure your build environment visit
6 -# http://www.gradle.org/docs/current/userguide/build_environment.html 6 +# http://www.gradle.org/docs/current/userguide/build_environment.html
7 -# Specifies the JVM arguments used for the daemon process. 7 +# Specifies the JVM arguments used for the daemon process.
8 -# The setting is particularly useful for tweaking memory settings. 8 +# The setting is particularly useful for tweaking memory settings.
9 -org.gradle.jvmargs=-Xmx1536m 9 +org.gradle.jvmargs=-Xmx1536m
10 -# When configured, Gradle will run in incubating parallel mode. 10 +# When configured, Gradle will run in incubating parallel mode.
11 -# This option should only be used with decoupled projects. More details, visit 11 +# This option should only be used with decoupled projects. More details, visit
12 -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects 12 +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13 -# org.gradle.parallel=true 13 +# org.gradle.parallel=true
14 - 14 +
15 - 15 +
......
1 -@if "%DEBUG%" == "" @echo off 1 +@if "%DEBUG%" == "" @echo off
2 -@rem ########################################################################## 2 +@rem ##########################################################################
3 -@rem 3 +@rem
4 -@rem Gradle startup script for Windows 4 +@rem Gradle startup script for Windows
5 -@rem 5 +@rem
6 -@rem ########################################################################## 6 +@rem ##########################################################################
7 - 7 +
8 -@rem Set local scope for the variables with windows NT shell 8 +@rem Set local scope for the variables with windows NT shell
9 -if "%OS%"=="Windows_NT" setlocal 9 +if "%OS%"=="Windows_NT" setlocal
10 - 10 +
11 -set DIRNAME=%~dp0 11 +set DIRNAME=%~dp0
12 -if "%DIRNAME%" == "" set DIRNAME=. 12 +if "%DIRNAME%" == "" set DIRNAME=.
13 -set APP_BASE_NAME=%~n0 13 +set APP_BASE_NAME=%~n0
14 -set APP_HOME=%DIRNAME% 14 +set APP_HOME=%DIRNAME%
15 - 15 +
16 -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 16 +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17 -set DEFAULT_JVM_OPTS= 17 +set DEFAULT_JVM_OPTS=
18 - 18 +
19 -@rem Find java.exe 19 +@rem Find java.exe
20 -if defined JAVA_HOME goto findJavaFromJavaHome 20 +if defined JAVA_HOME goto findJavaFromJavaHome
21 - 21 +
22 -set JAVA_EXE=java.exe 22 +set JAVA_EXE=java.exe
23 -%JAVA_EXE% -version >NUL 2>&1 23 +%JAVA_EXE% -version >NUL 2>&1
24 -if "%ERRORLEVEL%" == "0" goto init 24 +if "%ERRORLEVEL%" == "0" goto init
25 - 25 +
26 -echo. 26 +echo.
27 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 27 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28 -echo. 28 +echo.
29 -echo Please set the JAVA_HOME variable in your environment to match the 29 +echo Please set the JAVA_HOME variable in your environment to match the
30 -echo location of your Java installation. 30 +echo location of your Java installation.
31 - 31 +
32 -goto fail 32 +goto fail
33 - 33 +
34 -:findJavaFromJavaHome 34 +:findJavaFromJavaHome
35 -set JAVA_HOME=%JAVA_HOME:"=% 35 +set JAVA_HOME=%JAVA_HOME:"=%
36 -set JAVA_EXE=%JAVA_HOME%/bin/java.exe 36 +set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37 - 37 +
38 -if exist "%JAVA_EXE%" goto init 38 +if exist "%JAVA_EXE%" goto init
39 - 39 +
40 -echo. 40 +echo.
41 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 41 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42 -echo. 42 +echo.
43 -echo Please set the JAVA_HOME variable in your environment to match the 43 +echo Please set the JAVA_HOME variable in your environment to match the
44 -echo location of your Java installation. 44 +echo location of your Java installation.
45 - 45 +
46 -goto fail 46 +goto fail
47 - 47 +
48 -:init 48 +:init
49 -@rem Get command-line arguments, handling Windows variants 49 +@rem Get command-line arguments, handling Windows variants
50 - 50 +
51 -if not "%OS%" == "Windows_NT" goto win9xME_args 51 +if not "%OS%" == "Windows_NT" goto win9xME_args
52 - 52 +
53 -:win9xME_args 53 +:win9xME_args
54 -@rem Slurp the command line arguments. 54 +@rem Slurp the command line arguments.
55 -set CMD_LINE_ARGS= 55 +set CMD_LINE_ARGS=
56 -set _SKIP=2 56 +set _SKIP=2
57 - 57 +
58 -:win9xME_args_slurp 58 +:win9xME_args_slurp
59 -if "x%~1" == "x" goto execute 59 +if "x%~1" == "x" goto execute
60 - 60 +
61 -set CMD_LINE_ARGS=%* 61 +set CMD_LINE_ARGS=%*
62 - 62 +
63 -:execute 63 +:execute
64 -@rem Setup the command line 64 +@rem Setup the command line
65 - 65 +
66 -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar 66 +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67 - 67 +
68 -@rem Execute Gradle 68 +@rem Execute Gradle
69 -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% 69 +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70 - 70 +
71 -:end 71 +:end
72 -@rem End local scope for the variables with windows NT shell 72 +@rem End local scope for the variables with windows NT shell
73 -if "%ERRORLEVEL%"=="0" goto mainEnd 73 +if "%ERRORLEVEL%"=="0" goto mainEnd
74 - 74 +
75 -:fail 75 +:fail
76 -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of 76 +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77 -rem the _cmd.exe /c_ return code! 77 +rem the _cmd.exe /c_ return code!
78 -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 78 +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79 -exit /b 1 79 +exit /b 1
80 - 80 +
81 -:mainEnd 81 +:mainEnd
82 -if "%OS%"=="Windows_NT" endlocal 82 +if "%OS%"=="Windows_NT" endlocal
83 - 83 +
84 -:omega 84 +:omega
......