20170912

Tailyou · Sep 12, 2017 · 5d467ca · 5d467ca
1 parent 8852bc0
commit 5d467ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/app/src/main/java/com/tailyou/tilemap/MainActivity.kt b/app/src/main/java/com/tailyou/tilemap/MainActivity.kt
@@ -7,7 +7,7 @@ import com.tailyou.oktilemap.config.MapConfigBuilder
 import com.tailyou.oktilemap.entity.BaseExhibit
 import com.tailyou.oktilemap.util.MapUtil
 import com.tailyou.tilemap.app.AppConfig
-import com.tailyou.tilemap.bean.ExhibitBean
+import com.tailyou.tilemap.bean.Exhibit
 import com.tailyou.tilemap.db.dbHelper
 import kotlinx.android.synthetic.main.activity_main.*
 import org.jetbrains.anko.db.select
@@ -74,11 +74,10 @@ class MainActivity : AppCompatActivity() {
     private fun loadExhibit() {
         doAsync {
             var list = dbHelper.use {
-                select("EXHIBIT_CHINESE").whereSimple("MapId=$mapId").parseList(ExhibitBean.PARSER)
+                select("EXHIBIT_CHINESE").whereSimple("MapId=$mapId").parseList(Exhibit.PARSER)
             }
             uiThread {
-                exhibitList = ArrayList<BaseExhibit>()
-                exhibitList.addAll(list)
+                val exhibitList = list.mapTo(ArrayList<BaseExhibit>()) { Exhibit.exhibit2BaseExhibit(it) }
                 showMarker(exhibitList)
             }
         }

diff --git a/...a/com/tailyou/tilemap/bean/ExhibitBean.kt → .../java/com/tailyou/tilemap/bean/Exhibit.kt b/...a/com/tailyou/tilemap/bean/ExhibitBean.kt → .../java/com/tailyou/tilemap/bean/Exhibit.kt
@@ -5,20 +5,25 @@ import com.tailyou.tilemap.app.AppConfig
 import org.jetbrains.anko.db.RowParser
 
 //展项
-class ExhibitBean(autoNo: Int, fileNo: String, name: String, locX: Double, locY: Double, mapPicLg: String, mapPicSm: String) : BaseExhibit(autoNo, fileNo, name, locX, locY, mapPicLg, mapPicSm) {
+data class Exhibit(var autoNo: Int, var fileNo: String, var name: String,
+                   var locX: Double, var locY: Double, var mapPicLg: String, var mapPicSm: String) {
     companion object {
-        val PARSER: RowParser<ExhibitBean> = object : RowParser<ExhibitBean> {
-            override fun parseRow(columns: Array<Any?>): ExhibitBean {
+        val PARSER: RowParser<Exhibit> = object : RowParser<Exhibit> {
+            override fun parseRow(columns: Array<Any?>): Exhibit {
                 val autoNo = columns[1] as Long
                 val fileNo = String.format("%04d", columns[0])
                 val name = columns[4] as String
                 val locX = columns[5] as Long
                 val locY = columns[6] as Long
                 val mapPicLg = "${AppConfig.defaultFileDir}exhibit/$fileNo/image/map_icon.png"
                 val mapPicSm = "${AppConfig.defaultFileDir}exhibit/$fileNo/image/map_icon2.png"
-                val exhibit = ExhibitBean(autoNo.toInt(), fileNo, name, locX.toDouble(), locY.toDouble(), mapPicLg, mapPicSm)
+                val exhibit = Exhibit(autoNo.toInt(), fileNo, name, locX.toDouble(), locY.toDouble(), mapPicLg, mapPicSm)
                 return exhibit
             }
         }
+
+        fun exhibit2BaseExhibit(exhibit: Exhibit): BaseExhibit {
+            return BaseExhibit(exhibit.fileNo, exhibit.autoNo, exhibit.name, exhibit.locX, exhibit.locY, exhibit.mapPicLg, exhibit.mapPicSm)
+        }
     }
 }
diff --git a/library/src/main/java/com/tailyou/oktilemap/entity/BaseExhibit.kt b/library/src/main/java/com/tailyou/oktilemap/entity/BaseExhibit.kt
@@ -4,9 +4,9 @@ import java.io.Serializable
 import java.lang.RuntimeException
 
 //展项基类
-open class BaseExhibit(open var autoNo: Int, open var fileNo: String, open var name: String,
-                       open var locX: Double, open var locY: Double, open var mapPicLg: String,
-                       open var mapPicSm: String) : Cloneable, Serializable {
+data class BaseExhibit(var fileNo: String, var autoNo: Int, var name: String,
+                       var locX: Double, var locY: Double, var mapPicLg: String,
+                       var mapPicSm: String) : Cloneable, Serializable {
 
     public override fun clone(): BaseExhibit {
         val clone: BaseExhibit