Merge remote-tracking branch 'origin/ming'

Author: ming-taro

app/src/main/AndroidManifest.xml

@@ -16,9 +16,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--파일 읽기 권한-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /><!--파일 쓰기 권한-->
     <uses-feature android:name="android.hardware.camera" android:required="true"/><!--카메라 기능 사용-->
-    <!-- 시스템 재부팅시 알람 설정 권한 -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-
 
     <application
         android:allowBackup="true"
@@ -42,16 +39,6 @@
         </activity>
         <service android:name="com.amazonaws.mobileconnectors.s3.transferutility.TransferService" android:enabled="true" />
 
-
-        <!-- 병해충 알람 설정 -->
-        <receiver android:name=".AlarmRecevier"
-            android:enabled="true"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
         <!-- 네이티브 앱 키 추가-->
         <meta-data android:name="com.kakao.sdk.AppKey" android:value="f9d48590f679a37f2c4580e36d6f0a19"/>
         <activity android:name="com.PastPest.competition1.report.CropSelectActivity"/>

app/src/main/java/com/PastPest/competition1/AlarmRecevier.java

@@ -33,11 +33,6 @@ protected void onCreate(Bundle savedInstanceState)
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_first);
 
-        //NotificationManager notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-        //AlarmManager alarmManager = (AlarmManager)getSystemService(this.ALARM_SERVICE);
-        //GregorianCalendar mCalender = new GregorianCalendar();
-        //setAlarm(alarmManager);
-
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -51,26 +46,4 @@ public void run() {
 
 
     }
-
-    private void setAlarm(AlarmManager alarmManager) {
-
-        Intent receiverIntent = new Intent(this, AlarmRecevier.class); //AlarmReceiver에 값 전달
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(
-                FirstActivity.this, 0, receiverIntent, 0);   //푸쉬알림 클릭시 앱 실행
-
-        Calendar calendar = Calendar.getInstance();       //푸쉬알림 시간 설정
-        calendar.set(Calendar.HOUR_OF_DAY, 17);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
-        if(Calendar.getInstance().after(calendar)){       //앱 첫 실행시 알림이 오는 오류 방지
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
-        }
-
-        alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(),
-                AlarmManager.INTERVAL_DAY, pendingIntent); //매일 알림
-
-    }
-
 }