Merge pull request #1 from Chloe-jpg/Branch20191022

app/build.gradle

@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion '29.0.2'
     defaultConfig {
-        applicationId "com.example.pagedemo"
-        minSdkVersion 15
-        targetSdkVersion 29
+        applicationId "com.kinco.MotorApp"
+        minSdkVersion 24
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -31,4 +31,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
 }

app/src/androidTest/java/com/example/pagedemo/ExampleInstrumentedTest.java → app/src/androidTest/java/com/kinco/MotorApp/ExampleInstrumentedTest.java

@@ -1,10 +1,11 @@
-package com.example.pagedemo;
+package com.kinco.MotorApp;
 
 import android.content.Context;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

app/src/main/AndroidManifest.xml

@@ -1,33 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.pagedemo">
+    package="com.kinco.MotorApp">
 
     <application
+        android:name="com.kinco.MotorApp.sys.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:name="com.kinco.MotorApp.MainActivity"
+            android:label="@string/app_name"
+            android:exported="true">
+        </activity>
+        <activity
+            android:name="com.kinco.MotorApp.ui.secondpage.SecondMoreActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden"
+            android:theme="@style/AppTheme"></activity>
+        <activity android:name="com.kinco.MotorApp.ui.DeviceList"/>
+        <activity android:name="com.kinco.MotorApp.ui.firstpage.FirstMoreActivity" />
+        <activity android:name=".SplashActivity" >
+
             <intent-filter>
+
                 <action android:name="android.intent.action.MAIN" />
 
+
+
                 <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
+
         </activity>
+        <service
+            android:name="com.kinco.MotorApp.BluetoothService.BLEService"
+            android:enabled="true"
+            android:exported="true" />
+    </application>
 
-    <activity android:name=".ListTableActivity"
-        android:configChanges="orientation|keyboard|keyboardHidden"
-        android:theme="@style/AppTheme">
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="true" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
-    </activity>
-        <activity android:name=".edittext.EditTextActivity" />
-        <activity android:name=".edittext.ListView_SpinnerActivity" />
-        <activity android:name=".OSCActivity" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
-    </application>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 </manifest>