lookiesmu · ParkSorry · Nov 13, 2019 · Nov 13, 2019 · Nov 16, 2019 · Nov 16, 2019
diff --git a/LOOKID/.gitignore b/LOOKID/.gitignore
@@ -8,7 +8,7 @@
 /build
 /captures
 .externalNativeBuild
-*/strings.xml
+/strings.xml
 
 
 # Created by https://www.gitignore.io/api/kotlin,windows,androidstudio

diff --git a/LOOKID/app/build.gradle b/LOOKID/app/build.gradle
@@ -20,20 +20,29 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    splits{
+        abi{
+            enable true
+            reset()
+            include 'x86', 'x86_64', 'armeabi-v7a', 'armeabi', 'arm64-v8a'
+            universalApk false
+        }
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
+    implementation "com.android.support:support-core-utils:28.0.0"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
     implementation 'com.squareup.okhttp3:okhttp:3.8.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
+    implementation files('libs/libDaumMapAndroid.jar')
 }
diff --git a/LOOKID/app/src/main/AndroidManifest.xml b/LOOKID/app/src/main/AndroidManifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="lookid_front.lookid">
-
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:allowBackup="true"
@@ -11,7 +13,13 @@
         android:roundIcon="@mipmap/app_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Lookid"
-        >
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="n">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <meta-data
+            android:name="com.kakao.sdk.AppKey"
+            android:value="fffff"/>
         <activity android:name=".Activity.Loading_Activity"
             android:theme="@style/SplashStyle">
             <intent-filter>

diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/FindInfo_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/FindInfo_Activity.kt
@@ -12,7 +12,6 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_findinfo.*
-import kotlinx.android.synthetic.main.activity_findinfo.view.*
 import lookid_front.lookid.Control.Json
 import lookid_front.lookid.Control.Okhttp
 import lookid_front.lookid.R
@@ -77,14 +76,14 @@ class FindInfo_Activity : AppCompatActivity() {
             url = url.replace("{name}",name,false)
             url = url.replace("{phone}",phone,true)
             //Log.d("Findinfo_Activity",url)
-            Asynctask().execute("0",url)
+            asynctask().execute("0",url)
         }
 
         fun GET_find_pw(id : String, email : String){
             var url = getString(R.string.server_url) + getString(R.string.find_pw)
             url = url.replace("{id}",id)
             url = url.replace("{mail}",email)
-            Asynctask().execute("1",url)
+            asynctask().execute("1",url)
         }
 
         fun Dialog_findid(id : String){
@@ -104,34 +103,26 @@ class FindInfo_Activity : AppCompatActivity() {
         }
     }
 
-    inner class Asynctask : AsyncTask<String, Void, String>(){
+    inner class asynctask : AsyncTask<String, Void, String>(){
         var state : Int = -1 //state == 0 : GET_아이디 찾기, state == 1 : GET_비밀번호 찾기
+        var url = ""
         override fun doInBackground(vararg params: String): String {
             state = Integer.parseInt(params[0])
-            val url = params[1]
-            var response : String = ""
-
-            when (state){
-                0 -> response = Okhttp().GET(url)
-                1 -> response = Okhttp().GET(url)
-            }
-
-            return response
+            url = params[1]
+            return Okhttp().GET(url)
         }
-
         override fun onPostExecute(response: String) {
             if(response.isEmpty()){
                 Toast.makeText(applicationContext,"서버 오류 발생",Toast.LENGTH_SHORT).show()
                 Log.d("FindInfo_Activity","response is null")
                 return
             }
-
+            Log.d("FindInfo_Activity",url)
+            Log.d("FindInfo_Activity",response)
             if(!Json().isJson(response)){
                 Toast.makeText(applicationContext,"네트워크 통신 오류", Toast.LENGTH_SHORT).show()
-                Log.d("FindInfo_Activity",response)
                 return
             }
-
             val jsonObj = JSONObject(response)
             when (state){
                 0->{
@@ -149,12 +140,10 @@ class FindInfo_Activity : AppCompatActivity() {
             }
         }
     }
-
     override fun onPause() {
-        Asynctask().cancel(true)
+        asynctask().cancel(true)
         super.onPause()
     }
-
     //Activity 클릭 리스너
     fun findinfo_Click_Listener(view : View){
         when(view.id){

diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Loading_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Loading_Activity.kt
@@ -1,16 +1,24 @@
 package lookid_front.lookid.Activity
 
+import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.util.Base64
+import android.util.Base64.NO_WRAP
+import android.util.Log
+import com.kakao.util.maps.helper.Utility.getPackageInfo
 import lookid_front.lookid.R
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
 
 class Loading_Activity : AppCompatActivity(){
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_loading)
-
         startActivity(Intent(applicationContext,SignIn_Activity::class.java))
         finish()
     }

diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Main_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Main_Activity.kt
@@ -6,9 +6,9 @@ import android.os.Bundle
 import android.support.v4.view.GravityCompat
 import android.support.v7.app.ActionBarDrawerToggle
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
 import android.util.Log
 import android.view.View
+import android.webkit.WebSettings
 import android.webkit.WebViewClient
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_main.*
@@ -19,116 +19,127 @@ import lookid_front.lookid.Control.Json
 import lookid_front.lookid.Control.Okhttp
 import lookid_front.lookid.Control.Res_adapter
 import lookid_front.lookid.Control.User_Control
-import lookid_front.lookid.Dialog.Basic_Dialog
 import lookid_front.lookid.Dialog.SignOut_Dialog
 import lookid_front.lookid.Dialog.Exit_Dialog
-import lookid_front.lookid.Entity.Reservation_Entity
-import lookid_front.lookid.Entity.User_Entity
+import lookid_front.lookid.Entity.Reservation
 import lookid_front.lookid.R
-import lookid_front.lookid.R.id.*
+import org.json.JSONArray
 import org.json.JSONObject
 
 class Main_Activity : AppCompatActivity() {
-    lateinit var res_adapter : Res_adapter
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
+    }
+    override fun onResume() {
         Main_Control().init_Activity()
-        Main_Control().GET_checkdate()
+        super.onResume()
     }
-
     inner class Main_Control{
         //액티비티 초기화
         fun init_Activity(){
+            GET_checkdate()
+            GET_res_list()
+            //네비게이션 메뉴 초기화
             val toggle = ActionBarDrawerToggle(
                     this@Main_Activity, main_drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
             main_drawer_layout.addDrawerListener(toggle)
             toggle.syncState()
-            res_adapter = Res_adapter(this@Main_Activity, arrayListOf(Reservation_Entity("롯데월드","2019-09-29","2019-09-30",1)))
-            main_reslist_RecView.adapter = res_adapter
-            main_reslist_RecView.layoutManager = LinearLayoutManager(applicationContext)
-
             //회원정보 초기화
-            User_Control(applicationContext).set_user(User_Entity("hong10","홍홍택","010-1234-5678","[email protected]"
-                    ,"서울시 ","농협","51230123","홍홍택"))
-
             main_id_TextView.text = User_Control(applicationContext).get_user().id
-
-            //main_missing_child_WebView.webViewClient(WebViewClient())
-            val webSettings = main_missing_child_WebView.settings
-            webSettings.javaScriptEnabled = true
-
-            main_missing_child_WebView.loadUrl("http://a6d98d12.ngrok.io/web/childCustom")
+            init_WepView()
         }
 
+        fun init_WepView(){
+            main_missing_child_WebView.webViewClient = WebViewClient()
+            val webViewSettings = main_missing_child_WebView.settings
+            main_missing_child_WebView.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.SINGLE_COLUMN
+            webViewSettings.javaScriptEnabled = true
+            main_missing_child_WebView.setInitialScale(100)
+            //webViewSettings.useWideViewPort = true
+            //webViewSettings.loadWithOverviewMode = true
+            webViewSettings.setSupportZoom(true)
+            webViewSettings.defaultZoom = WebSettings.ZoomDensity.FAR
+            var url = "${getString(R.string.server_url)}${getString(R.string.main_child_ad)}"
+            main_missing_child_WebView.loadUrl(url)
+        }
         //사용자가 예약한 날짜가 오늘인지 확인 후 실행 activity 결정
-        fun GET_checkdate(){
+        fun GET_checkdate(){ //0
             val url = getString(R.string.server_url)+getString(R.string.check_date)
             //asynctask().execute(url)
         }
-
-        fun GET_signout(){
-            SignOut_Dialog(this@Main_Activity,"로그아웃","정말로 로그아웃 하시겠습니까?").show()
+        fun GET_signout() { //1
+            SignOut_Dialog(this@Main_Activity, "로그아웃", "정말로 로그아웃 하시겠습니까?").show()
             val url = getString(R.string.server_url) + getString(R.string.sign_out)
+            asynctask().execute("1",url)
+        }
+        fun GET_res_list(){ //2
+            val url = getString(R.string.server_url) + getString(R.string.selete_res_list)
+            asynctask().execute("2",url)
         }
     }
     inner class asynctask : AsyncTask<String, Void, String>(){
         var state : Int = -1
-
+        var url = ""
         override fun doInBackground(vararg params: String): String {
             state = params[0].toInt()
-            var url = params[1]
-            var response = Okhttp().GET(url)
-
-            when(state){
-                0->{
-
-                }
-                1->{
-
-                }
-            }
-
-            return response
+            url = params[1]
+            return Okhttp(applicationContext).GET(url)
         }
         override fun onPostExecute(response: String) {
             //넘어온 값이 없을 때 로그 찍고 리턴
+            Log.d("Main_Activity", url)
             if(response.isNullOrEmpty()) {
                 Toast.makeText(applicationContext,"서버 문제 발생", Toast.LENGTH_SHORT).show()
                 Log.d("Main_Activity", "null in")
                 return
             }
+            Log.d("Main_Activity",response)
             //response 값이 json문이 아니면 통신 오류 메세지 출력
             if(!Json().isJson(response)){
                 Toast.makeText(applicationContext,"네트워크 통신 오류", Toast.LENGTH_SHORT).show()
-                Log.d("Main_Activity",response)
                 return
             }
-
-            var jsonObj = JSONObject(response)
-            if(!jsonObj.getInt("rv_pid").toString().isEmpty())
-                startActivity(Intent(applicationContext, Map_Activity::class.java).putExtra("rv_pid",jsonObj.getInt("rv_pid")))
+            when(state){
+                0->{ //GET_check_date
+                    val jsonObj = JSONObject(response)
+                    if(!jsonObj.getInt("rv_pid").toString().isEmpty()){
+                        User_Control(applicationContext).set_rv_pid(jsonObj.getInt("rv_pid"))
+                        startActivity(Intent(applicationContext, Map_Activity::class.java).putExtra("rv_pid",jsonObj.getInt("rv_pid")).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
+                    }
+                        }
+                2->{
+                    val jsonAry = JSONArray(response)
+                    val resList : ArrayList<Reservation> = arrayListOf()
+                    for (i in 0 until jsonAry.length()){
+                        val jsonObj : JSONObject = jsonAry.getJSONObject(i)
+                        resList.add(Reservation(jsonObj.getInt("rv_pid"),jsonObj.getString("r_name"),jsonObj.getLong("s_date"),
+                                jsonObj.getLong("e_date"),jsonObj.getInt("state")))
+                    }
+                    main_reslist_RecView.adapter = Res_adapter(this@Main_Activity, resList)
+                }
+            }
         }
     }
-
     fun main_Click_Listener(view : View){
         when(view.id){
-            R.id.main_reservation_View -> startActivity(Intent(applicationContext, Reservation_Activity::class.java))
-            R.id.main_map_View ->startActivity(Intent(applicationContext, Map_Activity::class.java))
-            R.id.main_checkRes_View ->startActivity(Intent(applicationContext, ResList_Activity::class.java))
+            R.id.main_reservation_View -> startActivity(Intent(applicationContext, Reservation_Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
+            R.id.main_map_View ->startActivity(Intent(applicationContext, Map_Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                    .putExtra("rv_pid",User_Control(applicationContext).get_rv_pid()))
+            R.id.main_checkRes_View ->startActivity(Intent(applicationContext, ResList_Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
             R.id.main_signout_Button ->Main_Control().GET_signout()
             R.id.main_logout_View -> Main_Control().GET_signout()
-            R.id.main_userinfo_Button -> startActivity(Intent(applicationContext, UserInfo_Activity::class.java))
+            R.id.main_userinfo_Button -> startActivity(Intent(applicationContext, UserInfo_Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
         }
     }
-
     override fun onBackPressed() {
-        if (main_drawer_layout.isDrawerOpen(GravityCompat.START)) {
+        if (main_drawer_layout.isDrawerOpen(GravityCompat.START))
             main_drawer_layout.closeDrawer(GravityCompat.START)
-        } else {
+        else
             Exit_Dialog(this).create().show()
-            //super.onBackPressed()
-        }
+    }
+    override fun onPause() {
+        asynctask().cancel(true)
+        super.onPause()
     }
 }