diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e50b394..80cd38d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt deleted file mode 100644 index b5b12df..0000000 --- a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt +++ /dev/null @@ -1,72 +0,0 @@ -package jackall.moncalc.activity - -import android.app.ActivityManager -import android.content.Context -import android.content.Intent -import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import com.google.gson.Gson -import com.google.gson.stream.JsonReader -import jackall.moncalc.Const -import jackall.moncalc.R -import jackall.moncalc.common.PreferenceKeys -import jackall.moncalc.common.PreferenceNames -import jackall.moncalc.db.MonstDataRealmHelper -import jackall.moncalc.service.MainService -import jackall.moncalc.utils.MySharedPref -import jackall.moncalc.vo.MonstData -import kotlinx.android.synthetic.main.activity_main.* -import java.io.InputStreamReader - - -class MainActivity : AppCompatActivity() { - - val mySharedPref by lazy { MySharedPref(this, PreferenceNames.CONFIG) } - val monstDataRealmHelper = MonstDataRealmHelper() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - // TODO:レイアウトを決めてdatbinding,viewModelProvidersを有効にする - val intent = Intent(this, MainService::class.java) - if ((mySharedPref.getValue(PreferenceKeys.QUESTDATAVERSION, Int::class.java, -1) as Int) < Const.questDataVersion) { - val inputStream = assets.open("data.json") - val jsonReader = JsonReader(InputStreamReader(inputStream)) - val monstData = Gson().fromJson(jsonReader, MonstData::class.java) - - monstDataRealmHelper.update(monstData.fruit) - monstDataRealmHelper.update(monstData.temple) - monstDataRealmHelper.update(monstData.grade) - - mySharedPref.putValue(PreferenceKeys.QUESTDATAVERSION, Int::class.java, Const.questDataVersion) - - println("db update") - } - - start_service_btn.setOnClickListener { - if (!isMainServiceRunning()) - startService(intent) - } - - stop_service_btn.setOnClickListener { - if (isMainServiceRunning()) - stopService(intent) - } - } - - override fun onDestroy() { - super.onDestroy() - monstDataRealmHelper.close() - } - - private fun isMainServiceRunning(): Boolean { - val manager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager - for (serviceInfo in manager.getRunningServices(Integer.MAX_VALUE)) { - if (MainService::class.java.getName() == serviceInfo.service.className) { - return true - } - } - return false - } -} diff --git a/app/src/main/kotlin/jackall/moncalc/activity/TestActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/TestActivity.kt new file mode 100644 index 0000000..e636e63 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/activity/TestActivity.kt @@ -0,0 +1,72 @@ +package jackall.moncalc.activity + +import android.app.ActivityManager +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import com.google.gson.Gson +import com.google.gson.stream.JsonReader +import jackall.moncalc.Const +import jackall.moncalc.R +import jackall.moncalc.common.PreferenceKeys +import jackall.moncalc.common.PreferenceNames +import jackall.moncalc.db.MonstDataRealmHelper +import jackall.moncalc.service.MainService +import jackall.moncalc.utils.MySharedPref +import jackall.moncalc.vo.MonstData +import kotlinx.android.synthetic.main.activity_main.* +import java.io.InputStreamReader + + +class TestActivity : AppCompatActivity() { + + val mySharedPref by lazy { MySharedPref(this, PreferenceNames.CONFIG) } + val monstDataRealmHelper = MonstDataRealmHelper() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + // TODO:レイアウトを決めてdatbinding,viewModelProvidersを有効にする + val intent = Intent(this, MainService::class.java) + if ((mySharedPref.getValue(PreferenceKeys.QUESTDATAVERSION, Int::class.java, -1) as Int) < Const.questDataVersion) { + val inputStream = assets.open("data.json") + val jsonReader = JsonReader(InputStreamReader(inputStream)) + val monstData = Gson().fromJson(jsonReader, MonstData::class.java) + + monstDataRealmHelper.update(monstData.fruit) + monstDataRealmHelper.update(monstData.temple) + monstDataRealmHelper.update(monstData.grade) + + mySharedPref.putValue(PreferenceKeys.QUESTDATAVERSION, Int::class.java, Const.questDataVersion) + + println("db update") + } + + start_service_btn.setOnClickListener { + if (!isMainServiceRunning()) + startService(intent) + } + + stop_service_btn.setOnClickListener { + if (isMainServiceRunning()) + stopService(intent) + } + } + + override fun onDestroy() { + super.onDestroy() + monstDataRealmHelper.close() + } + + private fun isMainServiceRunning(): Boolean { + val manager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager + for (serviceInfo in manager.getRunningServices(Integer.MAX_VALUE)) { + if (MainService::class.java.getName() == serviceInfo.service.className) { + return true + } + } + return false + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 345feec..9901df9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="jackall.moncalc.activity.MainActivity"> + tools:context="jackall.moncalc.activity.TestActivity">