Add Tag Search.

ddiu8081 · ddiu8081 · commit 56d01e42ecdd · 2018-05-02T14:11:35.000+08:00
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/site/ddiu/tourval/MainActivity.kt b/app/src/main/java/site/ddiu/tourval/MainActivity.kt
@@ -29,6 +29,7 @@ import java.text.DecimalFormat
 class MainActivity : AppCompatActivity() {
 
     data class LocItem(val objectId: String, val name: String, val desc: String, val location: AVGeoPoint, val distance: String)
+    val likeList:MutableList<LocItem> = ArrayList ()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -44,19 +45,36 @@ class MainActivity : AppCompatActivity() {
             Log.i("kPermission", "permission---$it")
         })
 
+        initTags() // 初始化 热门标签 栏目
+
+        search_bar.setOnClickListener {
+            switchSearch(0)
+        }
+
+
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        like_list.layoutManager = LinearLayoutManager(act,LinearLayoutManager.HORIZONTAL,false)
+        like_list.adapter = MainAdapter(likeList) {
+            val intent = Intent(act, PlaceInfoActivity::class.java)
+            intent.putExtra("objectId",it.objectId)
+            startActivity(intent) //启动地图界面
+        }
+
+        // 初始化高德定位
+        GdLocation.init(this)
         GdLocation.getCurrentLocation {
             Log.d("GaodeLocation",it.address)
             val myLoc = it
             initLike(myLoc) // 初始化 猜你喜欢 栏目
 //            textView_myLoc.text = "当前位置：" + it.address
         }
-
-        initTags() // 初始化 热门标签 栏目
-
-
     }
 
-    private fun addItemToFloatLayout(floatLayout:QMUIFloatLayout, itemText:String) {
+    private fun addItemToFloatLayout(floatLayout:QMUIFloatLayout, itemId:Int, itemText:String) {
         val currentChildCount = floatLayout.childCount
 
         //自定义textview样式
@@ -69,36 +87,31 @@ class MainActivity : AppCompatActivity() {
         val layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
         floatLayout.addView(textView, layoutParams)//将textview添加到floatLayout布局中
         textView.setOnClickListener {
-            toast(textView.text)
+            switchSearch(itemId)
         }
     }
 
     private fun initTags () {
         qmuidemo_floatlayout.gravity = Gravity.LEFT //floatLayout中子节点左对齐
         qmuidemo_floatlayout.maxNumber = Int.MAX_VALUE
         qmuidemo_floatlayout.maxLines = Integer.MAX_VALUE
-        addItemToFloatLayout(qmuidemo_floatlayout,"地铁沿线")
-        addItemToFloatLayout(qmuidemo_floatlayout,"山水")
-        addItemToFloatLayout(qmuidemo_floatlayout,"自然")
-        addItemToFloatLayout(qmuidemo_floatlayout,"人文")
-        addItemToFloatLayout(qmuidemo_floatlayout,"历史")
-        addItemToFloatLayout(qmuidemo_floatlayout,"春游景点")
+
+        // 查询
+        val query: AVQuery<AVObject> = AVQuery("TagInfo")
+        query.findInBackground(object : FindCallback<AVObject>() {
+            override fun done(list:List<AVObject>, e: AVException?) {
+                for (avObject in list) {
+                    addItemToFloatLayout(qmuidemo_floatlayout,avObject.getInt("tagId"),avObject.getString("tagName"))
+                }
+            }
+        })
     }
 
     private fun initLike (myLoc: AMapLocation) {
-        val likeList:MutableList<LocItem> = ArrayList ()
         var isNear = false
 
-        like_list.layoutManager = LinearLayoutManager(act,LinearLayoutManager.HORIZONTAL,false)
-        like_list.adapter = MainAdapter(likeList) {
-            val intent = Intent(act, PlaceInfoActivity::class.java)
-            intent.putExtra("objectId",it.objectId)
-            startActivity(intent) //启动地图界面
-        }
-
         // 查询
         val query: AVQuery<AVObject> = AVQuery("PlaceInfo")
-        query.whereNotEqualTo("name", "111")
         query.findInBackground(object : FindCallback<AVObject>() {
             override fun done(list:List<AVObject>, e: AVException?) {
                 for (avObject in list) {
@@ -110,6 +123,7 @@ class MainActivity : AppCompatActivity() {
                     val distance_f = AMapUtils.calculateLineDistance(LatLng(myLoc.latitude,myLoc.longitude), LatLng(poi.latitude,poi.longitude))
 
                     if (distance_f < 1500) {
+                        nearPlace_layout.visibility = View.VISIBLE
                         textView_myLoc.text = "当前位置：" + name
                         isNear = true
                         textView_myLoc.setOnClickListener {
@@ -145,8 +159,9 @@ class MainActivity : AppCompatActivity() {
 
     }
 
-    fun switchSearch(view: View) {
+    private fun switchSearch(tagId: Int) {
         val intent = Intent(this, SearchActivity::class.java)
+        intent.putExtra("tagId", tagId)
         startActivity(intent) //启动地图界面
     }
 
diff --git a/app/src/main/java/site/ddiu/tourval/MapActivity.kt b/app/src/main/java/site/ddiu/tourval/MapActivity.kt
@@ -34,7 +34,6 @@ class MapActivity : AppCompatActivity() {
         QMUIStatusBarHelper.translucent(this) //沉浸化状态栏
         QMUIStatusBarHelper.setStatusBarLightMode(act) //设置状态栏黑色字体图标
 
-        val intent = intent
         val objectId = intent.getStringExtra("objectId")
 
 
diff --git a/app/src/main/java/site/ddiu/tourval/MyApplication.java b/app/src/main/java/site/ddiu/tourval/MyApplication.java
@@ -28,8 +28,7 @@ public void onCreate() {
         // 放在 SDK 初始化语句 AVOSCloud.initialize() 后面，只需要调用一次即可
         AVOSCloud.setDebugLogEnabled(true);
 
-        // 初始化高德定位
-        GdLocation.init(this);
+
 
     }
 
diff --git a/app/src/main/java/site/ddiu/tourval/SearchActivity.kt b/app/src/main/java/site/ddiu/tourval/SearchActivity.kt
@@ -41,6 +41,8 @@ class SearchActivity : AppCompatActivity() {
         QMUIStatusBarHelper.translucent(this) //沉浸化状态栏
         QMUIStatusBarHelper.setStatusBarLightMode(act) //设置状态栏黑色字体图标
 
+        val tagId = intent.getIntExtra("tagId",0)
+
         history_search.gravity = Gravity.LEFT //floatLayout中子节点左对齐
         history_search.maxNumber = Int.MAX_VALUE
         history_search.maxLines = Integer.MAX_VALUE
@@ -55,10 +57,14 @@ class SearchActivity : AppCompatActivity() {
             search(searchText)
         }
 
-        editText_search.isFocusable = true;
-        editText_search.isFocusableInTouchMode = true;
-        editText_search.requestFocus()
-
+        if (tagId > 0) {
+            searchTag(tagId)
+        }
+        else {
+            editText_search.isFocusable = true
+            editText_search.isFocusableInTouchMode = true
+            editText_search.requestFocus()
+        }
 
     }
 
@@ -171,4 +177,47 @@ class SearchActivity : AppCompatActivity() {
             }
         })
     }
+
+    fun searchTag(tagId: Int) {
+        val searchQueryList:MutableList<MainActivity.LocItem> = ArrayList ()
+
+        val query = AVQuery<AVObject>("PlaceInfo")
+        query.whereEqualTo("tags", tagId)
+        query.findInBackground(object : FindCallback<AVObject>() {
+            override fun done(list:List<AVObject> , e: AVException?) {
+                for (avObject in list) {
+                    val objectId = avObject.objectId
+                    val name = avObject.getString("name")
+                    val desc = avObject.getString("desc")
+                    val poi = avObject.getAVGeoPoint("location")
+                    val distance = ""
+
+                    Log.d("OBJECTID",objectId)
+                    Log.d("NAME",name)
+                    Log.d("DESC",desc)
+
+                    searchQueryList.add(MainActivity.LocItem(objectId, name, desc, poi, distance))
+                }
+                if (list.isEmpty()) {
+                    toast("没有结果")
+                    historySearch_view.visibility = View.VISIBLE
+                    searchResult_view.visibility = View.GONE
+
+                    initSearchHistory()
+                }
+                else {
+                    toast("搜索到" + list.size + "条结果")
+                    historySearch_view.visibility = View.GONE
+                    searchResult_view.visibility = View.VISIBLE
+                }
+                searchResult_list.layoutManager = LinearLayoutManager(act, LinearLayoutManager.VERTICAL,false)
+                searchResult_list.adapter = SearchResultAdapter(searchQueryList) {
+                    val intent = Intent(act, PlaceInfoActivity::class.java)
+                    intent.putExtra("objectId",it.objectId)
+                    startActivity(intent) //启动地图界面
+                }
+                searchResult_list.addItemDecoration(DividerItemDecoration(act, DividerItemDecoration.VERTICAL))
+            }
+        })
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -48,7 +48,6 @@
             android:layout_height="50dp"
             android:alpha="1.0"
             android:background="@color/qmui_config_color_white"
-            android:onClick="switchSearch"
             android:orientation="horizontal"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext.support_version = '23.1.1'
     ext.kotlin_version = '1.2.40'
-    ext.anko_version = '0.8.2'
+    ext.anko_version = '0.10.4'
     repositories {
         google()
         jcenter()

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public void onCreate() {`
`28`	`28`	`// 放在 SDK 初始化语句 AVOSCloud.initialize() 后面，只需要调用一次即可`
`29`	`29`	`AVOSCloud.setDebugLogEnabled(true);`
`30`	`30`
`31`		`- // 初始化高德定位`
`32`		`- GdLocation.init(this);`
	`31`	`+`
`33`	`32`
`34`	`33`	`}`
`35`	`34`